Rename recipe socat to default.  Remove calls from kitchen yaml.
Merge branch 'white_14_02_acu111916_rs-haproxy_initial_implementation' of github.com:rightscale-cookbooks/rs-haproxy into white_14_02_acu111916_rs-haproxy_initial_implementation

Conflicts:
	test/cookbooks/fake/recipes/add_apps_to_pools.rb