autotools: More stuff.
Merge branch 'master' of github.com:sav/rpn2

Conflicts:
	dev/Makefile.am