master Fixed a number of issues with install
Merge remote-tracking branch 'techempower/master'