First draft of advanced matplotlib
Merge branch 'master' of github.com:abostroem/2014-09-10-LBL