Added vagrant and puphet files
Merge branch 'master' of github.com:vojab/OMS

Conflicts:
	.gitignore