Consolidate I2CSonar and Sonar into a single class

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>