iotop and htop to programs-setup.sh
added rcconf to default programs
Merge branch 'master' of github.com:netsocDIT/serversetup

Conflicts:
	programs-setup.sh
Merge branch 'develop' of github.com:netsocDIT/serversetup into develop