Merge branch 'master' into jarv/nginx-refactor

AUTHORS

 John Jarvis <jarv@edx.org>
 Sef Kloninger <sef@kloninger.com>
-Joe Blaylock <jrbl@jrbl.org>
+Joe Blaylock <jrbl@stanford.edu>
 Vik Paruchuri <vik@edx.org>
 Jason Bau <jbau@stanford.edu>
 Ed Zarecor <ed@edx.org>
 John Kern <kern3020@gmail.com>
 Will Daly <will@edx.org>
 Bethany LaPenta <lapentab@mit.edu>
-Jay Zoldak <zoldak@edx.org>
+Jay Zoldak <jzoldak@edx.org>

util/jenkins/ansible-configure.sh

@@ -18,9 +18,12 @@
 
 export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
 
-dir=$(dirname $0)
-source "${dir}/ascii-convert.sh"
-
+if [[ -z $WORKSPACE ]]; then
+    dir=$(dirname $0)
+    source "$dir/ascii-convert.sh"
+else
+    source "$WORKSPACE/util/jenkins/ascii-convert.sh"
+fi
 
 if [[ -z $dns_name ]]; then
   echo "The hostname is required to know what machine to configure"

util/jenkins/ansible-provision.sh

@@ -19,8 +19,13 @@
 # - name_tag
 
 export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
-dir=$(dirname $0)
-source "${dir}/ascii-convert.sh"
+
+if [[ -z $WORKSPACE ]]; then
+    dir=$(dirname $0)
+    source "$dir/ascii-convert.sh"
+else
+    source "$WORKSPACE/util/jenkins/ascii-convert.sh"
+fi
 
 if [[ -z $github_username  ]]; then
   github_username=$BUILD_USER_ID
@@ -43,7 +48,7 @@ fi
 
 if [[ -z $ami ]]; then
   if [[ $server_type == "full_edx_installation" ]]; then
-    ami="ami-c97727a0"
+    ami="ami-65db8b0c"
   elif [[ $server_type == "ubuntu_12.04" ]]; then
     ami="ami-d0f89fb9"
   fi