bring in changes from master
Include columns for geocoding data

The last commit was in error - backing out that change