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