I merged it because it works..
however, that plugin still needs to be polished and tested.
I just downloaded 2.0 from git on a Linux Mint 17, and there is no option for Trezor under "plugins", although there appears to be a trezor.py file in the plugins folder... it just isn't showing in the GUI. Is there something I have to do to "import" the Trezor plugin or something?