Fixed mapred test, set default timeout back to 60s.
Fixed mapred test, set default timeout back to 60s.

pma/riak-erlang-client,SiftLogic/riak-erlang-client,jmayfield74/riak-erlang-client,GabrielNicolasAvellaneda/riak-erlang-client,paulperegud/riak-erlang-client,linearregression/riak-erlang-client,esl/riak-erlang-client,rhumbertgz/riak-erlang-client,groovenauts-erlang/riak-erlang-client,inaka/riak-erlang-client