Fixed opdemand/deis#232 - added dev support for Vagrant.
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
Added package 'make' to default.rb

The docker container creation fails without make installed when deploying to bare metal with `knife bootstrap fqdn -r 'recipe[deis::controller]''.
Merge pull request #30 from scottstamp/patch-1

Added package 'make' to default.rb
Fixed #15, #31 -- use lxc-docker-x.y.z package so we can pin Docker.