Update capistrano scripts for move to tamu
Merge remote-tracking branch 'origin/master'