force macaddr gem to 1.6.1
Use 'start on filesystem and vagrant-mounted and started lxc-net' for docker service on vagrant'
Merge pull request #71 from opdemand/fix-macaddr

Force macaddr gem to 1.6.1
removes .ruby-version file
adds .ruby-version to .gitignore
Merge pull request #76 from neerfri/remove-rbenv-version-file

removes .ruby-version file
Updated docker image versions.
fix :pull_if_missing behavior with explicit use of repository and tag fields
add autoupgrade flag to upgrade containers when images change
Merge pull request #77 from opdemand/fix-pull-if-missing

Fix :pull_if_missing behavior
reset docker image tags to latest for use with trusted builds
Merge pull request #79 from opdemand/reset-to-latest

Reset docker image tags to latest for use with trusted builds
:redeploy containers when new image is pulled

When a new image is pulled, any existing container will be stopped, removed and re-run with the same args.
Merge pull request #80 from opdemand/auto-redeploy

Redeploy containers when new image is pulled
pin etcd gem to 0.0.6
Merge pull request #82 from opdemand/pin-etcd-gem

pin etcd gem to 0.0.6
increase builder timeout to 30 minutes

pulling deis/slugrunner and deis/slugbuilder take a really long
time due to how massive progrium/cedarish is.
Merge pull request #83 from opdemand/builder-timeout

increase builder timeout to 30 minutes
increase default timeouts
Merge pull request #84 from opdemand/increase-default-timeout

increase default timeouts