Merge branch patch-17 of https://github.com/shawnjohnson/api.data.gov into shawnjohnson-patch-17