merged our installs
Merge branch 'master' of https://github.com/ncphillips/test_sp