Merge pull request #7 from mikesilky/master

Added user_data_file and user_data_template to launch_configurations
merge upstream changes
add ERB option which clears whitespace

 and remove instance tag creation (now accomplished with model)
switch to using '-' for trim_mode, and add comments to that affect
Merge pull request #8 from madAndroid/remove_tag_creation_and_erb_whitespace_clear

Remove tag creation and erb whitespace clear