hopefully sorted out errors in building
Merge branch 'master' of https://github.com/essl-pvac/essl-pvac.github.com