Update README.md
Update faq.md

change 15 to 14, minor copy edits
Merge branch 'master' into v0.1.8

Conflicts:
	README.md