Merge pull request #78 from bens/master

Alternative instance for Proxy
Put type signatures from the `Pipes` module on multiple lines
Updated to use Data.Void rather than defining a new version of Void.
Merge pull request #79 from merijn/master

Updated to use Data.Void rather than defining a new version of Void.
Changed bounds on `void` dependency
Simplify constraint for Alternative instance to just MonadPlus
Merge remote-tracking branch 'gabriel/master'