Merge pull request #5 from markbahnman/master

Bugfix for initializing the db
Merge remote-tracking branch 'upstream/master'

Reverting master to clean copy of upstream