More use of maybe-require-package
Reorganise init-haskell
Syncing with purcell's Haskell config updates.

Merge remote-tracking branch 'upstream/master'