Merge pull request #284 from ros/rospy_replace_thread_with_threading

rospy: use threading module rather than thread
Revert "rospy: use threading module rather than thread"

This reverts commit 3f3d62bf60c2c763de8ca6a76514211c0337497f.