osx changes
Merge branch 'dev' of github.com:cagedmantis/emacs-config into dev

Conflicts:
	init.el