Merge remote-tracking branch 'origin/cfn-ec2-as-elasticsearch' into naming-refactor
redis working; very much wip
elasticsearch autoscaling group working; very much wip
fixing logstash
switching to environment/service/role env vars
cloudwatch metric names
Merge branch 'master' into naming-refactor
changing release task
some fixes for a working deploy
make date parsing a bit more flexible since it broke
fix rakefile
Merge branch 'master' into naming-refactor

Conflicts:
	srv/elasticsearch/config/default.json.erb