Make Vagrantfile more generic for use with both virtual box and parallels using provider specific configurations
Merge branch 'refs/heads/master' into parallels

Conflicts:
	Vagrantfile