Merge branch 'master' of https://github.com/mitchellh/packer

Vagrantfile

@@ -25,11 +25,11 @@ sudo chown -R vagrant:vagrant $SRCROOT
 sudo chown -R vagrant:vagrant /opt/gopath
 
 # Install some other stuff we need
-sudo apt-get install -y curl git-core zip
+sudo apt-get install -y curl git bzr zip
 SCRIPT
 
 Vagrant.configure(2) do |config|
-  config.vm.box = "chef/ubuntu-12.04"
+  config.vm.box = "bento/ubuntu-14.04"
 
   config.vm.provision "shell", inline: $script
 

website/source/intro/hashicorp-ecosystem.html.markdown

@@ -15,7 +15,7 @@ the ecosystem HashiCorp has built to make application delivery a versioned,
 auditable, repeatable, and collaborative process. To learn more about our
 beliefs on the qualities of the modern datacenter and responsible application
 delivery, read [The Atlas Mindset: Version Control for
-Infrastructure](https://www.hashicorp.com/blog/atlas-mindset.html/?utm_source=packer&utm_campaign=HashicorpEcosystem).
+Infrastructure](https://www.hashicorp.com/blog/atlas-mindset.html?utm_source=packer&utm_campaign=HashicorpEcosystem).
 
 If you are using Packer to build machine images and deployable artifacts, it's
 likely that you need a solution for deploying those artifacts. Terraform is our