Reboot
Add packages
Merge branch 'master' of github.com:thinkmoore/.dotfiles

Conflicts:
	emacs
Updates