Most tests pasing now in Travis #4

Conflicts:
	.travis.yml