travis:
Merge from master and resolve conflicts
Edit .htaccess to deny access to the .git folder with a 404 error.
undo some changes i made by mistake on .travis.yml
Merge branch 'master' into hide_git_dir
Merge pull request #225 from bugos/hide_git_dir

Hide git dir