Added Shape.RouteId
stash
Merge branch 'master' into route-shapes-2
More work on route maps.
Merge pull request #24 from reedlauber/route-shapes-2

Added route-specific shapes and route maps.