Closes #116 - Fix a number of issues with installation scripts