Merge commit 'c42d3a484d0546457c56e63418f4a57b39a187f4' into cumu
Squashed 'host/' changes from 586a1bd..ce0a2d5

ce0a2d5 parameterizing nginx rules

git-subtree-dir: host
git-subtree-split: ce0a2d5cea635d31a04b2c7d60b4e2c9b04feb3b
Merge branch 'cumu' into release

* cumu:
  Squashed 'host/' changes from 586a1bd..ce0a2d5
  todo cleanup
  minor change to order of config elements
ze plan
starting a task for release deploys
Squashed 'host/' changes from ce0a2d5..7d15023

7d15023 adding digital ocean provisioner

git-subtree-dir: host
git-subtree-split: 7d15023d7afd9a636af0a065f6ce0551daa818d6
Merge commit '5976411932e18b12547abaf516e6496ff8504aef' into cumu
add a note
changing how environments are switched (a full file of config overrides can be loaded)
npm update q@1.0.1
had a weird fail in this wait...  just keep waiting in that case.
Merge branch 'cumu' into release

* cumu:
  had a weird fail in this wait...  just keep waiting in that case.
  npm update q@1.0.1
  changing how environments are switched (a full file of config overrides can be loaded)
  add a note
  Squashed 'host/' changes from ce0a2d5..7d15023
  starting a task for release deploys
  ze plan
rename config vagrant_provisioner -> vagrant_provider
jakefile.js passes through vagrantfile configs
Squashed 'host/' changes from 7d15023..813606d

813606d fix parameterization of digital ocean provider

git-subtree-dir: host
git-subtree-split: 813606d911bdd2ccb54669dcd93f5999ac53c98f
Merge commit '2ef2da1175f46b01ae76474276efa079fdf947f2' into cumu
add default config for config entries passed to vagrant for digitalocean deploy
save todo notes