Cleaning up
Merge branch 'master' of https://github.com/enzuru/.emacs.d

Merging Apple and Windows .emacs.d