Merge pull request #1 from madAndroid/master

Add EBS volume attachment support
Supports including multiple files
Merge pull request #2 from mikesilky/master

Supports including multiple files
merge upstream changes