personal changes
Merge branch 'master' of github.com:woodjk/prelude

Conflicts:
	.gitignore
	core/prelude-global-keybindings.el
	init.el