sync up i386 and x86_64, still needs testing
remove aws stuff from i386 (no need for ec2)

spaces to tabs