Move to AWS Branch

I'll put this up when the api is running on aws.