Clean up more files on make maintainer-clean
Remove some more generated files from git
Merge branch 'master' into rewrite

Conflicts:
	Makefile.in
	data/Makefile.in