Complete travis-ci database setup
Make test pass... still lot of clean up to do