revert to png.  woe is me.  such lame.
Merge branch 'master' into maki.ericmartindale.com