Update for language changes.
Merge pull request #49 from chris-morgan/master

Update for language changes.
Improve failure messages in `tests/util.rs`

- Change so errors don't look where the last image was made (previously
the errors could point to non-existing places like
`\home\rustbuild..`)