More testing
Merge branch 'travistesting' of https://github.com/nomis52/ola into travistesting

Conflicts:
	common/base/Makefile.am
	common/rdm/Makefile.am
Merge branch 'travistesting'