Fix size selection

Was always using default instance type as;

1. Instance specific types were being looked up with ``environment`` rather than ``instance_type``
2. CLI overrides using ``--size`` weren't being passed through