Clean master branch to make it presentable without too much shame.
Merge branch 'proto'

Conflicts:
	README.md
Set test to exercise concurrency, not benchmark.