My work right now is paring down our user-data file -- it really doesn't need much in it. You'll notice that both EC2 and Rackspace are quite happy without it, expect that they need the public IP, private IP, and etcd discovery endpoints.

In short, yes :) We should only have one user-data file across everything. This commit helps me start moving stuff out of there.