added timeout as sometimes installer fails

added an install and upgrade timeout as for some reason, the installer hangs when installing on Maths PCs as part of the initial install. Also changed indenting if the xml file to match later formatting.