Merge pull request #86 from mattjbarlow/herbjackson_dev

Herbjackson dev
James initial apache-site add. Name and metadata to .39
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
Merge pull request #90 from mattjbarlow/jamesc_dev

Jamesc dev