Restored my bashrc!
Merge with master to fix conflicts