Reorganise init-haskell
Merge branch 'master' of https://github.com/purcell/emacs.d