Merged install into upgrade script

The upgrade script now handles the initial install as well, thus removing the need of the separate install script.