Apache vhost no longer gets enabled by apache2 cookbook 2.0.0

Apologies in advance for the white-space commit.

Apache cookbook version 2.0.0 changed:

```
Include /etc/apache2/sites-enabled/
```

to

```
Include /etc/apache2/sites-enabled/*.conf
```

And made everyone sad. This PR addresses that.

It also addresses a bug bear of mine whereby Apache issues a warning on start if you have the NameVirtualHost twice.