adding travis badge to readme
Merge branch 'master' into 0.0.6

Conflicts:
	README.md