Merge branch 'master' of https://github.com/purcell/emacs.d
Merge branch 'master' of github.com:JamesYuan/emacs.d
Merge branch 'master' of https://github.com/purcell/emacs.d

Conflicts:
	.gitignore
c
Merge branch 'master' of github.com:JamesYuan/emacs.d
Merge branch 'master' of github.com:JamesYuan/emacs.d
nrepl-turn-on-eldoc-mode => cider-turn-on-eldoc-mode (see #150)
Don't override cider repl binding for RET (fixes #150)
Merge branch 'master' of https://github.com/purcell/emacs.d
Use fullframe to handle temporarily maximising magit-status and ibuffer
Use the newly-extracted flycheck-hdevtools package
Load flycheck-hdevtools after flycheck, not after haskell-mode
Note method for updating packages
Merge branch 'master' of https://github.com/purcell/emacs.d