Add vagrant+netbeans
Merge branch 'master' of https://github.com/skyis/gig-boxen

Conflicts:
	Puppetfile
	modules/people/manifests/skyis.pp