This applies a few fixes to the work done in #74. These have been tested
now and appear to work well. Also, this adds io-surface-rs to homu,
which isn't getting build by Travis currently.