Merge pull request #46 from mattjbarlow/staging

Staging
updated metadata, updated index.html, and added some stuff to create /var/www/html cause kitchen was complaining
Rebase
Merge branch 'staging' of github.com:mattjbarlow/apache-site into staging

Conflicts:
	files/default/index.html