merge upstream changes
add user_data_file and user_data_template capabilities
Merge pull request #3 from madAndroid/master

Add EBS volume addition on instance creation, and user_data_file / user_data_template config options