Init changes
Merge branch 'master' of https://github.com/manuelzs/emacs.d

Conflicts:
	init.el