Revert "Merge branch 'feature/netlify-cli' into 'master'"

This reverts merge request !488 (merged). This increases deploy time by ~4 mins - it turns out the bottleneck isn't this deploy tool, so we may as well revert to a speedier deployment tool.