Merge pull request #56 from robparrott/userdata-script-refactoring

Userdata script refactoring
allow CF template ref strings for the public_hostname variable.
add in a instance tag for its name, so it appears in the web console. Also remove some package defaults.
resolve trivial conflicts from upstream master