More edits.
Merge branch 'master' of https://github.com/edenton/wordvectors

Conflicts:
	docs/proposal/proposal.log