Merge pull request #29 from nZEDb/dev

Mostly completion stuff. Make sure to run the patches.
Update the resetdb script.