Prep for 2.0.1 release + resolve merge conflicts

.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.4
-  - 2.2.0
+  - 2.0
+  - 2.1
+  - 2.2
   - rbx-2
   - jruby
 env:

CHANGELOG.md

@@ -1,3 +1,18 @@
+## PrawnPDF 2.0.1 -- 2015-03-23
+
+### Fix regression in draw_text() with rotation
+
+Due to missing tests, a typo snuck into the `draw_text()` method in PDF::Core,
+preventing it from working properly when called with the `:rotate` option.
+
+This issue has been resolved, and a test has been added to Prawn's test suite.
+Speaking more generally, we need to improve the condition of the tests for
+`PDF::Core`, and make a clear separation between Prawn's test suite and
+PDF::Core's tests. Currently there are lots of little gaps that can lead
+to this sort of problem.
+
+[Robert S. Gerus, [pdf-core#15](https://github.com/prawnpdf/pdf-core/pull/15)]
+
 ## PrawnPDF 2.0.0 -- 2015-02-26
 
 ### Changes to supported Ruby versions
@@ -271,7 +286,7 @@ for more information.
 ### Text box now has an option to disable wrapping by character.
 
 This feature is useful for preventing mid-word breaks when used in combination with the 
-`:shink_to_fit` overflow option. See the following example practical use case:
+`:shrink_to_fit` overflow option. See the following example practical use case:
 
 ```ruby
 # An example shared by Simon Mansfield

lib/prawn/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Prawn
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

manual/text/positioned_text.rb

@@ -15,7 +15,7 @@
 # accordingly. Even if you don't provide a <code>:width</code> option the text
 # will flow to a new line if it reaches the right border.
 #
-# Given that said, <code>text_box</code> is the better option available.
+# Given that, <code>text_box</code> is the better option available.
 #
 require File.expand_path(File.join(File.dirname(__FILE__),
                                    %w[.. example_helper]))