Add packages
Allow theme
Merge branch 'master' of github.com:mjs2600/emacs_config

Conflicts:
	Cask
	init.el