Add ability for handling more than one 'Allow from'-directive in _directories.erb
Remove an unnecessary empty line in directories

This just replaces a closing `%>` with a `-%>` in `_directories.erb`.
Merge pull request #762 from antaflos/patch-1

Remove an unnecessary empty line in directories
Merge pull request #735 from Malefitz/master

Enable more than one "Allow from"-rule in Directory/Location
Add parameters to provide content, template or source to the php module
Fix module usage with strict_variables
Merge pull request #721 from mcanevet/fix/strict_variables

Fix module usage with strict_variables
Merge pull request #744 from amateo/feature/php

Provide configuration file for php module
Pin rspec to ~> 2.11
Add parameters to configure negotiation module