Tidied up some matplotlib deprecations
Merge branch 'master' of https://github.com/tomevans/pyphotom