ups
Merge branch 'master' of github.com:mattblackwell/emacs-starter-kit
Merge branch 'master' of github.com:mattblackwell/emacs-starter-kit

Conflicts:
	mblackwell.org