Slight schema changes from meeting on 7/23/14

As always, use a fresh .db3 file please