Update roles to include keepalive-timeout recipe

This recipe needs to be included on nodes that will consume
rabbitmq or mysql so we can terminate the TCP connections
on failover
fix a trailing comma missing
Merge branch 'master' of https://github.com/rcbops/chef-cookbooks
revert all of my changes in single-compute-usage.rb
Merge pull request #563 from rackerjoe/master

Update roles to include keepalive-timeout recipe