Making validators smarter #128
db patches for  #128
modifying the bootstrap sql files too #129

Initially thought we'd only need to add this to the incremental patch.