Changed range building so left-over tokens are added to the last range instead of adding an extra range.
Changed handling of Cassandra timeouts so instead of failing the range it is re-queued to try processing again