Merge remote-tracking branch 'origin/cloudformation'

Conflicts:
	src/main/scala/com/netflix/edda/aws/AwsCrawlers.scala
adding beanstalk client and collections
Merge branch 'master' into beanstalk

Conflicts:
	src/main/scala/com/netflix/edda/aws/AwsCrawlers.scala