re-target Berksfile to deis-cookbook master, update other cookbooks

Author: Gabriel Monroy

Berksfile

@@ -6,4 +6,4 @@ cookbook 'sudo'
 #cookbook 'deis', '~> 0.5.0'
 
 # development cookbook
-cookbook 'deis', git: 'https://github.com/opdemand/deis-cookbook.git', branch: 'containerize'
+cookbook 'deis', git: 'https://github.com/opdemand/deis-cookbook.git', branch: 'master'

Berksfile.lock

@@ -1,7 +1,7 @@
 {
   "sources": {
     "apt": {
-      "locked_version": "2.3.4"
+      "locked_version": "2.3.6"
     },
     "rsyslog": {
       "locked_version": "1.10.2"
@@ -12,10 +12,10 @@
     "deis": {
       "locked_version": "0.5.0",
       "git": "https://github.com/opdemand/deis-cookbook.git",
-      "ref": "7f4e0cd7bb9f4338d1022f7de3a6a70d71fbf1e0"
+      "ref": "21a179de94ad7d82f84f43bc8b9a9a12c2568c60"
     },
     "docker": {
-      "locked_version": "0.30.0"
+      "locked_version": "0.30.1"
     },
     "git": {
       "locked_version": "2.9.0"
@@ -39,7 +39,7 @@
       "locked_version": "3.0.6"
     },
     "yum-epel": {
-      "locked_version": "0.2.0"
+      "locked_version": "0.3.0"
     },
     "golang": {
       "locked_version": "1.3.0"