Merge pull request #3 from madAndroid/master

Add EBS volume addition on instance creation, and user_data_file / user_data_template config options
Updates from last night
Merge pull request #4 from mikesilky/master

Updates from last night
merge upstream SF/mikesilky changes