Small README fixes
Use new melpa URLs
blah
Merge remote-tracking branch 'upstream/master'
Require at least Emacs 23.3, since 23.1 is unusable

See #220
Enable aggressive-indent for lisps
Restore accidentally removed sanityinc/newline-at-end-of-line
Add LICENSE (FreeBSD)

Closes #221
Fix up disclaimer paragraph in LICENSE
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
add back init-slime
mergemerge
mergemerge
More use of maybe-require-package
Reorganise init-haskell
Fix sanityinc/add-subdirs-to-load-path to only add subdirs
Merge pull request #228 from jguenther/fix-add-subdirs-to-load-path

Fix sanityinc/add-subdirs-to-load-path to only add subdirs
Load .el if newer than corresponding .elc