ignore xfer area
Merge branch 'master' of github.com:ucbunix/vagrant-puppet

Conflicts:
	.gitignore