update
Merge branch 'master' of https://github.com/greenbogabbins/bashrc

Git refusing commit (again!!!)