WIP2
Merge branch 'ec2' of github.com:pjstadig/new.dotfiles into ec2

Conflicts:
	.emacs.d/paul.el