Some tweaks to vocab and patterns
Merge branch 'master' of https://github.com/OpenSextant/opensextant