About to turn off flyparse
reverted diff faces to zenburn
prior to cleaning up haskell mode
Altered submodules to track master