Merge from sql -- still have to delete the fake databases
Merge branch 'master' of https://github.com/cberube9113/King-Pine