Changed the include sites regexp from the sites-enabled directory to also load files not ending with .conf.

On Debian/Ubuntu it is a commonly used practice to omit the .conf section of the vhost config files.
Therefore if one has older/not via puppet managed vhost files without this ending those vhost files will not
be loaded after the apache2.conf has been rewritten by puppet.
Merge branch 'patch-1' of github.com:caezs/puppetlabs-apache into patch-1