Merge pull request #161 from jpecht/master

state search on picking state / cfm update / merge
added a locl.html and its source files in case we need it
fixed typo.  added some justice data
search improvements
Merge remote-tracking branch 'upstream/master'