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"
add a Renderable instance for ScaleInv
new function scaleInvPrim for creating a diagram from a single scale-invariant primitive
further clarify intention of scale-invariant primitives
Enable Travis IRC notifications
Working on adding curvature.
Now that I can compile, some obvious bugs fixed.
Working on Haddocks with diagrams!
Switched to PosInf representation.
add MultiParamTypeClasses pragmas for correctness

GHC is apparently OK with referring to MPTCs without enabling the
extension, but technically I think this is not correct, and
haskell-src-exts does not like it. See http://hpaste.org/83072 .
add more MPTC pragmas, and clean up pragmas & imports
remove technically illegal parens around constraint

GHC accepts this but it makes haskell-src-exts unhappy (and
haskell-src-exts is technically correct here, according to the
Report).
bump version to 0.6.1