Begin work on keep alive
Merge branch 'riak-1.4' of github.com:trifork/riack into riak-1.4
Keep alive and proper error message on socket error
Merge branch 'master' into riak-1.4
Fix keep alive
Merge pull request #23 from trifork/riak-1.4

Keep alive from 1.4 branch