Removing expiration
Casing Ubuntu manifest
Merge remote-tracking branch 'origin/master'

Conflicts:
	site.pp
Adding quantal and raring to ubuntu::sources
Adding mumble manifest
Adding mumble to marvin