merged changes
Merge branch 'master' of https://github.com/jrising/open-estimate
Merge branch 'master' of https://github.com/jrising/open-estimate
Merge branch 'master' of https://github.com/jrising/open-estimate
Merge branch 'master' of https://github.com/jrising/open-estimate
make models memoizable