few changes on the mac
Merge branch 'master' of github.com:banrahan/emacs.d

Conflicts:
	init.el