Merge branch 'release-1.18'
Merge branch 'release-1.19'
update location of the default vagrant key
trim back some space used by software updates
clarify readme about updates
Now running ngen before packaging to avoid 100% cpu utilization on fresh vagrant init's joefitzgerald/packer-windows#65
Updated puppet version to latest
Merge pull request #74 from brettporter/vagrant-key-location

update location of the default vagrant key
Merge pull request #77 from brettporter/clean-software-updates

Clean software updates
Merge pull request #78 from kensykora/master

Now running ngen before packaging to avoid 100% cpu utilization on fresh...
Update chocolatey scripts with 0.9.8.27's default install location.
Merge pull request #84 from dylanmei/chocolatey-0.9.8.27

Update chocolatey scripts with 0.9.8.27's default install location.
Disable password expiration for vagrant user
Merge pull request #85 from emyl/password-expiration

Disable password expiration for vagrant user
Merge branch 'master' into develop
Update CHANGELOG for v1.20
Merge branch 'release-1.20'
install rsync and symlink /vagrant
added README-rsync.md
vagrant-windows is not needed now that 1.6 required