Add epiphy
Add link to repo
Add docs on function w/merge; fixes #505
Merge branch 'issue-505-merge-function'
Merge pull request #509 from rethinkdb/michel_508_epiphy

Add epiphy to the frameworks/libraries page
Update AWS docs; fixes #487
use proper language for syntax highlighting in api/
Merge pull request #514 from rethinkdb/atnnn/highlight

Use proper language for syntax highlighting in api/
Change wording of link to during
Changes based on review; fixes #515
Merge branch 'issue-515-during'
Update FAQ; closes #412
Clarify JSON import format; fixes #518
Clarify JSON import format; fixes #518
Merge branch 'master' of github.com:rethinkdb/docs

Conflicts:
	1-get-started/importing.md
Add increment field recipe; closes #511
adding link to python orm
Style tweak
Merge branch 'caoimhghin-master'
:Merge branch 'master' into v1.15