Home refactoring to support multiple models
Merge branch 'master' of https://github.com/ging/vish