Switch master to v0.5.0.
Merge pull request #503 from tombh/493-vagrant-detection

Replace method for checking if client is in a vagrant setup.
rename gitignore to gitkeep
Added containerize branch to Travis CI.
Merge pull request #505 from opdemand/rename-gitignore

rename gitignore to gitkeep
First working draft of @bacongobbler's service registry code.
Squashed commit of the following:

commit 69f03d603ea270f24741e047099f441decde5679
Author: Tom Buckley-Houston <tom@tombh.co.uk>
Date:   Thu Jan 23 10:53:04 2014 +0000

    Fix for Travis failing to install MySQLdb

commit 1e9ccb0f6a004366a0ac22fa5f215fa81447b0e5
Author: Tom Buckley-Houston <tom@tombh.co.uk>
Date:   Thu Jan 23 00:16:39 2014 +0000

    First working draft of service registry with tests. #231

commit 94b3e096a52ac39d1545e73b2dde60fb132d5fa5
Author: Tom Buckley-Houston <tom@tombh.co.uk>
Date:   Wed Jan 22 22:05:59 2014 +0000

    Don't seed the database with service providers, but add records as and when needed. Complete CLI methods for docs and dashboard

commit c7f40ce8ebfc9e22d5325abd7b574d549ab491fc
Author: Thomas Buckley-Houston <tom@tombh.co.uk>
Date:   Wed Jan 22 17:53:32 2014 +0000

    plural typo for ServiceProvider

commit 0fca08032e1e40603e47957ef0a6d0186567b917
Merge: f3552c0 5bddae3
Author: Thomas Buckley-Houston <tom@tombh.co.uk>
Date:   Wed Jan 22 17:37:10 2014 +0000

    Merge branch '231-service-registry' of github.com:tombh/deis into 231-service-registry

    Conflicts:
    	api/views.py

commit f3552c05d384b00c9a6a63dd0713e9d38e901088
Author: Thomas Buckley-Houston <tom@tombh.co.uk>
Date:   Wed Jan 22 17:34:41 2014 +0000

    Automatically pull in the service provider docs and dashboard from each service.provider module

commit 5bddae31b7d5a3aa3047c156d1b7d2e7afff531f
Author: Tom Buckley-Houston <tom@tombh.co.uk>
Date:   Wed Jan 22 00:21:48 2014 +0000

    Rename ServiceViewSet to AppServiceViewSet

commit 4cc608cc0dc6f9e85f7bae5850d58d093313e9a7
Author: Tom Buckley-Houston <tom@tombh.co.uk>
Date:   Sun Jan 19 21:35:15 2014 +0000

    WIP. Added doc/dashboard opening methods. Trying to figure out why I can't overrider get_objet()

commit 734cb3d2f4ffe11d037dcb58ce1d4408236543ee
Author: Tom Buckley-Houston <tom@tombh.co.uk>
Date:   Sat Jan 18 17:21:58 2014 +0000

    WIP #231. Added a few more methods to the CLI and tidying things up.

commit 06031661aa2871fa806527363388fc8bef705566
Author: Tom Buckley-Houston <tom@tombh.co.uk>
Date:   Sat Jan 18 02:50:55 2014 +0000

    WIP for #231. Moved services app into api app. Client receives and adds service URI to config

commit fd8ac0cefb0cbe58e88e13f5b0203daf1b19f036
Author: Thomas Buckley-Houston <tom@tombh.co.uk>
Date:   Tue Jan 14 13:42:35 2014 +0000

    Basic integration of @bacongobbler's service-registry. CLI receives JSON response that includes MySQL URI. #231
Renamed ServiceProvider to Service and Service to Addon