Let berkshelf resolve dependencies itself

Currently, the depenencies for the deis cookbook are listed
both in the Berksfile in the deis project and the metadata for
the deis cookbook. They should only live in the deis cookbook,
and dependencies will be automatically resolved when Berkshelf
pulls that cookbook.

This can cause issues, as the deis cookbook locks its dependencies
to known versions and the deis project Berksfile just pulls the
latest versions.

We don't need a Berksfile.lock anymore either, as the cookbook
now pins its depencies properly.

Author: carmstrong

.gitignore

@@ -45,6 +45,7 @@ controller/.secret_key
 logs/
 
 # Misc.
+Berksfile.lock
 .DS_Store
 htmlcov/
 .ruby-version

Berksfile

@@ -1,10 +1,4 @@
-site :opscode
-
-cookbook 'apt'
-cookbook 'docker'
-cookbook 'rsyslog'
-cookbook 'sudo'
-#cookbook 'deis', '~> 0.6.0'
-
-# development cookbook
+# TODO Once we have a good release cadence and are publishing cookbook versions
+# regularly, this should be locked to a particular version. Until then, always
+# use the most freshly-baked version.
 cookbook 'deis', git: 'https://github.com/opdemand/deis-cookbook.git', branch: 'master'