Move test.py back into test dir.
Merge branch 'master' into submitted

Conflicts:
	Makefile
	test/test.py
Remove unused clean rule.
Update README.md