Addded bash_logout.
Wrapped in if BASH. Removed expand tilde
Merge remote master to local master.