Fixing .htaccess to ignore rewriting PHP files directly
Merge pull request #27 from halkyon/htaccess_fix

Fixing .htaccess to ignore rewriting PHP files directly
Merge remote-tracking branch 'origin/3.0' into 3.1