Updates based on feedback
Merge branch 'wm_114_notes' of https://github.com/rethinkdb/rethinkdb into wm_114_notes

Conflicts:
	NOTES.md