Merge branch 'release/2.3.0' into develop
[BUGFIX] Phone number grammar should only allow a single instance of '*'/'x'
Merge pull request #20 from benlangfeld/feature/phone_single_extension

[BUGFIX] Phone number grammar should only allow a single instance of '*'/'x'
Update .travis.yml
Add failing test case demonstrating #21
[BUGFIX] Concatenating documents containing strings across the border inserts appropriate spacing

Fixes #21
[UPDATE] Bump to 2.3.1
[BUGFIX] Fix #21 on JRuby also
Merge branch 'release/2.3.1'