added haskell to emacs
merged in updated to submodules