Merge upstream after rebase to avoid push conflict
Commenting script and some cleanup
Ubuntu requires .desktop suffix
Print better info in rebase script
Use puppet labs' base box for Debian 7.3 (x64)

Note: No Virtualbox extensions in this one.
Provisioning is completely without error though, unlike Ubuntu
Remove failure warning, does not happen in Debian
Merge branch 'debian_7.3-lxde' of github.com