Merge branch 'master' into release

Author: jmdobry

circle.yml

@@ -7,8 +7,9 @@ machine:
     version: 5.7.0
 dependencies:
   pre:
-    - npm i -g npm codecov nyc
-    - npm i js-data@^3.0.0-beta.10 rethinkdbdash
+    - npm i -g npm
+    - npm i -g codecov nyc
+    - npm i js-data@^3.0.0-rc.4 rethinkdbdash
     - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
     - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
     - sudo apt-get update -qq