ran a data update, restored keywords
Merge pull request #28 from 18F/updated-data

Ran a data update, restored keywords, and generally konkloned