From b9ced9b3d1ebc3a9c5927963ec67fd365a48f57a Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Wed, 11 Mar 2015 19:21:47 -0700
Subject: [PATCH] Fix default versions

---
 scripts/deploy                   | 2 +-
 src/coffee/constants.coffee      | 4 ++--
 src/coffee/models/storage.coffee | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/deploy b/scripts/deploy
index 63fd6ed72..2c312dbb3 100755
--- a/scripts/deploy
+++ b/scripts/deploy
@@ -21,7 +21,7 @@ fi
 if [[ "$TARGET" == "new" ]]; then
     find "$ROOT" -name ".DS_Store" | xargs rm
     grunt clean dist
-    s3cmd sync -r --delete-removed --add-header="cache-control:max-age=1800" "$ROOT/" "s3://new.$SITE/"
+    aws s3 sync "$ROOT/" "s3://new.$SITE/" --delete
     grunt clean build
 elif [[ "$TARGET" == "promote" ]]; then
     aws s3 sync "s3://new.$SITE" "s3://$SITE" --delete
diff --git a/src/coffee/constants.coffee b/src/coffee/constants.coffee
index f740ed887..6aeb94203 100644
--- a/src/coffee/constants.coffee
+++ b/src/coffee/constants.coffee
@@ -10,11 +10,11 @@ exports.DefaultMods =
     minecraft:             { defaultVersion: '1.7.10' }
     applied_energistics_2: { defaultVersion: 'rv1-stable-1' }
     buildcraft:            { defaultVersion: '6.2.6' }
-    enderio:               { defaultVersion: '2.2.7.235' }
+    enderio:               { defaultVersion: '2.2.7.325' }
     ic2_classic:           { defaultVersion: 'none' }
     industrial_craft_2:    { defaultVersion: '2.2.663' }
     railcraft:             { defaultVersion: '9.5.0' }
-    thermal_expansion:     { defaultVersion: '4.0.0B6-23' }
+    thermal_expansion:     { defaultVersion: '4.0.0B8-23' }
 
 exports.Duration = Duration = {}
 Duration.snap    = 200
diff --git a/src/coffee/models/storage.coffee b/src/coffee/models/storage.coffee
index 8f205678c..0c4804ecd 100644
--- a/src/coffee/models/storage.coffee
+++ b/src/coffee/models/storage.coffee
@@ -46,7 +46,7 @@ module.exports = class Storage
 
     _loadProperty: (key, model, property, defaultValue=null)->
         loadedValue = @load "#{key}:#{property}"
-        if value?
+        if loadedValue?
             value = JSON.parse loadedValue
         else
             value = defaultValue