various changes
Merge branch 'master' of github.com:baberdeen/emacs.d

Conflicts:
	.gitignore