Provide maybe-require-package: like require-package, but fails softly
Use maybe-require-package to avoid emacs 24 version checks
Remove init-marmalade, which I no longer use
More use of maybe-require-package
Reorganise init-haskell
Merge remote-tracking branch 'upstream/master'