map and normalize
added files
added tests
Merge pull request #60 from 18F/keyword_fix

Keyword fix