Use a toId method on Record instead of constructing them by hand
Whitespace
ALL THE WHITESPACE
Merge pull request #33 from richo/features/use_id_method

Use a getter to generate ID's instead of copypasting
Merge pull request #37 from coryb/master

remove providedCompile for slf4j-log4j, we need it in the war file
Adding support for AWS cache clusters. This implementation only pulls
metadata for the AWS ElastiCache Cache Clusters and does not store data for
the individual Cache Cluster nodes.
Merge pull request #40 from rayrod2030/master

Add support for AWS ElastiCache Clusters
Merge branch 'master' of github.com:Netflix/edda

Conflicts:
	src/main/scala/com/netflix/edda/Collection.scala
	src/main/scala/com/netflix/edda/MergedCollection.scala
	src/main/scala/com/netflix/edda/StateMachine.scala
	src/main/scala/com/netflix/edda/Utils.scala
	src/main/scala/com/netflix/edda/aws/AwsCollections.scala
	src/main/scala/com/netflix/edda/basic/BasicServer.scala
	src/main/scala/com/netflix/edda/elasticsearch/ElasticSearchDatastore.scala
Merge branch 'master' of github.com:Netflix/edda