Initial code changes for working with vagrant-parallels
Merge branch 'refs/heads/master' into parallels

Conflicts:
	Vagrantfile
Merge branch 'refs/heads/master' into parallels
Give parallels VM some serious resources

Increase memory size to 1GB, cpus to 2
Merge branch 'master' into parallels
Merge branch 'master' into parallels
Add new manifests file for parallels, change vagrant configuration to use this manifests file when running with parallels provider
Merge pull request #1 from emailcenter/parallels

Merge parallels provider code back into master