Add city handling for User object instantiation
Merge branch 'master' of github.com:wyollinger1/massive-tyrion