Cleanup, minor refactoring, updated README
Merge branch 'master' of github.com:kuria/event

Conflicts:
	README.markdown