Make travis do all the builds again

Travis was only using the last env section, not merged them.
Enable doing all 6 builds again.