Modified gitignore to ignore aws-sdk.log
Modified merge task parse userdata_TemplateLogicalResourceName.sh files and include them in the UserData property of the correct resource. Added userdata_Ec2Instance.sh to illustrate usage
Updated README.md with instructions for modifying userdata scripts
Merge branch 'master' of https://github.com/evandbrown/rake_stack

Conflicts:
	.gitignore

Updated commenting.
Adds stack events task