Correct name for .travis.yaml
Merge branch 'testing' of github.com:dotKom/feedme into testing

Conflicts:
	.travis.yml
	feedme/.travis.yml
	travis.yaml