updates
Merge branch 'master' of github.com:tophertimzen/cs115

Conflicts:
	manifests/nodes.pp
	manifests/site.pp
	modules/puppetagent/files/puppet.conf
	modules/puppetagent/manifests/config.pp
	modules/puppetagent/manifests/init.pp
	modules/puppetagent/manifests/service.pp
	modules/rsyslog/files/rsyslog.conf
	modules/rsyslog/manifests/config.pp
	modules/rsyslog/manifests/init.pp
	modules/rsyslog/manifests/service.pp
	modules/ssh/files/authorized_keys
	modules/ssh/files/sshd_config
	modules/ssh/manifests/config.pp
	modules/ssh/manifests/init.pp
	modules/ssh/manifests/install.pp
	modules/ssh/manifests/service.pp
	modules/sudoers/files/sudoers
	modules/sudoers/manifests/file.pp
	modules/sudoers/manifests/init.pp
	modules/users/files/default.xml
	modules/users/manifests/init.pp
	modules/users/manifests/student.pp
	puppet
	puppet.conf