Config file updates. Got it working off a properties file now.
Merge branch 'develop'