Merge pull request #367 from pataquets/add-timeout-parameter

Add 'Timeout' core directive.
Merge pull request #366 from pataquets/add-ifmodule-to-alias

Add conditional <IfModule> directive to alias_module template.
Remove vhost symlink if ensure != present.
Merge branch 'remove-vhost-symlink-if-ensure-absent' into prod-s1