incremental updates. Added some lines to .bashrc to add branch to prompt, plus some aliases