Try enabling OS X build on travis-ci.
Merge remote-tracking branch 'origin/master'