+ Made some initial changes to the new schema. Need to add some key constraints still.
Authored by: bworrell 2011-01-03
Parent: [r949]
Child: [r951]