fix(router): dump host/port info into json object

These keys are currently unused by anything, but will help users use
these keys with confd 0.6.

See https://github.com/kelseyhightower/confd/blob/master/docs/templates.md#create-the-template
fix(router): use string instead of JSON

This format can be consumed without structured data handling. For
example, bash has no builtin commands which handle JSON data structures.
docs(router): update router's published keys
style(client): remove PyDev code linting comments
chore(controller): update Django to 1.6.8 bugfix release

https://docs.djangoproject.com/en/1.7/releases/1.6.8/
Merge pull request #2256 from mboersma/remove-eclipsisms

style(client): remove PyDev code-linting comments
Merge pull request #2259 from mboersma/update-django168

chore(controller): update Django to 1.6.8 bugfix release
feat(controller): add "deis auth:passwd" to update password
Merge pull request #2255 from mboersma/change-password

feat(controller): add "deis auth:passwd" to update password
fix(tests): remove orphaned test containers in cleanup
ref(store): reduce image size and use nginx
Merge pull request #2131 from bacongobbler/router_num

fix(router): publish routers to /deis/router/hosts
Merge pull request #2264 from mboersma/clean-test-orphans

fix(tests): remove orphaned test containers in cleanup
Merge pull request #2224 from aledbf/reduce_store_size_use_nginx

ref(store): reduce image size
feat(controller): add CORS headers to api
Merge pull request #2202 from Joshua-Anderson/api-cors

Add CORS headers to api
ref(user-data): "make discovery-url" copies from user-data.example

This also adds contrib/coreos/user-data to .gitignore, so that local
changes to this essential file do not cause "git status" to mark the
repo as dirty.
fix(Vagrantfile): require user-data when provisioning