Added htop (even this version doesn't work without sudo)
Added AppCode
Updating nodejs and ruby modules
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Puppetfile
	Puppetfile.lock