fix a few minor merge issues
fix a few minor merge issues
fix a few minor merge issues
unit tests
remove reflection
make model expire come from config, but overrideable
fix up whitespace
Merge pull request #2 from shmax/implement-model-caching

Implement model caching