Merge branch 'master' of https://github.com/jfly/libtnoodle

Conflicts:
	.travis.yml