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
Added changing base_url and api_base_url in config.php to vagrant setup instructions
updating the access token for the API docs, this one exists on live so will get copied over
Merge pull request #727 from Eli-TW/doc_fix_for_base_url_in_config

Added changing base_url and api_base_url in config.php to vagrant setup ...
Merge branch 'phpcs_user_model'