Rudimentary ppa support
Merge branch 'master' of git://github.com/leafac/dev-box

Conflicts:
	modules/ubuntu/manifests/install_ppa_support.pp