Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitmodules
	init.el
	setup-slime-js.el
Merge branch 'master' of https://github.com/eirikmik/.emacs.d