rm autogen.sh
Merge branch 'tweaks'