Updating submodules.
Used upstream vim-tomorrow-theme as a submodule.
Use diff3 format for merge conflists (show the common ancestor).
Include vera's sensor explicitly.
gitignore everything not already added to the repo.
Update .gitignore
Update .gitignore

This is pretty awful, need to figure this shit out properly :/
Update submodules
.gitignore tidying