fix build and speed up travis using their new container infrastructure
Merge branch 'rm_production'