Merge branch 'ext48' into map
Merge pull request #180 from jgunderson/map

 Closes #181, initial set of BI Maps for cities
Merge branch 'ext48' into movestyle