Merge branch 'paisley' of github.com:sw1nn/dotfiles into paisley

Conflicts:
	.emacs.d/init.el