Finalized arbitrary image plugin.
Small tweak.
Merge pull request #250 from xi-project/yet-moar-betterings

Finalized arbitrary image plugin.