diff --git a/README.md b/README.md
index 4995e852..d593115c 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,8 @@ Here is the **[FAQ](https://github.com/Pita/etherpad-lite/wiki/FAQ)**
 ## Next Steps
 You can modify the settings in the file `settings.json`
 
+If you have multiple settings files, you may pass one to `bin/run.sh` using the `-s|--settings` option. This allows you to run multiple Etherpad Lite instances from the same installation.
+
 You should use a dedicated database such as "mysql" if you are planning on using etherpad-lite in a production environment, the "dirty" database driver is only for testing and/or development purposes.
 
 You can update to the latest version with `git pull origin`. The next start with bin/run.sh will update the dependencies
diff --git a/bin/installDeps.sh b/bin/installDeps.sh
index 6767b693..270ec98c 100755
--- a/bin/installDeps.sh
+++ b/bin/installDeps.sh
@@ -40,10 +40,18 @@ if [ ! $(echo $NODE_VERSION | cut -d "." -f 1-2) = "v0.6" ]; then
   exit 1 
 fi
 
-#Does a settings.json exist? if no copy the template
-if [ ! -f "settings.json" ]; then
-  echo "Copy the settings template to settings.json..."
-  cp -v settings.json.template settings.json || exit 1
+#Get the name of the settings file
+settings="settings.json"
+a='';
+for arg in $*; do
+  if [ "$a" = "--settings" ] || [ "$a" = "-s" ]; then settings=$arg; fi
+  a=$arg
+done
+
+#Does a $settings exist? if no copy the template
+if [ ! -f $settings ]; then
+  echo "Copy the settings template to $settings..."
+  cp -v settings.json.template $settings || exit 1
 fi
 
 echo "Ensure that all dependencies are up to date..."
diff --git a/bin/run.sh b/bin/run.sh
index a5245ff7..c409920e 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -21,9 +21,9 @@ if [ "$(id -u)" -eq 0 ]; then
 fi
 
 #prepare the enviroment
-bin/installDeps.sh || exit 1
+bin/installDeps.sh $* || exit 1
 
 #Move to the node folder and start
 echo "start..."
 cd "node"
-node server.js
+node server.js $*
diff --git a/node/utils/Cli.js b/node/utils/Cli.js
new file mode 100644
index 00000000..0c7947e9
--- /dev/null
+++ b/node/utils/Cli.js
@@ -0,0 +1,38 @@
+/**
+ * The CLI module handles command line parameters
+ */
+
+/*
+ * 2012 Jordan Hollinger
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an
+  "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// An object containing the parsed command-line options
+exports.argv = {};
+
+var argv = process.argv.slice(2);
+var arg, prevArg;
+
+// Loop through args
+for ( var i = 0; i < argv.length; i++ ) {
+  arg = argv[i];
+
+  // Override location of settings.json file
+  if ( prevArg == '--settings' || prevArg == '-s' ) {
+    exports.argv.settings = arg;
+  }
+
+  prevArg = arg;
+}
diff --git a/node/utils/Settings.js b/node/utils/Settings.js
index e9570211..efa22694 100644
--- a/node/utils/Settings.js
+++ b/node/utils/Settings.js
@@ -22,6 +22,7 @@
 var fs = require("fs");
 var os = require("os");
 var path = require('path');
+var argv = require('./Cli').argv;
 
 /**
  * The IP ep-lite should listen to
@@ -88,9 +89,12 @@ exports.abiwordAvailable = function()
   }
 }
 
+// Discover where the settings file lives
+var settingsFilename = argv.settings || "settings.json";
+var settingsPath = settingsFilename.charAt(0) == '/' ? '' : path.normalize(__dirname + "/../../");
+
 //read the settings sync
-var settingsPath = path.normalize(__dirname + "/../../");
-var settingsStr = fs.readFileSync(settingsPath + "settings.json").toString();
+var settingsStr = fs.readFileSync(settingsPath + settingsFilename).toString();
 
 //remove all comments
 settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,"");
diff --git a/static/custom/css.template b/static/custom/css.template
index b47c7fc0..236251d9 100644
--- a/static/custom/css.template
+++ b/static/custom/css.template
@@ -1,5 +1,8 @@
 /*
-  You may have to use !important to override css attributs, for example:
-  
-  * {color: blue !important;}
+  custom css files are loaded after core css files. Simply use the same selector to override a style.
+  Example:
+      #editbar LI {border:1px solid #000;}
+    overrides
+      #editbar LI {border:1px solid #d5d5d5;}
+    from pad.css
 */
diff --git a/static/pad.html b/static/pad.html
index 0345d65b..710b0f01 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -170,6 +170,7 @@
                         <input type="file" name="file" size="15" id="importfileinput"> 
                         <div class="importmessage" id="importmessagefail"></div> 
                     </div> 
+                    <div id="import"></div>
                     <div class="importmessage" id="importmessagesuccess">Successful!</div> 
                     <div class="importformdiv" id="importformsubmitdiv"> 
                         <input type="hidden" name="padId" value="blpmaXT35R">