Haskell and newlines.
Merge branch 'master' of https://github.com/peter-fogg/dotfiles

Conflicts:
	.emacs
Cleanup!