added timeout tests for webmachine
Merge branch 'master' into pevm-timeout-tests
Merge branch 'master' into pevm-timeout-tests
update tests to use intercepts instead of meck.
Merge branch 'master' into pevm-timeout-tests
grabbing to get latest intercepts code
remove unnecessary code.
Merge pull request #150 from basho/pevm-timeout-tests

new riak_test for HTTP API timeouts