Merge pull request #6 from madAndroid/master

Bug fixes for route additions
Added user_data_file and user_data_template
Merge pull request #7 from mikesilky/master

Added user_data_file and user_data_template to launch_configurations
merge upstream changes