chore(contrib/vagrant): update vagrant box to coreos-296.0.0
Merge pull request #808 from deis/coreos-296.0.0

chore(contrib/vagrant): update vagrant box to coreos-296.0.0
refactor(client): rename containers to ps

'ps' is the naming convention that Heroku uses for application
containers. We should folow suit so that developers migrating
from Heroku are more comfortable with the Deis CLI.
fix(scheduler): announce proper address

Before, the announce container relied on `getent` to retrieve the
hostname. Some hosts do not have `getent hosts deis` properly
routed, which would make the router crash and burn because it would
try to route traffic to `:1234` instead of `10.0.2.14:1234`.
Instead, the announce container now retrieves the host's IP address
from /etc/environment. This is the public IP address, which is
written to /etc/environment.

See https://github.com/deis/deis/blob/master/contrib/coreos/override-plugin.rb#L87-L92

fixes #797
Merge pull request #813 from deis/rename-containers

refactor(client): rename containers to ps
Merge pull request #814 from deis/fix-announce

fix(scheduler): announce proper address
Removed duplicate etcdctl installation statements
Merge pull request #822 from zyegfryed/patch-1

fix(database): removed duplicate etcdctl installation statements
chore(vagrant): update box to coreos-298.0.0

Manifest diff at https://github.com/coreos/manifest/commit/468d1529cc2bd733d51228498639906558ddb3c4
Merge pull request #824 from deis/coreos-298.0.0

chore(vagrant): update box to coreos-298.0.0
fix(services): manage dependencies manually

Since fleet's dependency management cross-cluster is lacking
(see coreos/fleet#338), we resort to starting the services in
a certain order. We also remove Requires=/After= if the dependency
could potentially exist on another server in the cluster.
We're essentially waiting for X-Requires/X-After to be implemented
in fleet.

Also, we make the contrib/ scripts use this Makefile to start
services so we don't repeat logic. Lastly, fleet version checking
is added to the Makefile so that it will error if fleetctl locally
is a different version than the server - many unstable/incomplete
changes are in master.

fixes #810, #805
Merge pull request #821 from deis/fix_scheduling

fix(services): manage dependencies manually
chore(controller): update to Django 1.6.3 security release

Details at https://www.djangoproject.com/weblog/2014/apr/21/security/