Rewrite Wrapped instances for lens-4.0
Wall: fix import warnings
bump version to 1.1
Merge pull request #154 from diagrams/lens4

Lens4
Merge remote-tracking branch 'origin/master' into projections-rebase

Conflicts:
	src/Diagrams/Combinators.hs
Define Deformations in -lib, not -core