Added Travis file to repo

Conflicts:
	.travis.yml
updates to travis
updates to travis to run composer install
Another attempt at the travis config