Make desktop shortcut optional on install

Especially useful when upgrading
Merge pull request #1981 from DanRigby/DesktopShortcutWixOption

Make desktop shortcut optional on install