Pull request #30: a complete driver revision of the driver
Also puts indigo branch up to date with hydro, so PR #33 is unnecessary