Added haskell-mode
Merged Aphrodite changes into darkstar.