Removed testy xautolock
Merge branch 'master' of https://github.com/travis-g/dotfiles
Removed nano configs
New bash prompt