Merge branch 'master' of github.com:openplans/pyshareabouts

Conflicts:
	setup.py
	shareabouts/__init__.py
	shareabouts/models.py