upgraded to ssd
Merge branch 'master' of https://github.com/mercer/pipeline