Add city, state and description vars. Fix #3 and fix #7
Merge pull request #8 from flipside-org/yaml-improvements

Add city, state and description vars. Fix #3 and fix #7