Merge pull request #3 from ambertunnell/ben_branch

Ben branch
Merge branch 'master' of github.com:ambertunnell/worldview into ben_branch
Adds additional cities and Beijing hardcode fix