mac os x routine
Merge branch 'master' of github.com:namin/.emacs.d

Conflicts:
	init.el