Eesh. I skipped all this and just did a fresh install starting with a new Ubuntu 16. It was very smooth using this guide: