Merge branch 'custom-post-types' into county-office-locator
Improved locator logic