updates for better interactino with ipython
Merge branch 'master' of github.com:mathisonian/lightning

* 'master' of github.com:mathisonian/lightning:
  Added matrix plot type