Merge pull request #15 from jbracker/master

Fixed shadow warning.
more properly compare vectors against zeroV instead of 0
Merge branch 'master' of github.com:diagrams/diagrams-contrib
D.Lens: R2 isn't a newtype anymore
Merge branch 'master' of github.com:diagrams/diagrams-contrib