Uninstall is in Add/Remove Programs

- Fixed start menu shortcut delete on uninstall
- Uninstall no longer on start menu

This fixes Issue #948