removing the speaker profile feature. It isn't linked from anywhere I can find, or used at all
Merge remote-tracking branch 'dstockto/cs_user_model' into phpcs_user_model
Merge branch 'master' of git://github.com/joindin/joind.in into phpcs_user_model
modifying api v1 user/getdetail to only accept user_id rather than guessing whether something is a username or user_id
Revert "Merge remote-tracking branch 'stevangoode/JOINDIN-154' into edit-event-form"

This reverts commit 1c6c0f26e12ce1704574b3377541688c5a482b50, reversing
changes made to 989edccfe45b8c312ee3cb4dc20e9b21de7b3bab.
JOINDIN-249 - More tests for Request object, minor refactoring
Fixed the invalid css for jquery. Fixed bug JOINDIN-265.
Updated the user view to display the line correctly for events gone to and coming up
making a new talk comment give a 201 Created status code response, with a Location
Fix for bug #274 - the code was modifying the timestamp for the DST offset, even though the DateTime object already took care of that
Bug 274 - apiv2 was also affected by timezone bug
Add test environment to Vagrant

Adds a modified version of the puppet script by deizel that sets up all
of the testing tools used in the build script. Additionally adds a
flag to params.pp that prevents the test environment from being
provisioned.
Balance gitmodule indent
Updates to tests, @backupGlobals for only tests that mess with globals, skipping/removing tests that break due to timezone changes. JOINDIN-249
Removed php closing tag that was showing in the ui
removing and adapting tests that don't work with initial sample data, as they add nothing
Increase verbosity of phpunit, decrease verbosity of phpcs, turn off phpunit colors since we want to capture the output in the jenkins logs
Merge branch 'testfix1'
Merge branch 'test-dumbness'
Merge branch 'apiv2_request_test'
Merge branch 'apiv2-201-new-comment'