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"
clarify documentation for 'rotation' and 'rotate'
clean up and fix bugs with ScaleInv wrapper
export scaleInv convenience function for creating ScaleInv wrappers
Merge pull request #69 from diagrams/scaleinv

clean up and fix bugs with ScaleInv wrapper
generalize fill color to support 'recommended' and 'committed' color

Based on the new Data.Monoid.Recommend module from the monoid-extras
package.  The idea is that a "committed" fill color always overrides a
"recommended" color; otherwise (for two committed colors or two
recommended colors) the inner overrides the outer as usual.  The
motivation for this change is supporting text in the SVG backend,
which must explicitly set the fill color to transparent and hence was
not showing text with no fill color explicitly set.  The solution is
now to make the 'text' function (and related functions) set the
recommended fill color to black.  Then users can still override it
with calls to 'fc', but the SVG backend can know to draw the text
with a fill color of black by default.  The only change to the SVG
backend is that it must now set a *recommended* fill color of
transparent for all diagrams, to avoid overriding the recommended
setting for text.
make text objects use a recommended fill color of black
update CHANGES [ci skip]
move CHANGES to CHANGES.markdown
reformat CHANGES.markdown to Markdown format
add new contributors to LICENSE [ci skip]
update tested-with field
.cabal fix: CHANGES and README are now .markdown