Merge branch 'master' into vhost_alias
Changed the default directory statement to use rhe _directory.erb fragment.

Added `options` and `addhandlers` parameters to directories.
Merge branch 'vhost_directory' into all_features