Colourized git branch on PS1
Added p4merge to git :)
Merge branch 'master' of github.com:saurabhdas/clutter-closet