Fix error checking for rethinkdb 1.5

Closes #6
Version Bump
Merge remote-tracking branch 'upstream/master'