Enable auto-complete in erlang-mode (closes #198)
Add support for an init-preload-local.el file (closes #199)
Update clojure support, replacing ac-nrepl
Use github-clone
Create a new init-github.el
Remove default value for line-spacing
line-spacing is always buffer-local
Remove the thin internal frame border
ac-cider-compliment is now simply ac-cider
Misc haskell improvements
Enable subword-mode in haskell
Merge remote-tracking branch purcell/master

Conflicts:
	lisp/init-git.el

Signed-off-by: Superbil <superbil@gmail.com>
Revert "let different emacs use different elpa folder"

This reverts commit b627d5b4c8acb18fd9b0fc8445220f8dc27ff048.

Signed-off-by: Superbil <superbil@gmail.com>