model caching
Merge pull request #417 from shmax/implement-model-caching

model caching
remove test.db, ignore all .db files
coding style, cleanup of 1ed2239
Merge pull request #421 from koenpunt/remove-test-db

Remove test db
fix conflicts