added hexgrid layer
Merge branch 'develop' into hexgrid
revising neighborhood display
added error checking for get_neighborhood
Merge branch 'master' into hexgrid
pulling in fixes from master
added new neighborhoods
fixed neighborhoods display