add mac config
Merge branch 'workplace' of https://github.com/xiaonaitong/dotfiles into workplace

Conflicts:
	.emacs