Cleaned up Wix installer

Removed extra components, renamed some objects that were auto-generated
by he VS installer project
Setup Wix installer to allow upgrades