Minor refactoring. [ci skip]
For Travis CI - escape bracket character to fix commit message parsing.
[ci skip]
For Travis CI - switch CI build to use OS X build environment.