WP-269 Use slug to handle user-modified neighborhood (etc.) taxonomy terms
Merge branch 'WP-269' into staging