added haskell-mode
options improvements, cruft removal
Merge remote-tracking branch 'origin/master'

Conflicts:
	emacs_inherit.el