Update README.md
Merge branch 'master' into test-suite

Conflicts:
	README.md

Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>