More use of maybe-require-package
Reorganise init-haskell
Merge remote branch 'purcell/master'