Update to interactive bashrc
Merge branch 'master' of github.com:mhmurray/tentacle

Conflicts:
	.bashrc_interactive_muon

This turned into a symlink while the file was moved
to bashrc_interactive_muon