Re-add normal occur binding

.gitignore

@@ -4,4 +4,5 @@ elpa
 custom.el
 recentf
 projectile-bookmarks.eld
+projectile.cache
 *~

modules/editing.el

@@ -207,4 +207,7 @@
   ;; Toggle whitespace mode.
   (global-set-key (kbd "C-c w") 'whitespace-mode)
 
+  ;; Occur. More convenient than "M-s o"
+  (global-set-key (kbd "M-s M-o") 'occur)
+
   )

modules/helm.el

@@ -34,7 +34,7 @@
      ("M-y" . helm-show-kill-ring)
      ("C-x b" . helm-mini)
      ("C-M-j" . helm-semantic-or-imenu)
-     ("M-s M-o" . helm-occur)
+     ("C-c h M-s M-o" . helm-occur)
      ("C-h SPC" . helm-all-mark-rings)
      ("C-c h x" . helm-register))
     :config