Updating bashrc and gitignore to handle more workspaces and complications (catkin, etc....)
Merge branch 'master' of github.com:mbforbes/fourteen