revert to upstream repos. update .gitignore to (hopefully) ignore .vagrant directory