Ignore Vagrant temp files
Ignore binaries
Remove modules files
Merge branch 'master' into develop

Conflicts:
	.gitignore