Merge branch 'develop' of github.com:mloberg/Simple-Wiki into develop

Conflicts:
	index.php
Merge branch 'develop' of github.com:mloberg/Simple-Wiki into develop
Allow content dir to be set
Update composer.json with some package information

Add information to composer.json so it can be published to Packagist and
installed with create-project.