More testing of instances and stopped down switching maps
Merge branch 'master' of https://github.com/knarr/winter