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"
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
Merge branch 'master' into parametric.

In particular, some non-trivial merging had to be done to incorporate
the major Trail refactoring (@705a9b28).

Conflicts:
	src/Diagrams/Path.hs
	src/Diagrams/Segment.hs
	src/Diagrams/TwoD/Path.hs
	src/Diagrams/TwoD/Segment.hs
export Diagrams.Parametric from Diagrams.Prelude
Parametric instances for SegTree, Trail', and Trail
bug fix: cubicSpline should generate a loop when called with True