fixes for new emacs
Merge branch 'master' of github.com:ronert/.emacs.d

* 'master' of github.com:ronert/.emacs.d:
  added global prettify symbols mode
  enable haskell-stylish by default
  Fixed stuff for new emacs version
  fixed typo
  added new line and indent beh.
  add diff hl
  add diff-hl
Merge branch 'master' of github.com:ronert/.emacs.d

* 'master' of github.com:ronert/.emacs.d:
  added discover my mode