Add OS X-specific configurations
Merge branch 'master' of github.com:ebanner/dotfiles

Conflicts:
	emacs