Database Fixes and sooooo many other things
Merge branch 'master' of https://github.com/gadeweever/wildhacks.git