Merge branch 'master' into issue-6
Merge pull request #6 from vogdb/issue-6

Create separate config file for data that depends on the environment.
Merge branch 'master' into issue-7