Set up for haskell, added ghci conf, turned on autocompletion, added highlighting of columns past 80
Fixed merge