Proper loc for ways
Update map_server with new field names
Cleaning up a little bit
Merge branch 'pr/9'