add http_load
Merge branch 'master' of https://github.com/hmatsuda/my-boxen

Conflicts:
	modules/people/manifests/hmatsuda.pp