fixed and improved setting of ps1
set clojure files to have shiftwidth of 2
Merge branch 'master' into necromancer