Quickie fixes

just kidding not very quick

Minor style fixes from what we talked about today w/ Shaun

MAJOR thing here is proper migrations - going forward we can use 1.7 migrations and they should "just work"