Adding debian, slartibartfast, bugfixes
Merge branch 'master' of github.com:andschwa/puppet-manifests

Conflicts:
	modules/ubuntu/manifests/sources.pp
	site.pp
Adding java, wget deps
Adding minecraft module, configuring