terraform 0.2.1

See #135 for more details. Updating the original Terraform pull request to 0.2.1.