Add .htaccess to .gitignore for development machines
Set correct permissions sitewide
Merge branch 'master' of https://github.com/edwinphillips/woodys