added a test database and begun removing the database from git
updated .gitignore
Merge fixes
More merge fixes