Integrating custom changes with latest on kickstarter/build-ubuntu-ami