Add padR2 / unpadR2
Better commenting
Merge github.com:diagrams/diagrams-lib

Conflicts:
	src/Diagrams/TwoD/Combinators.hs
dep bumps - fixes for GHC7.6
Fix documentation typo for strutY
Merge branch 'master' of git://github.com/diagrams/diagrams-lib
Add parametric typeclasses
generic implementation of "adjust"
stop exporting Coordinates from Diagrams.Prelude

This is for compatibility with lens, as (&) is a rather important lens
operator and clashes with Coordinates.  Users who want the Coordinates
stuff can import Diagrams.Coordinates explicitly.  Still need to
update documentation to note this, and fix user manual examples,
gallery, etc.
note in documentation that Diagrams.Coordinates must be explicitly imported
Offset convergence test was off.  Fixes #80
Release notes for 0.6.0.3
Merge branch 'master' into parametric

Conflicts:
	src/Diagrams/Segment.hs
	src/Diagrams/TwoD/Combinators.hs
whitespace/pragma cleanup in D.Parametric
D.Parametric: use Data.Default.Class instead of Data.Default
import Diagrams.Parametric since atParam and splitAtParam have moved
cleanup/documentation in Diagrams.Parametric
bug fix: ending parameter should be domainUpper, not domainLower
ArcLengthToParam is now merged into ArcLength
ArcLengthToParam is now merged into ArcLength, part II