Updated apt-get install calls
Merge remote-tracking branch 'upstream/master' into picade

Conflicts:
	scriptmodules/raspbianconfig.shinc
	scriptmodules/setup.shinc