Merging changes.
Merge branch 'master' of github.com:InFreefall/dotemacs

Conflicts:
	init.el