Merging hydro-devel changes into groovy-devel

This includes minor code changes and make install additions.