Termination Policy Support
Remove debug logs
Merge branch 'master' of https://github.com/hashicorp/terraform
so my fix works
{
allow setting the block device virtual_name
quote $DIR to allow $GOPATH to include spaces
quote $(CURDIR) to support $GOPATH with spaces
added provider for aws_network_acl
acceptance test for creating network acl
Add support for network acls
flatten/expand operations for network_acl
Added CRUD operations for network acl
fixing array length for aws instance volumes
rearranged the tests
Merge remote-tracking branch 'origin/master' into fix-aws-instance-block-devices-index-range
simplify digitalocean_droplet.image loading

If a droplet's image slug is empty and its image id is empty, then the
image attribute should be empty, so we may assign from either. So it is
unnecessary to check if the image id is empty.

* remove unnecessary check for emptiness of image id
* reverse order of the conditions for assigning the image attribute,
  with the default case (using the slug) first, and the fallback case
  (using the id) second
Fix for multivars when modulestate not created yet
reference the possibility of doing development on Terraform using Vagrantfile
mention dev Vagrant VM in CONTRIBUTING.md