Merge branch 'bugfixes' of https://github.com/philc/gollum into philc-bugfixes

lib/gollum/frontend/templates/edit.mustache

@@ -8,9 +8,7 @@
        class="action-page-history">Page History</a></li>
   </ul>
 </div>
-<div id="wiki-content"> 
-  {{>editor}}
-</div>
+  <div id="wiki-content">{{>editor}}</div>
 </div>
 <script type="text/javascript">
 jQuery(document).ready(function() {

lib/gollum/wiki.rb

@@ -407,7 +407,7 @@ module Gollum
     #
     # Returns an Array with Objects of page name and count of matches
     def search(query)
-      args = [{:c => query}, 'master', '--']
+      args = [{}, '-i', '-c', query, 'master', '--']
       args << '--' << @page_file_dir if @page_file_dir
 
       @repo.git.grep(*args).split("\n").map! do |line|