fix travis script
Merge pull request #12 from nohana/bugfix/fixTravisScript

fix travis script
Merge branch 'master' into travis_fix

Conflicts:
	.travis.yml