finished database setup
Added dependent options to some models
Merge pull request #1 from Jhowden/database_setup

finished database setup