Rename travis.yml file and move things arround.
Merge branch 'master' of https://github.com/PabloVallejo/Str

Conflicts:
	.travis.yml