add new settings, modify mapping to use custom analyzer
include state name, where available
Merge pull request #1 from ClipCard/feature/custom-analyzer

Custom analysis and settings supported