improved doc strings
Merge remote-tracking branch 'upstream/master' into add-generic-foreign-key-field

Conflicts:
	conduit/api/fields.py