Cleanup, readme
Merge branch 'master' of github.com:wyde19/prototype

Conflicts:
	README.rdoc