Better use of interposed model and controller
Merge branch 'interposed-cleanup'
Fixed Travis CI build