Remove mistakenly checked-in conflict marker
Merge branch 'master' of github.com:openplans/shareabouts