Merge pull request #482 from branch 'sethbrayman'
Merge branch 'sethbrayman' of https://github.com/rackerlabs/repose
fixed jmeter tests to point to client-ip
Merge branch 'master' of github.com:rackerlabs/repose