moved vim package to tools_nogui.
base::hosts class
Merge branch 'master' of ssh://github.com/jjg1914/puppet

Conflicts:
	manifests/nodes.pp
	modules/base/manifests/tools_nogui.pp