Changes from wc
Merge branch 'master' of github.com:NYTimes/pourover