Upgrade my boxen

 Changes to be committed:
	modified:   Gemfile.lock
	modified:   Puppetfile.lock
	deleted:    vendor/cache/aws-sdk-core-2.0.11.gem
	deleted:    vendor/cache/jmespath-1.0.1.gem
	deleted:    vendor/puppet/cache/boxen-puppet-bash-1.1.0.tar.gz
	new file:   vendor/puppet/cache/boxen-puppet-bash-1.2.0.tar.gz
	deleted:    vendor/puppet/cache/boxen-puppet-vagrant-3.2.0.tar.gz
	new file:   vendor/puppet/cache/boxen-puppet-vagrant-3.2.1.tar.gz
Merge branch 'master' of https://github.com/enriqueruiz/ninja-boxen