Clean up icons/Makefile.am
Ignore *~ files
Ignore intltool merge cache