Fix a few mapping problems and change @ to ! to specify verse parts.
Also updated mapping code to be a bit more efficient and added lots of review comments.
Merge branch 'master' into osisify

* master:
  Rewrote the StringUtil split and splitAll methods to be much faster.
Merge branch 'osisify'

* osisify:
  Fix a few mapping problems and change @ to ! to specify verse parts. Also updated mapping code to be a bit more efficient and added lots of review comments.