Travis ec2 config

Pull request to trigger travis integration tests, these should run on ec2 now.