keep www
Merge branch 'master' of github.com:tylodo/htaccess