diff --git a/build.gradle b/build.gradle
index 9b86920c..8b12f026 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ task syncWithRepo(dependsOn: 'classes', type: JavaExec) {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.0'
+    gradleVersion = '1.2'
 }
 
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e3b3376e..7b359d71 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5397bfa3..73abbcea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 20 11:41:01 CDT 2012
+#Tue Apr 07 23:19:43 IDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip
diff --git a/gradlew b/gradlew
index cf126509..3851082a 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
             warn "Could not set maximum file descriptor limit: $MAX_FD"
         fi
     else
-        warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
     fi
 fi
 
diff --git a/src/main/groovy/com/entagen/jenkins/Main.groovy b/src/main/groovy/com/entagen/jenkins/Main.groovy
index 50a99a4f..c4e7ba76 100644
--- a/src/main/groovy/com/entagen/jenkins/Main.groovy
+++ b/src/main/groovy/com/entagen/jenkins/Main.groovy
@@ -87,7 +87,7 @@ class Main {
         Map <String, String> mergedArgs = [:]
         opts.each { String shortOpt, Map<String, String> optMap ->
             if (optMap.argName) {
-                mergedArgs[optMap.argName] = commandLineOptions."$shortOpt" ?: System.getProperty(optMap.argName)
+                mergedArgs[optMap.argName] = commandLineOptions."$shortOpt" ?: System.getProperty(optMap.argName) ?: System.env.get(optMap.argName)
             }
         }
         return mergedArgs.findAll { k, v -> v }
diff --git a/src/main/groovy/com/entagen/jenkins/TemplateJob.groovy b/src/main/groovy/com/entagen/jenkins/TemplateJob.groovy
index 8bfa9d0d..a33f1722 100644
--- a/src/main/groovy/com/entagen/jenkins/TemplateJob.groovy
+++ b/src/main/groovy/com/entagen/jenkins/TemplateJob.groovy
@@ -7,7 +7,7 @@ class TemplateJob {
 
     String jobNameForBranch(String branchName) {
         // git branches often have a forward slash in them, but they make jenkins cranky, turn it into an underscore
-        String safeBranchName = branchName.replaceAll('/', '_')
+        String safeBranchName = branchName.replaceAll("[^a-zA-Z0-9_]", "_")
         return "$baseJobName-$safeBranchName"
     }