revisions to get working nicely with athena, also some experimental perl refactoring stuff
retrofit athena customizations to only load when on a dev intranet or stage host
Merge branch 'master' of https://github.com/lackita/emacs