Resolve merge conflicts

Get rid of all internal uses of require to load prawn source code, re…

…placing them with require_relative calls.

Removed unused JPEG_APP_BLOCKS constant

Remove duplicate file

Release 1.0.0.rc2

Bump version to 1.0.0.rc1; update README.md reference in RDoc

Bump Prawn::VERSION

update the Gemfile to reflect the release of ttfunk gem

Bump versions