Index: branches/features/purchaseOrders/grails-app/conf/BootStrap.groovy
===================================================================
--- branches/features/purchaseOrders/grails-app/conf/BootStrap.groovy	(revision 924)
+++ branches/features/purchaseOrders/grails-app/conf/BootStrap.groovy	(revision 942)
@@ -1,2 +1,4 @@
+import org.codehaus.groovy.grails.commons.ConfigurationHolder as CH
+
 class BootStrap
 {
@@ -15,4 +17,5 @@
                 createDataService.ensureSystemAndAdminAccess()
                 createDataService.createBaseData()
+                CH.config.demoMode.enabled = true
                 createDataService.createDemoData()
                 createDataService.startSearchableIndex()
@@ -28,4 +31,5 @@
                 createDataService.ensureSystemAndAdminAccess()
                 createDataService.createBaseData()
+                if(CH.config.demoMode.enabled) createDataService.createDemoData()
                 createDataService.startSearchableIndex()
             }
Index: branches/features/purchaseOrders/grails-app/conf/BuildConfig.groovy
===================================================================
--- branches/features/purchaseOrders/grails-app/conf/BuildConfig.groovy	(revision 924)
+++ branches/features/purchaseOrders/grails-app/conf/BuildConfig.groovy	(revision 942)
@@ -2,19 +2,6 @@
 grails.project.test.class.dir = "target/test-classes"
 grails.project.test.reports.dir = "target/test-reports"
-
-def env = System.getProperty('grails.env')
-
-switch (env) {
-    case "production":
-        //grails.project.war.file = "target/${appName}-${appVersion}.war"
-        grails.project.war.file = "target/${appName}Live.war"
-        break
-    case "development":
-        grails.project.war.file = "target/${appName}Dev.war"
-        break
-    default:
-        grails.project.war.file = "target/${appName}.war"
-        break
-}
+//grails.project.war.file = "target/${appName}-${appVersion}.war"
+grails.project.war.file = "target/${appName}.war"
 
 grails.war.resources = { stagingDir, args ->
Index: branches/features/purchaseOrders/grails-app/conf/Config.groovy
===================================================================
--- branches/features/purchaseOrders/grails-app/conf/Config.groovy	(revision 924)
+++ branches/features/purchaseOrders/grails-app/conf/Config.groovy	(revision 942)
@@ -10,4 +10,10 @@
 //    grails.config.locations << "file:" + System.properties["${appName}.config.location"]
 // }
+
+// Local config file (development) otherwise try the classpath (production).
+if(new File("${appName}-config.groovy").exists())
+    grails.config.locations = [ "file:${appName}-config.groovy" ]
+else
+    grails.config.locations = [ "classpath:${appName}-config.groovy" ]
 
 // Set false due to acegi security issue.
@@ -81,5 +87,4 @@
  * Basic log levels are ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
  */
-
 log4j = {
     appenders {
@@ -404,11 +409,2 @@
     ]
 ]
-
-/**
- * Custom application global settings.
- * @todo: externalise these settings to a config file (along with the database settings) or have them configurable via the web interface+database.
- */
-taskRecurringScheduleJob.repeatInterval=10
-// It is recommended to limit the currencyList to the one that the site uses e.g: currencyList = ['AUD']
-currencyList = ['EUR', 'XCD', 'USD', 'XOF', 'NOK', 'AUD', 'XAF', 'NZD', 'MAD', 'DKK', 'GBP', 'CHF', 'XPF', 'ILS', 'ROL', 'TRL']
-
Index: branches/features/purchaseOrders/grails-app/conf/DataSource.groovy
===================================================================
--- branches/features/purchaseOrders/grails-app/conf/DataSource.groovy	(revision 924)
+++ branches/features/purchaseOrders/grails-app/conf/DataSource.groovy	(revision 942)
@@ -16,4 +16,5 @@
 
 // Environment specific settings.
+// All production config is in external config.
 environments {
     development {
@@ -51,36 +52,3 @@
         }
     }
-    production {
-        dataSource {
-            /* Delete dbCreate line after setup! */
-            /** HSQLDB - In memory */
-//             driverClassName = "org.hsqldb.jdbcDriver"
-//             username = "sa"
-//             password = ""
-//             dbCreate = "create-drop"
-//             url = "jdbc:hsqldb:mem:devDb"
-            /** HSQLDB - In file */
-//             driverClassName = "org.hsqldb.jdbcDriver"
-//             username = "sa"
-//             password = ""
-//             dbCreate = "update"
-//             url = "jdbc:hsqldb:file:prodDb;shutdown=true"
-            /** MSSQL */
-            //For more info see the docs that you downloaded with the driver.
-//             dialect = org.hibernate.dialect.SQLServerDialect // MSSQL 2000+2005 Useful with `grails schema-export`
-//             driverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-//             username = "gnumimsadmin"
-//             password = "gnumimsadmin"
-//             dbCreate = "update"
-//             url = "jdbc:sqlserver://gnumimssql01:1433;databaseName=gnumims_prod"
-            /** MySQL */
-            dialect = org.hibernate.dialect.MySQL5InnoDBDialect
-            driverClassName = "com.mysql.jdbc.Driver"
-            username = "gnumimsadmin"
-            password = "gnumimsadmin"
-            dbCreate = "update"
-            url = "jdbc:mysql://gnumimssql01:3306/gnumims_prod?autoReconnect=true&sessionVariables=storage_engine=InnoDB"
-        }
-
-    }
 }