Merge branch 'master' of github.com:supersheep/cortex-install