final schema cleanup
Merge branch 'master' of https://github.com/tgsmith61591/CoffeeTable
final schema cleanup