simplified database setup
Merge pull request #4 from perobertson/database_setup

simplified database setup