MRG: Various plotting fixes + support for 2D matplotlib

![figure_1](https://f.cloud.github.com/assets/202816/617751/44e1c8ae-cea0-11e2-9400-a3c4b0f8d644.png)