Change the lead comment
Two users join a group
Trim collections of pump_io data
Trim person collections before exporting
Add messages to login page to setup navbar correctly
Upgrade Twitter Bootstrap to 2.3.1
Revert "Upgrade Twitter Bootstrap to 2.3.1"

This reverts commit 96f3d24ea86789266268e850214ce4aab4d8a10e.
Fix link to bootstrap.min.js on cdnjs
Revert "Revert "Upgrade Twitter Bootstrap to 2.3.1""

This reverts commit bf02c02d7d070e2eb6c3d60c2d9ffc914d7ffebf.
Merge branch 'bootstrap231'
Merge remote-tracking branch 'evanp/groups' into groups

Conflicts:
	test/group-api-test.js
Merge branch 'master' into groups