Database changes
Remove tests
Tidy
Stripped back
Merge pull request #1 from alexgarrett/master

Update