using emacs-haskell-tutorial bindings
Merge branch 'master' of github.com:michelk/emacs.d

Conflicts:
	init.el