Fixes/cleanups for autotools.
Bump version to 1.6.1