substack Merge branch 'master' of github.com:substack/ploy

Latest commit 70f8fac

Jul 7, 2014