Couple minor changes for database reconfiguration.
Merge branch 'master' into cole
Minor changes.
Merge branch 'master' into cole
Merge pull request #43 from areveal/cole

Cole