Add marmalade and emacs front-end for ghc-mod
Merge remote branch 'origin/master'