Don't resolve image promise until it's loaded.
Merge pull request #701 from brendandahl/fix-image-load

Don't resolve image promise until it's loaded.