Fixed #23 -- updated Docker to 0.6.4 after testing.
Merge pull request #24 from opdemand/23-docker-064

Fixed #23 -- updated Docker to 0.6.4 after testing.
Fixed opdemand/deis#233 -- made buildstep fork cleaner WRT progrium/buildstep
Fixed opdemand/deis#223 -- don't resync the controller repo on converge
Merge pull request #25 from opdemand/223-502-errors

Fixed opdemand/deis#223 -- don't resync the controller repo on converge
Switch master to v0.1.2
Pipe both stdout and stderr to logger

This may not be necessary here, but I'm doing a similar thing with piping to logger in an upstart script and needed to add 2>&1 to get both stdout and stderr. Feel free to ignore if it doesn't make sense in this context.
Merge pull request #26 from jschneiderhan/patch-2

Pipe both stdout and stderr to logger
Fixed opdemand/deis#232 - added dev support for Vagrant.
Merge branch 'master' of github.com:tombh/deis-cookbook
Updated local_settings.py template per opdemand/deis#73
Merge pull request #28 from opdemand/232-vagrant-dev

Fixed opdemand/deis#232 - added dev support for Vagrant.
Merge pull request #27 from opdemand/73-digitalocean-provider

Updated local_settings.py template per opdemand/deis#73
Merge remote-tracking branch 'upstream/master' into 232-vagrant-provider-full

Conflicts:
	templates/default/local_settings.py.erb