adding -hydro to gitignore
Fixing divert removal
Fixing Provides and Architecture Any->All
Changes keep changing.
Still fixing divert removal.
Fixing conflict/replaces