updating .gitignore to ignore .vagrant dir
adding first draft of text files
merge / submodule conflicts