Cleaning up more DB interactions
Merge branch 'master' of https://github.com/b-heilman/snap-php.git