scratch
Merge branch 'master' of github.com:mcandre/dotfiles

Conflicts:
	emacs