Removing old stuff
And new schooled this config
Merge branch 'master' of github.com:benkolera/osx-env

Conflicts:
	roles/emacs/files/etc/evil.el
	roles/emacs/files/etc/filemenu.el
	roles/emacs/files/etc/haskell.el
	roles/emacs/files/etc/modeline.el
	roles/emacs/files/etc/package.el