Added code to serverinstall to strip '\r' from the vars.  Also ran a PEP 8 reformat