Clean up Startup.org
Merge branch 'master' of github.com:tgascoigne/dotfiles

Conflicts:
	.emacs.d/Startup.org