Made changes to add /root/mattparker.txt
Merge pull request #12 from mattjbarlow/mattparker_dev

Made changes to add /root/mattparker.txt
Merge pull request #13 from mattjbarlow/staging

Staging
Added /root/johnschwinghammer.txt to recipe
Merge pull request #14 from mattjbarlow/johnschwinghammer_dev

Added /root/johnschwinghammer.txt to recipe
Merge pull request #15 from mattjbarlow/staging

Merge staging into prod
Set default editor to Emacs per ticket XXX
Merge pull request #18 from mattjbarlow/TICKNUM_dev

Set default editor to Emacs per ticket XXX
Update patch level
Merge pull request #19 from mattjbarlow/staging

Staging
Changed version bump to be in line behind two other PR
Merge branch 'master' of https://github.com/mattjbarlow/apache-site into jseubert_dev

Conflicts:
	metadata.rb
	recipes/default.rb