fixed and improved setting of ps1
set clojure files to have shiftwidth of 2
Merge branch 'master' into work
Merge branch 'work' of github.com:b-ryan/dotfiles into work

Conflicts:
	bashrc