Gemfile.lock, stock, and two smoking barrels
Merge branch 'master' of github.com:variations-on-video/hydrant