Add sophos anti virus
Add Sophos-Anti-Virus
Merge branch 'master' of github.com:gaishimo/my-boxen

Conflicts:
	modules/people/manifests/gaishimo.pp