Changes from cvm: prompt path changes

.bashrc

@@ -54,7 +54,7 @@ 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='[$([[ -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$(__git_ps1 " (%s)")]\$ '
+    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$(__git_ps1 " (%s)")]\$ '
     #PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
 unset color_prompt force_color_prompt

.gitconfig

@@ -22,3 +22,8 @@
 [core]
   whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
 
+[push]
+	default = current
+
+[pull]
+	default = current

.irbrc

@@ -1,5 +1,5 @@
-require 'rubygems'
 #require 'interactive_editor'
+require 'rubygems'
 
 # Automatic Indentation
 IRB.conf[:AUTO_INDENT] = true
@@ -13,8 +13,8 @@ IRB.conf[:SAVE_HISTORY] = 500
 IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-save-history"
 
 
-# https://github.com/michaeldv/awesome_print
 require "awesome_print"
+# https://github.com/michaeldv/awesome_print
 unless IRB.version.include?('DietRB')
   IRB::Irb.class_eval do
     def output_value

.vimrc

@@ -103,7 +103,7 @@ set scrolloff=3
 
 " Catch trailing whitespace
 " Make them show with ,s
-" set listchars=tab:>-,trail:·,eol:$
+set listchars=tab:>-,trail:·,eol:$
 nmap <silent> <leader>s :set nolist!<CR>