Fixed issue with optional params
added tests
doesn't need my name on this
add Options +FollowSymLinks to the default .htaccess file
Merging optional url strip fix from @koenpunt.
Merging niahoo/master into adduc/master