Combine static and dynamic (ec2) inventories

Put them both into the `inventory` directory and update other tasks as required.