Update .travis.yml
adding htacess to test
Merge remote-tracking branch 'origin/master' into cutted

* origin/master:
  adding htacess to test
  Update .travis.yml

Conflicts:
	.travis.yml