Adds more slaves to alias and CNU_ENV dependent prompt

.bash_aliases

@@ -7,6 +7,8 @@ alias ...="cd ../.."
 alias cs="cd /export/comp/stable"
 alias ew="cd /export/web"
 alias ukslave="psql -h slavedb.quickquid.co.uk -U cgavrilescu cnuapp_prod_uk"
+alias usslave="psql -h slavedb3.cashnetusa.com -U cgavrilescu cnuapp_prod"
+alias auslave="psql -h slavedb.dollarsdirect.com.au -U cgavrilescu cnuapp_prod_au"
 export RB_INDEX_FILE=~/rb_files_cache
 alias rehash_index="find /export/comp/stable -type f | grep -v rb_files | egrep -i '(rhtml|rake|spec|rb|yml|tpl|txt)' > $RB_INDEX_FILE"
 alias greprl="xargs < $RB_INDEX_FILE egrep -l 2> /dev/null "

.bashrc

@@ -52,7 +52,8 @@ fi
 if [ "$color_prompt" = yes ]; then
     PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+    PS1='[$([[ -e /etc/cnu/cnu_env ]] && { source /etc/cnu/cnu_env && echo -n $CNU_CLUSTER/${RAILS_ENV:0:3}; } || echo no cluster set; echo -n "${_CNU_ENV:+ ($CNU_COUNTRY env)}") \w]$ '
+    #PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
 unset color_prompt force_color_prompt