update readme
update travis
update travis
update travis
update travis
Merge branch 'koan'

Conflicts:
	README.md