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
Updated the joindIn jQuery plugin to enable a bit more map control and feedback, and
replaced the the google map and address lookup with OSM.
Reorganised the init code for the map.
Added reference URLs
Bug 275 - Add session duration (optional)
Bug 275: added duration to API v2 results
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
Fix PHPUnit dependancies

Make sure that the PHP DOM module is installed before installing PHPUnit
Force pear channel discovery to return true

Forcing calls to pear channel-discover to always return true avoids a
failure when the channel has already been discovered. If
channel-discover failed for another reason, it will still be caught when a call to
pear install fails.
Refactor the \Request class public $verb property to protected and users to use the getter.
JOINDIN-286 - Search date picker month not very clear

Darkened date picker title to make it easy to read
Modify slides <a> tag in _talk_detail view to open in new window/tab
Added changing base_url and api_base_url in config.php to vagrant setup instructions
Merge branch 'joindin-197'
Merge branch 'remove-speaker-profile'
updating the access token for the API docs, this one exists on live so will get copied over