Properly support two envs

app.js

@@ -61,14 +61,18 @@ var port = opts.port || 10240;
 var staticDir = opts.static || 'static';
 var gitReleaseName = child_process.execSync('git rev-parse HEAD').toString().trim();
 
-var propHierarchy = [
+console.log(env);
+console.log(typeof(env));
+var propHierarchy = _.flatten([
     'defaults',
     env,
     language,
-    env + '.' + process.platform,
+    _.map(env, function (e) {
+        return e + '.' + process.platform;
+    }),
     process.platform,
-    os.hostname()];
-console.log("properties hierarchy: " + propHierarchy);
+    os.hostname()]);
+console.log("properties hierarchy: " + propHierarchy.join(', '));
 
 // Propagate debug mode if need be
 if (opts.propDebug) props.setDebug(true);
@@ -422,7 +426,7 @@ function shortUrlHandler(req, res, next) {
     var bits = req.url.split("/");
     if (bits.length !== 2 || req.method !== "GET") return next();
     var key = process.env.GOOGLE_API_KEY;
-    var googleApiUrl = 'https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/' + 
+    var googleApiUrl = 'https://www.googleapis.com/urlshortener/v1/url?shortUrl=http://goo.gl/' +
         encodeURIComponent(bits[1]) + '&key=' + key;
     https.get(googleApiUrl, function (response) {
         var responseText = '';
@@ -431,7 +435,7 @@ function shortUrlHandler(req, res, next) {
         });
         response.on('end', function () {
             if (response.statusCode != 200) {
-                console.log("Failed to resolve short URL " + bits[1] + " - got response " + 
+                console.log("Failed to resolve short URL " + bits[1] + " - got response " +
                     response.statusCode + " : " + responseText);
                 return next();
             }