try to fix travis (see https://github.com/travis-ci/travis-ci/issues/2219#issuecomment-41804942)

also some cleaning up of travis yml

Conflicts:
	.travis.yml