mac related changes
Merge branch 'master' of https://github.com/jqb/.emacs.d

Conflicts:
	.gitignore