fix to allow empy to install via pip >= 1.4.1
add timeout argument to spec_index_from_service

This timeout (float) is passed to rospy's
wait_for_service call
Merge pull request #39 from osrf/issue_39

add timeout to service_discovery.spec_index_from_service
fix empy on travis again.