Loosen php version constraint
Resolve composer merge fubar
Add travis.yml
Merge branch 'master' into phase-org (clean up versions)

Conflicts:
	composer.json
	composer.lock