Merge upstream after rebase to avoid push conflict
Commenting script and some cleanup
Ubuntu requires .desktop suffix
Print better info in rebase script
Use trusty "box" on this branch
Merge branch 'trusty64-lxde' of github.com