Added toolkit_type and toolkit_version options to bundles

This is is being discussed on the mailing list, but why not send a pr anyway? :laughing: