Merge pull request #1 from openplans/master

Shareabouts Update
Merge branch 'master' into v2_update