Cleaned up init.el
Merge branch 'master' of github.com:ronmrdechai/emacs.d