Merge remote-tracking branch 'origin/cloudformation' into beanstalk

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
updating collection for beanstalk
getting individual resource lists from describeEnvironmentResources result
typo in autoscaling group call
modifying resources map
enable beanstalk collection
Decrease beanstalk thread pool size

I have seen rate limiting on the beanstalk API so decreasing the thread pool for beanstalk crawler.
Merge branch 'master' into beanstalk

Conflicts:
	src/main/scala/com/netflix/edda/aws/AwsCollections.scala
	src/main/scala/com/netflix/edda/aws/AwsCrawlers.scala
Merging beanstalk changes
Merging beanstalk changes
missing ,
Merge branch 'beanstalk'