Adjusting users show
Merge branch 'master' of github.com:jbrunson/lif
Merging geocoder changes by Jeff
minor change
fixing merge conflicts
Merge branch 'master' of github.com:jbrunson/lif
Merging in changes