Merge pull request #87 from mattjbarlow/herbjackson_dev

Herb Jackson Devops Challenge #3
Herb Jackson Devops Challenge #3 (typo fix)
Herb Jackson Devops Challenge #3 (typo fix)
Merge pull request #88 from mattjbarlow/herbjackson_dev

Herbjackson dev
updating version
Merge branch 'staging' of https://github.com/mattjbarlow/apache-site into jamesc_dev

had to update version has herb merged his branch in while I had it updated

Conflicts:
	metadata.rb