misc progress
Merge branch 'master' of https://github.com/dsincl12/sails-rethinkdb

Conflicts:
	index.js