Add OS X to the test matrix
Use rbx-2 instead of rbx on Travis