Cleanup, removes Aquamacs
Merge branch 'master' of https://github.com/shtas/dotfiles