Changed default config to be more intuitive

Points to correct location
Fixed some code for issue #137
Merge pull request #152 from jmeyer2k/develop

Adds functionality for Issue #137

Very nice.
Merge branch 'develop' into feature/admin-interface

making sure we don't lose track of these