adding gitbranch to PS1
adding @property and @setter
made # comments fold in vim
Merge branch 'master' of https://github.com/kylekinkade/ubuntu-files