Mac os x support
Merge branch 'master' of github.com:DiKeert/.emacs.d

Conflicts:
	emacs