Merge pull request #7 from jcarbaugh/master

Add "farm bill" nickname for S. 954 and H.R. 1947.