Merge upstream after rebase to avoid push conflict
Commenting script and some cleanup
Ubuntu requires .desktop suffix
Print better info in rebase script