fix some things
Merge branch 'customizations' of github.com:cbilson/prelude into customizations

Conflicts:
	personal/custom.el