Change the site-include regexp to work better with Debian/Ubuntu as it is commonly used practice to omit the '.conf' part on vhost files.
Merge pull request #759 from caezs/master

Change the site-include regexp to work better with Debian/Ubuntu...