Updates to models
Merge branch 'master' of https://github.com/codeforsandiego/infrastructure
changes to load scripts