Syncing
Merge branch 'master' of https://github.com/InFreefall/dotemacs

Conflicts:
	init.el