Add local bashrc_interactive for mercury
Add MAIL env variable on mercury
Merge branch 'master' of github.com:mhmurray/tentacle