Updating some database stuff.
Random cleanup.
Making tests happy.
Flake happy
version bump
Merge pull request #170 from cptmashek/master

Cleanup Merge