Merge pull request #556 from bvssvni/master

Upgraded to latest Rust-Empty
Merge pull request #558 from bvssvni/master

Fixed trait lifetime
Implemented `Draw` for `EllipseBorderColorContext`

Closes https://github.com/PistonDevelopers/rust-graphics/issues/531