Install unetbootin
Merge branch 'master' of git://github.com/leafac/dotfiles

Conflicts:
	site/manifests/packages.pp