Merge remote-tracking branch 'crowdmob/master'

Conflicts:
	autoscaling/autoscaling.go
	autoscaling/autoscaling_test.go
	sqs/sqs_test.go