Gemfile.lock FTW
Merge branch 'master' of github.com:variations-on-video/hydrant