Add vagrant to ignorelist.
Update configs.
Merge branch 'master' into logger

Conflicts:
	.gitignore