fix indenting and whitespace
remove non-project-specific files from .gitignore
ignore .vagrant directory
Merge branch 'general-tweaks'