Move environment variables back to bash_aliases

bashrc is ignored if we use bash_profile. This causes bash_aliases to not be included. We could include bash_aliases in our bash_profile, but we would then miss all of the default stuff provided by the VM in bashrc
Reintroduce bash_profile to handle environment vars...

...but handle it properly this time. If bash_profile is detected, then .profile is not loaded. Normally .profile sources .bashrc, so we should account for that as well.