diff --git a/build/sbt-0.13.5/bin/sbt-launch.jar b/build/sbt-0.13.5/bin/sbt-launch.jar
deleted file mode 100755
index 174a7e1..0000000
Binary files a/build/sbt-0.13.5/bin/sbt-launch.jar and /dev/null differ
diff --git a/build/sbt-0.13.5/bin/sbt b/build/sbt-0.13.8/bin/sbt
similarity index 99%
rename from build/sbt-0.13.5/bin/sbt
rename to build/sbt-0.13.8/bin/sbt
index efa1987..48d1ff9 100755
--- a/build/sbt-0.13.5/bin/sbt
+++ b/build/sbt-0.13.8/bin/sbt
@@ -131,7 +131,7 @@ process_my_args () {
 }
 
 loadConfigFile() {
-  for line in $(cat "$1" | sed '/^\#/d'); do
+  cat "$1" | sed '/^\#/d' | while read line; do
     eval echo $line
   done
 }
diff --git a/build/sbt-0.13.5/bin/sbt-launch-lib.bash b/build/sbt-0.13.8/bin/sbt-launch-lib.bash
similarity index 84%
rename from build/sbt-0.13.5/bin/sbt-launch-lib.bash
rename to build/sbt-0.13.8/bin/sbt-launch-lib.bash
index 7f576f2..d57f0e9 100755
--- a/build/sbt-0.13.5/bin/sbt-launch-lib.bash
+++ b/build/sbt-0.13.8/bin/sbt-launch-lib.bash
@@ -6,12 +6,6 @@
 
 # TODO - Should we merge the main SBT script with this library?
 
-if test -z "$HOME"; then
-  declare -r script_dir="$(dirname $script_path)"
-else
-  declare -r script_dir="$HOME/.sbt"
-fi
-
 declare -a residual_args
 declare -a java_args
 declare -a scalac_args
@@ -75,13 +69,13 @@ addResidual () {
   residual_args=( "${residual_args[@]}" "$1" )
 }
 addDebugger () {
-  addJava "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=$1"
+  addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$1"
 }
 
 get_mem_opts () {
-  # if we detect any of these settings in ${java_opts} we need to NOT output our settings.
+  # if we detect any of these settings in ${JAVA_OPTS} we need to NOT output our settings.
   # The reason is the Xms/Xmx, if they don't line up, cause errors.
-  if [[ "${java_opts}" == *-Xmx* ]] || [[ "${java_opts}" == *-Xms* ]] || [[ "${java_opts}" == *-XX:MaxPermSize* ]] || [[ "${java_opts}" == *-XX:ReservedCodeCacheSize* ]]; then
+  if [[ "${JAVA_OPTS}" == *-Xmx* ]] || [[ "${JAVA_OPTS}" == *-Xms* ]] || [[ "${JAVA_OPTS}" == *-XX:MaxPermSize* ]] || [[ "${JAVA_OPTS}" == *-XX:MaxMetaspaceSize* ]] || [[ "${JAVA_OPTS}" == *-XX:ReservedCodeCacheSize* ]]; then
      echo ""
   else
     # a ham-fisted attempt to move some memory settings in concert
@@ -90,14 +84,10 @@ get_mem_opts () {
     local codecache=$(( $mem / 8 ))
     (( $codecache > 128 )) || codecache=128
     (( $codecache < 512 )) || codecache=512
+    local class_metadata_size=$(( $codecache * 2 ))
+    local class_metadata_opt=$([[ "$java_version" < "1.8" ]] && echo "MaxPermSize" || echo "MaxMetaspaceSize")
 
-    local common_opts="-Xms${mem}m -Xmx${mem}m -XX:ReservedCodeCacheSize=${codecache}m"
-    if [[ "$java_version" < "1.8" ]]; then
-      local perm=$(( $codecache * 2 ))
-      echo "$common_opts -XX:MaxPermSize=${perm}m"
-    else
-      echo "$common_opts"
-    fi
+    echo "-Xms${mem}m -Xmx${mem}m -XX:ReservedCodeCacheSize=${codecache}m -XX:${class_metadata_opt}=${class_metadata_size}m"
   fi
 }
 
@@ -143,7 +133,7 @@ process_args () {
     process_my_args "${myargs[@]}"
   }
 
-  java_version=$("$java_cmd" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+  java_version=$("$java_cmd" -Xmx512M -version 2>&1 | awk -F '"' '/version/ {print $2}')
   vlog "[process_args] java_version = '$java_version'"
 }
 
@@ -198,7 +188,7 @@ run() {
   execRunner "$java_cmd" \
     ${SBT_OPTS:-$default_sbt_opts} \
     $(get_mem_opts $sbt_mem) \
-  	  ${java_opts} \
+  	  ${JAVA_OPTS} \
     ${java_args[@]} \
     -jar "$sbt_jar" \
     "${sbt_commands[@]}" \
@@ -212,10 +202,3 @@ run() {
   fi
   exit $exit_code
 }
-
-runAlternateBoot() {
-  local bootpropsfile="$1"
-  shift
-  addJava "-Dsbt.boot.properties=$bootpropsfile"
-  run $@
-}
diff --git a/build/sbt-0.13.8/bin/sbt-launch.jar b/build/sbt-0.13.8/bin/sbt-launch.jar
new file mode 100755
index 0000000..0d9dd94
Binary files /dev/null and b/build/sbt-0.13.8/bin/sbt-launch.jar differ
diff --git a/build/sbt-0.13.5/bin/sbt.bat b/build/sbt-0.13.8/bin/sbt.bat
similarity index 100%
rename from build/sbt-0.13.5/bin/sbt.bat
rename to build/sbt-0.13.8/bin/sbt.bat
diff --git a/build/sbt-0.13.5/conf/sbtconfig.txt b/build/sbt-0.13.8/conf/sbtconfig.txt
similarity index 100%
rename from build/sbt-0.13.5/conf/sbtconfig.txt
rename to build/sbt-0.13.8/conf/sbtconfig.txt
diff --git a/build/sbt-0.13.5/conf/sbtopts b/build/sbt-0.13.8/conf/sbtopts
similarity index 100%
rename from build/sbt-0.13.5/conf/sbtopts
rename to build/sbt-0.13.8/conf/sbtopts
diff --git a/sbt b/sbt
index 483ed9c..daf352c 120000
--- a/sbt
+++ b/sbt
@@ -1 +1 @@
-build/sbt-0.13.5/bin/sbt
\ No newline at end of file
+build/sbt-0.13.8/bin/sbt
\ No newline at end of file
diff --git a/src/main/scala/com/davidsoergel/sbtbase/Dependencies.scala b/src/main/scala/com/davidsoergel/sbtbase/Dependencies.scala
index 200fd17..724105e 100644
--- a/src/main/scala/com/davidsoergel/sbtbase/Dependencies.scala
+++ b/src/main/scala/com/davidsoergel/sbtbase/Dependencies.scala
@@ -168,11 +168,11 @@ class Dependencies(globalModuleFilter: ModuleID => ModuleID = (m:ModuleID)=>m) {
 
   def scalateCore(v: String = "latest.release") = "org.fusesource.scalate" % "scalate-core" % v applyGlobal()
 
-  def scalazCore(v: String = "7.0.5") = "org.scalaz" %% "scalaz-core" % v applyGlobal()
+  def scalazCore(v: String = "latest.release") = "org.scalaz" %% "scalaz-core" % v applyGlobal()
 
-  def scalazConcurrent(v: String = "7.0.5") = "org.scalaz" %% "scalaz-concurrent" % v applyGlobal()
+  def scalazConcurrent(v: String = "latest.release") = "org.scalaz" %% "scalaz-concurrent" % v applyGlobal()
 
-  def scalazTypelevel(v: String = "7.0.5") = "org.scalaz" %% "scalaz-typelevel" % v applyGlobal()
+  def scalazTypelevel(v: String = "latest.release") = "org.scalaz" %% "scalaz-typelevel" % v applyGlobal()
 
   def scalaQuery(v: String = "latest.release") = "org.scalaquery" %% "scalaquery" % v applyGlobal()