Ec2 fixes

This fixes the ec2 build and makes some other small changes.

Working build here: https://jenkins.fourkitchens.com/view/Training%20Wheels/job/build-tw-ec2-instance/81/console