added stuff
Merge branch 'master' of github.com:zacaway/prelude

Conflicts:
	personal/0-packages.el