Hydro devel

Bringing indigo-devel inline with hydro-devel, and hopefully not making too much more mess.