Merge pull request #65 from dgmstuart/correct_application_of_error_class

Correctly apply the error class to all of the different types of input
Bumping the tzinfo version to 1.2.2. This is a ruby timezone library