Fix a bunch of places where the -machines flag was still attached to the apiserver

@ddysher @eparis

Please see the fixes here.