Merge pull request #272 from yonahw/bad_taste_in_branch_naming_accept…

…ed_NOT_encouraged

I blame gitflow for this atrocity

contrib/ps1_functions

@@ -64,7 +64,7 @@ ps1_git()
    production|prod) attr="1;37m\033[" ; color=41 ;; # red
    master|deploy)   color=31                     ;; # red
    stage|staging)   color=33                     ;; # yellow
-   dev|development) color=34                     ;; # blue
+   dev|develop|development) color=34             ;; # blue
    next)            color=36                     ;; # gray
    *)
      if [[ -n "${branch}" ]] ; then # Feature Branch :)