rename RubyBOSH::Timeout to RubyBOSH::TimeoutError
merging in sishen changes
Merge branch 'sishen-master'