Latest updates from Mac.
Merge branch 'master' of https://github.com/aaronc/emacs.d

Conflicts:
	init.el
Latest updates from OS X.