Fixed (?) Travis build and test.
Merge branch 'master' of github.com:mnn/mcMapperLib

Conflicts:
	.travis.yml