Remove aquamacs weirdness
Merge branch 'master' of github.com:amrik/personal