Merge remote-tracking branch 'sorins/master'
Merge branch 'develop'
merged
Fixed lods of stuff, prompt now shows if in a schroot, fixed osx module loading, fixed VCS, added default zpreztorc