diff -Nur mephisto-0.7.3/CHANGELOG technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/CHANGELOG
--- mephisto-0.7.3/CHANGELOG	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/CHANGELOG	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,149 @@
+* SVN *
+
+* Experimental comment preview. [court3nay]
+
+* Add multi-site admin interface. [Vincent, j2m]
+
+* Update Wordpress converter to support Wordpress 2.3+. [Aubrey]
+
+* refactor so that admin/comments is more restful, allow inline comment editing in the admin.  [court3nay]
+
+* convert to cookie sessions.
+
+* Fix some failing test issues and git => svn sync errors. [Aubrey, octopod]
+
+* Fix issue where duplicate permalinks are allowed.
+
+* Fix admin/users issue where site admins could disable mephisto admins.
+
+* Fix nil.accept_comments? bug in CommentForm block.
+
+* allow the various link_to filters to accept multiple args to specify more html attributes. [rob-twf]
+
+  # use this order: :text, :title, :id, :class, :rel
+	link_to_article article, "click here", "this article", "article-1", "articles", "whatever-rel-means"
+
+* encode search/tag urls properly. [rob-twf]
+
+* update article forms to explain new tag syntax (comma and space delimited tags) [xavier, rick]
+
+* start converting tests to rspec.
+
+* tweak mephisto_init to support the new ActionController::Dispatcher class.  [Rob Anderton]
+
+* Don't generate an article event for unversioned changes. [Marcus Brito]
+
+* Switch to will_paginate plugin. [Mislav]
+
+* unit test fixes for those not using mysql or psql. [Mislav]
+
+* add comment moderation links to the overview. [court3nay]
+
+* convert tests to use test/spec instead of simply bdd. [Chris McGrath]
+
+* move xmlrpc stuff to plugin.  rails doesn't include AWS anymore.  May need some simple autodetection so the plugin just prints a warning if AWS isn't found.
+
+* turn off session for mephisto controller.  sorry, caused way too many problems.
+
+* fix url_for calls with symbolized controllers/actions.
+
+* Fix controllers so include_into works with them.
+
+* Change plugin class/module to Mephisto::Plugin and Mephisto::Plugins.  Sorry for the breakage (still technically experimental!).
+
+* Fix admin overview date timezone.  [Ben Wyrosdick]
+
+* Extract template rendering code to separate handler class, add support for alternate template handlers. [Pascal Belloncle]
+
+* Add {{ article.next }} and {{ article | next: section }} for paginating articles [Pascal Belloncle]
+
+* [converters] initial movable type support [sd]
+
+* [converters] use no filter for wordpress articles
+
+* Small bug fixes
+  - show correct asset thumbnail url
+  - assert with correct named asset resource route
+  - add missing fixtures for About Section Feed Test
+  - update asset labeling tests to reflect current behavior
+
+* RESTRICT hyphens as a possible separator for permalink styles. [Chris Wanstrath]
+
+* Initial article/asset assignment support.  Perfect for podcasting.  
+
+* Raise MissingThemesError if Site#theme is nil
+
+* RIP: Site#search_layout
+
+* Add link_to_search_result filter that uses either a paged or blog permalink, depending on the search section.
+
+* Allow search page to take ?s parameter to specify section path.  
+
+  * nil (default)     - all sections
+  * '' (empty string) - home section
+  * 'foo/bar'         - given section
+
+* Initial Plugin Whammy Jammy [Nick Faiz, Rick Olson]
+
+* link_to_section adds class='selected' for the current section [Tammo Freese]
+
+* Process article permalinks with Iconv.
+
+* Support rel-tag microformat by default in liquid filters
+
+* Make ImageScience the default image processor for assets. 
+  If you wish to configure this, set ASSET_IMAGE_PROCESSOR to one of 3 values in environment.rb
+  
+    ASSET_IMAGE_PROCESSOR = :image_science || :rmagick || :none
+
+* paged section feeds will show the paged url for articles instead of the long permalink.
+
+* Replace a couple @article.full_permalink instances with @site.permalink_for(@article) [defunkt]
+
+# Allow Resource#non_image_extnames to be overridden by plugins [myles_b]
+
+* filter password fields in logs [chrissturm]
+
+* add *.ico to list of approved extensions for theme resources [myles_b]
+
+* Link comments to the currently logged in user, requires latest edge/1.2 rails [Josh Susser]
+
+* Convert typo filters and permalinks to mephisto [Josh Susser]
+
+* replace acts_as_attachment with attachment_fu plugin
+
+* add tags to atom feed [evilchelu]
+
+* flexible theme names in routes [evilchelu]
+
+* update liquid plugin
+
+* use default test.host domain where possible [courtenay]
+
+* fix test ensuring that comments, not articles are sanitized for script tags [courtenay]
+
+* fix articles form for latest rails 1.2 changes to date helpers [courtenay]
+
+* fix test that breaks in multi-site mode [courtenay]
+
+* Allow Modules to use #include_into to dynamically mixin to loaded classes (plugin stuff)
+
+* Allow custom routes.
+
+  Mephisto::Routing.connect_with map do
+    map.foo ...
+  end
+
+* fix that only published articles are available as section pages.
+
+Add sorting for liquid for statements.
+
+  {% for page in section.pages limit: 3 sort_by: title %}
+
 * 0.7.3 *
 
+* Fix duplicate tag bug.
+
 * add Mephisto.root javascript variable in case a mephisto site sets the relative_url_root
 
 * don't sanitize custom anchor text for liquid filters [Jonathan Leighton]
@@ -52,7 +196,9 @@
 * Remove any notion of a template hierarchy, and the page template itself.  Paged sections now default to the 'single' template.
 
 * Added {{ mode }} so you can check what 'view' you're in.  
-
+  
+  {% unless mode == 'single' %} Read more {% endunless %}
+  
 * Ensure templates are sorted by name [Brian Chapados]
 
 * Fix bug that was caching redirected routes.  
@@ -290,4 +436,4 @@
     {% endif %}
   {% endfor %}
 
-* Fix issue where Articles don't allow comments with comment_age = 0 [Rick]
\ No newline at end of file
+* Fix issue where Articles don't allow comments with comment_age = 0 [Rick]
diff -Nur mephisto-0.7.3/LICENSE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/LICENSE
--- mephisto-0.7.3/LICENSE	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/LICENSE	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-Copyright (c) 2005 Rick Olson
+Copyright (c) 2005-2008 Rick Olson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -Nur mephisto-0.7.3/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/README
--- mephisto-0.7.3/README	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/README	2008-03-31 02:18:56.000000000 -0400
@@ -5,7 +5,7 @@
 = Timezones
 
 You MUST export the environment variable TZ=UTC, or else the article dates
-and times will be fubar.
+and times will be invalid.
 
 This would not be needed if rails used UTC for everything, but
 unfortunately it doesn't... eg: action_view/helpers/date_helper.rb uses
@@ -19,4 +19,4 @@
 = License
 
 Mephisto is distributed under the same license as Ruby on Rails. See
-http://www.opensource.org/licenses/mit-license.php
\ No newline at end of file
+http://www.opensource.org/licenses/mit-license.php
diff -Nur mephisto-0.7.3/app/apis/meta_weblog_api.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_api.rb
--- mephisto-0.7.3/app/apis/meta_weblog_api.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_api.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,31 +0,0 @@
-class MetaWeblogApi < ActionWebService::API::Base
-  inflect_names false
-
-  api_method :getCategories,
-    :expects => [ {:blogid => :string}, {:username => :string}, {:password => :string} ],
-    :returns => [[:string]]
-
-  api_method :getPost,
-    :expects => [ {:postid => :string}, {:username => :string}, {:password => :string} ],
-    :returns => [MetaWeblogStructs::Article]
-
-  api_method :getRecentPosts,
-    :expects => [ {:blogid => :string}, {:username => :string}, {:password => :string}, {:numberOfPosts => :int} ],
-    :returns => [[MetaWeblogStructs::Article]]
-
-  api_method :deletePost,
-    :expects => [ {:appkey => :string}, {:postid => :string}, {:username => :string}, {:password => :string}, {:publish => :int} ],
-    :returns => [:bool]
-
-  api_method :editPost,
-    :expects => [ {:postid => :string}, {:username => :string}, {:password => :string}, {:struct => MetaWeblogStructs::Article}, {:publish => :int} ],
-    :returns => [:bool]
-
-  api_method :newPost,
-    :expects => [ {:blogid => :string}, {:username => :string}, {:password => :string}, {:struct => MetaWeblogStructs::Article}, {:publish => :int} ],
-    :returns => [:string]
-
-  api_method :newMediaObject,
-    :expects => [ {:blogid => :string}, {:username => :string}, {:password => :string}, {:data => MetaWeblogStructs::MediaObject} ],
-    :returns => [MetaWeblogStructs::Url]
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/apis/meta_weblog_service.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_service.rb
--- mephisto-0.7.3/app/apis/meta_weblog_service.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_service.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,91 +0,0 @@
-class MetaWeblogService < XmlRpcService
-  web_service_api MetaWeblogApi
-  before_invocation :authenticate
-
-  def getCategories(blogid, username, password)
-    site.sections.find(:all, :order => 'id ASC').collect &:name
-  end
-
-  def getPost(postid, username, password)
-    article = @user.articles.find(postid)
-    article_dto_from(article)
-  end
-
-  def getRecentPosts(blogid, username, password, numberOfPosts)
-    @user.articles.find(:all, :order => "created_at DESC", :limit => numberOfPosts).collect{ |c| article_dto_from(c) }
-  end
-
-  def newPost(blogid, username, password, struct, publish)
-    article = @user.articles.build :site => site
-    post_it(article, username, password, struct, publish)
-  end
-
-  def editPost(postid, username, password, struct, publish)
-    article = @user.articles.find(postid)
-    post_it(article, username, password, struct, publish)
-    true
-  end
-
-  def deletePost(appkey, postid, username, password, publish)
-    article = @user.articles.find(postid)
-    article.destroy
-    true
-  end
-
-  def newMediaObject(blogid, username, password, data)
-    asset = site.assets.create!(
-      :filename => data['name'],
-      :content_type => (data['type'] || guess_content_type_from(data['name'])),
-      :attachment_data => data['bits']
-      )
-    MetaWeblogStructs::Url.new("url" => asset.public_filename)
-  end
-
-  def article_dto_from(article)
-    MetaWeblogStructs::Article.new(
-      :description       => article.body,
-      :title             => article.title,
-      :postid            => article.id.to_s,
-      :url               => article_url(article).to_s,
-      :link              => article_url(article).to_s,
-      :permaLink         => article.permalink.to_s,
-      :categories        => article.sections.collect { |c| c.name },
-      :mt_text_more      => article.body.to_s,
-      :mt_excerpt        => article.excerpt.to_s,
-      :mt_keywords       => article.tag,
-      # :mt_allow_comments => article.allow_comments? ? 1 : 0,
-      # :mt_allow_pings    => article.allow_pings? ? 1 : 0,
-      # :mt_convert_breaks => (article.text_filter.name.to_s rescue ''),
-      # :mt_tb_ping_urls   => article.pings.collect { |p| p.url },
-      :dateCreated       => (article.published_at rescue "")
-      )
-  end
-
-  protected
-    def article_url(article)
-      article.published? && article.full_permalink
-    end
-
-    def post_it(article, user, password, struct, publish)
-      # make sure publish is true if it's 1 if not leave it the way it is.
-      publish = publish == 1 || publish
-      # if no categories are supplied do not attempt to set any.
-      article.section_ids = Section.find(:all, :conditions => ['name IN (?)', struct['categories']]).collect(&:id) if struct['categories']
-      article.attributes = {:updater => @user, :body => struct['description'].to_s, :title => struct['title'].to_s, :excerpt => struct['mt_excerpt'].to_s}
-      # Keywords/Tags support
-      Tagging.set_on article, struct['mt_keywords'] if struct['mt_keywords'] # set/modify keywords _only_ if they are supplied. mt_keywords _overwrite_ not alter the ``tags''
-
-      utc_date = Time.utc(struct['dateCreated'].year, struct['dateCreated'].month, struct['dateCreated'].day, struct['dateCreated'].hour, struct['dateCreated'].sec, struct['dateCreated'].min) rescue article.published_at || Time.now.utc
-      article.published_at = publish == true ? utc_date : nil
-      article.save!
-      article.id
-    end
-
-    def guess_content_type_from(name)
-      if name =~ /(png|gif|jpe?g)/i
-        "image/#{$1 == 'jpg' ? 'jpeg' : $1}"
-      else
-        'application/octet-stream'
-      end
-    end
-end
diff -Nur mephisto-0.7.3/app/apis/meta_weblog_structs/article.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_structs/article.rb
--- mephisto-0.7.3/app/apis/meta_weblog_structs/article.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_structs/article.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,19 +0,0 @@
-module MetaWeblogStructs
-  class Article < ActionWebService::Struct
-    member :description,        :string
-    member :title,              :string
-    member :postid,             :string
-    member :url,                :string
-    member :link,               :string
-    member :permaLink,          :string
-    member :categories,         [:string]
-    member :mt_text_more,       :string
-    member :mt_excerpt,         :string
-    member :mt_keywords,        :string
-    member :mt_allow_comments,  :int
-    member :mt_allow_pings,     :int
-    member :mt_convert_breaks,  :string
-    member :mt_tb_ping_urls,   [:string]
-    member :dateCreated,        :time
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/apis/meta_weblog_structs/media_object.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_structs/media_object.rb
--- mephisto-0.7.3/app/apis/meta_weblog_structs/media_object.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_structs/media_object.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-module MetaWeblogStructs
-  class MediaObject < ActionWebService::Struct
-    member :bits, :string
-    member :name, :string
-    member :type, :string
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/apis/meta_weblog_structs/url.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_structs/url.rb
--- mephisto-0.7.3/app/apis/meta_weblog_structs/url.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/meta_weblog_structs/url.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-module MetaWeblogStructs
-  class Url < ActionWebService::Struct
-    member :url, :string
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/apis/movable_type_api.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_api.rb
--- mephisto-0.7.3/app/apis/movable_type_api.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_api.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,88 +0,0 @@
-class MovableTypeApi < ActionWebService::API::Base
-  inflect_names false
-
-  # Movable Type Programatic interface
-  # see: <http://www.movabletype.org/mt-static/docs/mtmanual_programmatic.html>
-  # supportedTextFilters has already been there!
-  # - Moritz Angermann
-  #
-  # mt.getRecentPostTitles
-  # Description: Returns a bandwidth-friendly list of the most recent posts in the system.
-  # Parameters: String blogid, String username, String password, int numberOfPosts
-  # Return value: on success, array of structs containing ISO.8601 dateCreated, String userid, String postid, String title; on failure, fault
-  # Notes: dateCreated is in the timezone of the weblog blogid
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtgetrecentposttitles.html>
-
-  #api_method :getRecentPostTitles,
-  #  :expects => [ {:blogid => :string}, {:username => :string}, {:password => :string}, {:numberOfPosts => :int} ],
-  #  :returns => [[MovableTypeStructs::Post]]
-
-  # mt.getCategoryList
-  # Description: Returns a list of all categories defined in the weblog.
-  # Parameters: String blogid, String username, String password
-  # Return value: on success, an array of structs containing String categoryId and String categoryName; on failure, fault.
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtgetcategorylist.html>
-  api_method :getCategoryList,
-    :expects => [ {:blogid => :string}, {:username => :string}, {:password => :string} ],
-    :returns => [[MovableTypeStructs::Category]]
-
-  # mt.getPostCategories
-  # Description: Returns a list of all categories to which the post is assigned.
-  # Parameters: String postid, String username, String password
-  # Return value: on success, an array of structs containing String categoryName, String categoryId, and boolean isPrimary; on failure, fault.
-  # Notes: isPrimary denotes whether a category is the post's primary category.
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtgetpostcategories.html>
-  api_method :getPostCategories,
-    :expects => [ {:postid => :string}, {:username => :string}, {:password => :string} ],
-    :returns => [[MovableTypeStructs::Category]]
-
-  # mt.setPostCategories
-  # Description: Sets the categories for a post.
-  # Parameters: String postid, String username, String password, array categories
-  # Return value: on success, boolean true value; on failure, fault
-  # Notes: the array categories is an array of structs containing String categoryId and boolean isPrimary. Using isPrimary to set the primary category is optional--in the absence of this flag, the first struct in the array will be assigned the primary category for the post.
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtsetpostcategories.html>
-  api_method :setPostCategories,
-    :expects => [ {:postid => :string}, {:username => :string}, {:password => :string}, {:categories => [MovableTypeStructs::PostCategory]} ],
-    :returns => [:bool]
-
-  # mt.supportedMethods
-  # Description: Retrieve information about the XML-RPC methods supported by the server.
-  # Parameters: none
-  # Return value: an array of method names supported by the server.
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtsupportedMethods.html>
-
-  api_method :supportedMethods,
-    :expects => [],
-    :returns => [[:string]]
-
-  # mt.supportedTextFilters
-  # Description: Retrieve information about the text formatting plugins supported by the server.
-  # Parameters: none
-  # Return value: an array of structs containing String key and String label. key is the unique string identifying a text formatting plugin, and label is the readable description to be displayed to a user. key is the value that should be passed in the mt_convert_breaks parameter to newPost and editPost.
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtsupportedtextfilters.html>
-
-  api_method :supportedTextFilters,
-    :expects => [],
-    :returns => [[MovableTypeStructs::TextFilter]]
-
-  # mt.getTrackbackPings
-  # Description: Retrieve the list of TrackBack pings posted to a particular entry. This could be used to programmatically retrieve the list of pings for a particular entry, then iterate through each of those pings doing the same, until one has built up a graph of the web of entries referencing one another on a particular topic.
-  # Parameters: String postid
-  # Return value: an array of structs containing String pingTitle (the title of the entry sent in the ping), String pingURL (the URL of the entry), and String pingIP (the IP address of the host that sent the ping).
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtgettrackbackpings.html>
-
-  # api_method :getTrackbackPings,
-  #   :expects => [ {:postid => :string} ],
-  #   :returns => [[MovableTypeStructs::Trackback]]
-
-  # mt.publishPost
-  # Description: Publish (rebuild) all of the static files related to an entry from your weblog. Equivalent to saving an entry in the system (but without the ping).
-  # Parameters: String postid, String username, String password
-  # Returns value: on success, boolean true value; on failure, fault
-  # Reference: <http://www.sixapart.com/developers/xmlrpc/movable_type_api/mtpublishpost.html>
-
-  #api_method :publishPost,
-  #  :expects => [ {:postid => :string}, {:username => :string}, {:password => :string} ],
-  #  :returns => [:bool]
-end
diff -Nur mephisto-0.7.3/app/apis/movable_type_service.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_service.rb
--- mephisto-0.7.3/app/apis/movable_type_service.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_service.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,44 +0,0 @@
-class MovableTypeService < XmlRpcService
-  web_service_api MovableTypeApi
-  before_invocation :authenticate, :except => [:supportedMethods, :supportedTextFilters]
-
-  #def getRecentPostTitles(blogid, username, password, numberOfPosts)
-  #  # FIXME not implemented
-  #end
-
-  def getCategoryList(blogid, username, password)
-    site.sections.find(:all, :order => 'id ASC').collect { |c| MovableTypeStructs::Category.new(:categoryId => c.id, :categoryName => c.name) }
-  end
-
-  def getPostCategories(postid, username, password)
-    article = @user.articles.find(postid)
-    article.sections.collect { |c| MovableTypeStructs::Category.new(:categoryId => c.id, :categoryName => c.name) }
-  end
-
-  def setPostCategories(postid, username, password, categories)
-    article = @user.articles.find(postid)
-    article.section_ids= categories.collect { |c| c.categoryId }
-    article.save!
-    true
-  end
-
-  def supportedMethods
-    MetaWeblogService.public_instance_methods(false).collect { |m| "metaWeblog.{#m}" } \
-    + MovableTypeService.public_instance_methods(false).collect { |m| "mt.{#m}" }
-  end
-
-  def supportedTextFilters
-    FilteredColumn.filters.collect { |(key, filter)| MovableTypeStructs::TextFilter.new(:key => key, :label => filter.filter_name) }
-  end
-
-  # def getTrackbackPings,
-  #  ...
-  # end
-
-  #def publishPost(postid, username, password)
-  #  article = @user.articles.find(postid)
-  #  #article. hmmm now what?
-  #  true
-  #end
-
-end
diff -Nur mephisto-0.7.3/app/apis/movable_type_structs/category.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/category.rb
--- mephisto-0.7.3/app/apis/movable_type_structs/category.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/category.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-module MovableTypeStructs
-  class Category < ActionWebService::Struct
-    member :categoryId,    :string
-    member :categoryName,  :string
-  end
-end
-module MovableTypeStructs
-  class Category < ActionWebService::Struct
-    member :categoryId,    :string
-    member :categoryName,  :string
-  end
-end
diff -Nur mephisto-0.7.3/app/apis/movable_type_structs/post.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/post.rb
--- mephisto-0.7.3/app/apis/movable_type_structs/post.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/post.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-module MovableTypeStructs
-  class Post < ActionWebService::Struct
-    member :dateCreated,    :time #ISO.8601
-    member :userid,         :string
-    member :postid,         :string
-    member :title,          :string
-  end
-end
-module MovableTypeStructs
-  class Post < ActionWebService::Struct
-    member :dateCreated,    :time #ISO.8601
-    member :userid,         :string
-    member :postid,         :string
-    member :title,          :string
-  end
-end
diff -Nur mephisto-0.7.3/app/apis/movable_type_structs/post_category.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/post_category.rb
--- mephisto-0.7.3/app/apis/movable_type_structs/post_category.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/post_category.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,14 +0,0 @@
-module MovableTypeStructs
-  class PostCategory < ActionWebService::Struct
-    member :categoryId,    :string
-    member :categoryName,  :string
-    member :isPrimary,     :bool 
-  end
-end
-module MovableTypeStructs
-  class PostCategory < ActionWebService::Struct
-    member :categoryId,    :string
-    member :categoryName,  :string
-    member :isPrimary,     :bool 
-  end
-end
diff -Nur mephisto-0.7.3/app/apis/movable_type_structs/text_filter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/text_filter.rb
--- mephisto-0.7.3/app/apis/movable_type_structs/text_filter.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/text_filter.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-module MovableTypeStructs
-  class TextFilter < ActionWebService::Struct
-    member :key,   :string
-    member :label, :string
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/apis/movable_type_structs/trackback.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/trackback.rb
--- mephisto-0.7.3/app/apis/movable_type_structs/trackback.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/movable_type_structs/trackback.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-module MovableTypeStructs
-  class Trackback < ActionWebService::Struct
-    member :pingTitle, :string
-    member :pingURL,   :string
-    member :pingIP,    :string
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/apis/xml_rpc_service.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/xml_rpc_service.rb
--- mephisto-0.7.3/app/apis/xml_rpc_service.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/apis/xml_rpc_service.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-class XmlRpcService < ActionWebService::Base
-  attr_accessor :controller
-  delegate :site, :to => :controller
-
-  def initialize(controller)
-    @controller = controller
-  end
-
-  protected
-    def server_url
-      controller.url_for(:only_path => false, :controller => "/")
-    end
-    
-    def pub_date(time)
-      time.strftime "%a, %e %b %Y %H:%M:%S %Z"
-    end
-    
-    def authenticate(name, args)
-      method = self.class.web_service_api.api_methods[name]
-    
-      # Coping with backwards incompatibility change in AWS releases post 0.6.2
-      begin
-        h = method.expects_to_hash(args)
-        raise "Invalid login" unless @user = User.authenticate_for(controller.site, h[:username], h[:password])
-      rescue NoMethodError
-        username, password = method[:expects].index(:username=>String), method[:expects].index(:password=>String)
-        raise "Invalid login" unless @user = User.authenticate_for(controller.site, args[username], args[password])
-      end
-    end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/cachers/article_observer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/cachers/article_observer.rb
--- mephisto-0.7.3/app/cachers/article_observer.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/cachers/article_observer.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,10 +1,12 @@
 class ArticleObserver < ActiveRecord::Observer
   def before_save(record)
-    @event = Event.new 
-    @event.mode = case
-      when record.is_a?(Comment) then 'comment'
-      when record.new_record?    then 'publish'
-      else 'edit'
+    if (record.is_a?(Article) && record.save_version?) || record.is_a?(Comment)
+      @event = Event.new
+      @event.mode = case
+        when record.is_a?(Comment) then 'comment'
+        when record.new_record?    then 'publish'
+        else 'edit'
+      end
     end
   end
 
@@ -15,4 +17,4 @@
   end
 
   alias after_destroy after_save
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/app/cachers/comment_observer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/cachers/comment_observer.rb
--- mephisto-0.7.3/app/cachers/comment_observer.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/cachers/comment_observer.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,8 +1,15 @@
 class CommentObserver < ArticleObserver
-  cattr_accessor :disabled
+  def self.disabled?
+    Thread.current[:comment_observer_disabled]
+  end
+  
+  def disabled=(value)
+    Thread.current[:comment_observer_disabled] = value
+  end
+  
   def after_save(record)
     @event.update_attributes :title => record.article.title, :body => record.body, :site => record.article.site,
-      :article => record.article, :author => record.author, :comment => record if record.approved? && !disabled
+      :article => record.article, :author => record.author, :comment => record if record.approved? && !self.class.disabled?
   end
 
   def after_destroy(record)
diff -Nur mephisto-0.7.3/app/controllers/admin/articles_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/articles_controller.rb
--- mephisto-0.7.3/app/controllers/admin/articles_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/articles_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,21 +3,18 @@
   with_options :only => [:create, :update, :destroy, :upload] do |c|
     c.before_filter :set_default_section_ids
     c.cache_sweeper :article_sweeper, :assigned_section_sweeper
-    cache_sweeper   :comment_sweeper, :only => [:approve, :unapprove, :destroy_comment]
   end
 
   before_filter :convert_times_to_utc, :only => [:create, :update, :upload]
   before_filter :check_for_new_draft,  :only => [:create, :update, :upload]
   
-  before_filter :find_site_article, :only => [:edit, :update, :comments, :approve, :unapprove, :destroy]
+  before_filter :find_site_article, :only => [:edit, :update, :comments, :approve, :unapprove, :destroy, :attach, :detach]
   before_filter :login_required, :except => :upload
   before_filter :load_sections, :only => [:new, :edit]
 
   def index
-    @article_pages = Paginator.new self, site.articles.count(:all, article_options), 30, params[:page]
-    @articles      = site.articles.find(:all, article_options(:order => 'contents.published_at DESC', :select => 'contents.*', 
-                       :limit   =>  @article_pages.items_per_page,
-                       :offset  =>  @article_pages.current.offset))
+    @articles = site.articles.paginate(article_options(:order => 'contents.published_at DESC', :select => 'contents.*',
+                                                       :page => params[:page], :per_page => params[:per_page]))
     
     @comments = @site.unapproved_comments.count :all, :group => :article, :order => '1 desc'
     @sections = site.sections.find(:all)
@@ -29,7 +26,7 @@
     Mephisto::Liquid::CommentForm.article = @article
     @article  = @article.to_liquid(:mode => :single)
     
-    render :text => site.render_liquid_for(site.sections.home, :single, 'articles' => [@article], 'article' => @article, 'comments' => @comments, 'site' => site.to_liquid)
+    render :text => site.call_render(site.sections.home, :single, 'articles' => [@article], 'article' => @article, 'comments' => @comments, 'site' => site.to_liquid)
   end
 
   def new
@@ -65,38 +62,14 @@
 
   def destroy
     @article.destroy
+    flash[:notice] = "The article: #{@article.title.inspect} was deleted."
     render :update do |page|
       page.redirect_to :action => 'index'
     end
   end
 
   def comments
-    @comments = 
-      case params[:filter]
-        when 'approved'   then :comments
-        when 'unapproved' then :unapproved_comments
-        else                   :all_comments
-      end
-    @comments = @article.send @comments
-    @articles = @site.unapproved_comments.count :all, :group => :article, :order => '1 desc'
-  end
-
-  # xhr baby
-  # needs some restful lovin'
-  def approve
-    @comment = @article.unapproved_comments.approve(params[:comment])
-    @comment.mark_as_ham(site, request)
-  end
-
-  def unapprove
-    @comment = @article.comments.unapprove(params[:comment])
-    @comment.mark_as_spam(site, request)
-    render :action => 'approve'
-  end
-  
-  def destroy_comment
-    @comments = site.all_comments.find :all, :conditions => ['id in (?)', [params[:comment]].flatten] rescue []
-    Comment.transaction { @comments.each(&:destroy) } if @comments.any?
+    redirect_to article_comments_path(@article)
   end
 
   def upload
@@ -117,9 +90,28 @@
     end
   end
 
+  def attach
+    @asset = site.assets.find(params[:version])
+    @article.assets.add @asset
+  end
+
+  def detach
+    @asset = site.assets.find(params[:version])
+    @article.assets.remove @asset
+  end
+
+  def label
+    AssignedAsset.update_all ['label = ?', params[:label]], ['article_id = ? and asset_id = ?', params[:id], params[:version]]
+  end
+
   protected
     def load_sections
-      @assets = site.assets.find(:all, :order => 'created_at desc', :limit => 6)
+      @assets = site.assets.find(:all, :limit => 15)
+      @bucket_assets = []
+      session[:bucket].each do |id, values|
+        (@bucket_assets ||= []) << site.assets.find(id)
+      end unless session[:bucket].blank? 
+      
       @sections = site.sections.find(:all)
       home = @sections.find &:home?
       @sections.delete  home
diff -Nur mephisto-0.7.3/app/controllers/admin/assets_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/assets_controller.rb
--- mephisto-0.7.3/app/controllers/admin/assets_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/assets_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -29,8 +29,14 @@
     end
     Asset.transaction { @assets.each &:save! }
     flash[:notice] = @assets.size == 1 ? "'#{CGI.escapeHTML @assets.first.title}' was uploaded." : "#{@assets.size} assets were uploaded."
-    @assets.size.zero? ?  render(:action => 'new') : redirect_to(assets_path)
-  rescue ActiveRecord::RecordInvalid
+    if @assets.size.zero? 
+      @asset = Asset.new
+      render :action => 'new'
+    else
+      redirect_to assets_path
+    end
+  rescue ActiveRecord::RecordInvalid => e
+    @asset = e.record
     render :action => 'new'
   end
 
@@ -45,7 +51,7 @@
   def latest
     @assets = site.assets.find(:all, :order => 'created_at desc', :limit => 6)
     render :update do |page|
-      page['latest-assets'].replace_html :partial => 'widget', :collection => @assets
+      page['latest-assets'].replace_html :partial => 'widget', :collection => @assets, :locals => { :prefix => 'latest' }
     end
   end
   
@@ -53,7 +59,7 @@
     search_assets 6
     render :update do |page|
       page['spinner'].hide
-        return page['search-assets'].replace_html(:partial => 'widget', :collection => @assets) if @assets.any?
+        return page['search-assets'].replace_html(:partial => 'widget', :collection => @assets, :locals => { :prefix => 'search' }) if @assets.any?
         page['search-assets'].replace_html %(Couldn't find any matching assets.)
     end
   end
@@ -67,11 +73,11 @@
 
   # rjs
   def add_bucket
-    if (session[:bucket] ||= {}).key?(@asset.public_filename)
+    if (session[:bucket] ||= {}).key?(@asset.id)
       render :nothing => true and return
     end
     args = asset_image_args_for(@asset, :tiny, :title => "#{@asset.title} \n #{@asset.tags.join(', ')}")
-    session[:bucket][@asset.public_filename] = args
+    session[:bucket][@asset.id] = args
   end
 
   def clear_bucket
@@ -85,14 +91,15 @@
 
     def search_assets(limit)
       @types  = params[:filter].blank? ? [] : params[:filter].keys
-      @asset_pages = Paginator.new self, count_by_conditions, limit, params[:page]
+      options = search_options.merge(:per_page => limit, :page => params[:page], :total_entries => count_by_conditions)
+
       @assets = @types.any? ?
-        site.assets.find_all_by_content_types(@types, :all, search_options) :
-        site.assets.find(:all, search_options)
+        site.assets.paginate_by_content_types(@types, :all, options) :
+        site.assets.paginate(options) 
     end
 
     def search_options
-      search_conditions.merge(:order => 'created_at desc', :limit => @asset_pages.items_per_page, :offset => @asset_pages.current.offset)
+      search_conditions.merge(:order => 'created_at desc')
     end
 
     def search_conditions
diff -Nur mephisto-0.7.3/app/controllers/admin/cached_pages_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/cached_pages_controller.rb
--- mephisto-0.7.3/app/controllers/admin/cached_pages_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/cached_pages_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,10 +3,9 @@
 
   def index
     CachedPage.with_current_scope do
-      @cached_page_pages = Paginator.new self, site.cached_pages.count, 30, params[:page]
-      offset = (((params[:page] || 1).to_i - 1) * @cached_page_pages.items_per_page)
-      @cached_pages = site.cached_pages.find(:all, :order => 'updated_at', :limit => @cached_page_pages.items_per_page, :offset => offset,
-        :conditions => (params[:query] && ['url LIKE ?', ["#{params[:query]}%"]]))
+      @cached_pages = site.cached_pages.paginate(:order => 'updated_at',
+                                                 :conditions => (params[:query] && ['url LIKE ?', ["#{params[:query]}%"]]),
+                                                 :page => params[:page])
     end
   end
   alias_method :query, :index
@@ -25,4 +24,4 @@
   
   protected
     alias authorized? admin?
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/app/controllers/admin/comments_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/comments_controller.rb
--- mephisto-0.7.3/app/controllers/admin/comments_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/comments_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,6 +1,75 @@
 class Admin::CommentsController < Admin::BaseController
+
+  member_actions.push(*%w(index unapproved create edit update approve unapprove destroy close ))
+
+private
+
+  before_filter :find_site_article, :except => [ :close, :index, :destroy ]
+  before_filter :find_optional_site_article, :only => [:index, :destroy]
+  def find_site_article
+    @article = site.articles.find params[:article_id]
+  end
+  
+  def find_optional_site_article
+    @article = site.articles.find params[:article_id] unless params[:article_id].blank?
+  end
+
+  cache_sweeper :comment_sweeper, :only => [:approve, :unapprove, :destroy, :create]
+
+public
+
   def index
-    @comments = site.unapproved_comments.find(:all, :include => :article)
+    @comment  = Comment.new
+    @articles = site.unapproved_comments.count :all, :group => :article, :order => '1 desc'
+    params[:filter] = 'unapproved' if @article.nil?
+    @comments = 
+      (@article || @site).send case params[:filter]
+        when 'approved'   then :comments
+        when 'unapproved' then :unapproved_comments
+        else                   :all_comments
+      end
+  end
+  
+  def unapproved
+    site.unapproved_comments.find(:all, :include => :article)
+  end
+  
+  def create
+    @comment = @article.comments.build(params[:comment].merge(
+      :user_id    => session[:user], 
+      :author_ip  => request.remote_ip, 
+      :user_agent => request.env['HTTP_USER_AGENT'], 
+      :referrer   => request.env['HTTP_REFERER'])
+    )
+    @comment.approved = true
+    @comment.save
+  end
+  
+  def edit
+    @comment = @article.all_comments.find params[:id]
+  end
+  
+  def update
+    @comment = @article.all_comments.find params[:id]
+    @comment.update_attributes(params[:comment])
+  end
+
+  # xhr baby
+  # needs some restful lovin'
+  def approve
+    @comment = @article.unapproved_comments.approve(params[:comment] || params[:id])
+    @comment.mark_as_ham(site, request)
+  end
+
+  def unapprove
+    @comment = @article.comments.unapprove(params[:comment] || params[:id])
+    @comment.mark_as_spam(site, request)
+    render :action => 'approve'
+  end
+  
+  def destroy
+    @comments = site.all_comments.find :all, :conditions => ['id in (?)', [ (params[:comment] || params[:id])].flatten] # rescue []
+    Comment.transaction { @comments.each(&:destroy) } if @comments.any?
   end
   
   # ajax action, called from _page_nav
diff -Nur mephisto-0.7.3/app/controllers/admin/overview_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/overview_controller.rb
--- mephisto-0.7.3/app/controllers/admin/overview_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/overview_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -9,10 +9,10 @@
   def index
     @users = site.users(:order => 'updated_at desc')
     @events, @todays_events, @yesterdays_events = [], [], []
-    today, yesterday = Time.now.utc.to_date, 1.day.ago.utc.to_date
+    today, yesterday = utc_to_local(Time.now.utc).to_date, utc_to_local(1.day.ago.utc).to_date
     @articles = @site.unapproved_comments.count :all, :group => :article, :order => '1 desc'
     @site.events.find(:all, :order => 'events.created_at DESC', :include => [:article, :user], :limit => 50).each do |event|
-      event_date = event.created_at.to_date
+      event_date = utc_to_local(event.created_at).to_date
       if event_date >= today
         @todays_events
       elsif event_date == yesterday
diff -Nur mephisto-0.7.3/app/controllers/admin/plugins_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/plugins_controller.rb
--- mephisto-0.7.3/app/controllers/admin/plugins_controller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/plugins_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,24 @@
+class Admin::PluginsController < Admin::BaseController
+  before_filter :find_plugin, :except => :index
+
+  def index
+    @plugins = Mephisto.plugins
+  end
+  
+  def update
+    @plugin.options = params[:options]
+    @plugin.save!
+    
+    redirect_to :action => "show", :id => params[:id]
+  end
+  
+  def destroy
+    @plugin.destroy
+    redirect_to :action => "show", :id => params[:id]
+  end
+  
+  protected
+    def find_plugin
+      @plugin = Mephisto.plugins[params[:id]]
+    end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/controllers/admin/settings_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/settings_controller.rb
--- mephisto-0.7.3/app/controllers/admin/settings_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/settings_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,6 +1,6 @@
 class Admin::SettingsController < Admin::BaseController
   before_filter :find_and_sort_templates
-  clear_empty_templates_for :site, :search_layout, :tag_layout, :only => :update
+  clear_empty_templates_for :site, :tag_layout, :only => :update
 
   def update
     if site.update_attributes params[:site]
diff -Nur mephisto-0.7.3/app/controllers/admin/sites_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/sites_controller.rb
--- mephisto-0.7.3/app/controllers/admin/sites_controller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/sites_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,62 @@
+class Admin::SitesController < Admin::BaseController
+
+  before_filter :admin_required
+  member_actions.push *%W(index show new destroy create)
+  
+  def index
+    @sites = Site.search_by_host_or_title params[:search_string] do
+      Site.paginate(:page => params[:page], :per_page => params[:per_page], :order => 'id')
+    end
+  end
+
+  def show
+    @site = Site.find(params[:id])
+  end
+
+  def new
+    @site = Site.new
+  end
+
+  def create
+    @site = Site.new(params[:site])
+    if @site.save
+      flash[:notice] = "Site #{@site.host} was successfully created."
+      redirect_to :action => 'index'
+    else
+      flash[:error] = "Failed to create site."
+      render :action => "new"
+    end
+  end
+ 
+  def update
+    @site = Site.find(params[:id])
+    if @site.update_attributes(params[:site])
+      flash[:notice] = "Site #{@site.host} was successfully updated."
+      redirect_to :action => 'show', :id => @site
+    else
+      render :action => 'show'
+    end
+  end
+
+  def destroy
+    @site = Site.find(params[:id])
+    if @site.destroy
+      flash[:notice] = "Site removed."
+      redirect_to :action => 'index'
+    else
+      flash[:error] = "Failed to remove site #{@site.host}. Check file permissions."
+      render :action => 'show'
+    end
+  end
+  
+  private
+    def admin_required
+      current_user.admin? ? true : not_allowed
+    end
+    
+    def not_allowed
+      flash[:error] = "Only global administrators can manage sites."
+      redirect_to :controller => "/account", :action => :login
+    end
+    
+end
diff -Nur mephisto-0.7.3/app/controllers/admin/templates_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/templates_controller.rb
--- mephisto-0.7.3/app/controllers/admin/templates_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/templates_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -28,7 +28,7 @@
       if !@tmpl.file?
         page.flash.errors "File does not exist"
         page.visual_effect :fade, params[:context], :duration => 0.3
-      elsif @theme.templates.custom.include?(@tmpl.basename.to_s)
+      elsif @theme.templates.custom(@theme.extension).include?(@tmpl.basename.to_s)
         @tmpl.unlink
         page.visual_effect :fade, params[:context], :duration => 0.3
       else
diff -Nur mephisto-0.7.3/app/controllers/admin/users_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/users_controller.rb
--- mephisto-0.7.3/app/controllers/admin/users_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/admin/users_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -34,19 +34,20 @@
   end
 
   def destroy
-    @user.deleted_at = Time.now.utc
-    @user.save!
+    if @user == current_user then return @error = "Cannot delete yourself." end
+    if @user.admin?          then return @error = "Cannot delete a Mephisto administrator." end
+    @allowed = @user.update_attribute :deleted_at, Time.now.utc
   end
 
   def enable
-    @user.deleted_at = nil
-    @user.save!
+    @allowed = @user.update_attribute :deleted_at, nil
   end
   
   def admin
+    if @user == current_user then return @error = "Cannot toggle admin permissions for yourself." end
+    if @user.admin?          then return @error = "Cannot toggle admin permissions for a Mephisto administrator." end
     @membership = Membership.find_or_initialize_by_site_id_and_user_id(site.id, @user.id)
-    @membership.admin = !@membership.admin?
-    @membership.save!
+    @allowed    = @membership.update_attribute :admin, !@membership.admin?
   end
   
   protected
diff -Nur mephisto-0.7.3/app/controllers/application/errors.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/application/errors.rb
--- mephisto-0.7.3/app/controllers/application/errors.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/application/errors.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+# Custom handlers for exceptions are defined here.
+class ApplicationController
+
+  protected 
+  
+    # Handle public-facing errors by rendering the "error" liquid template
+    def show_404
+      show_error 'Page Not Found', :not_found
+    end
+
+    def show_error(message = 'An error occurred.', status = :internal_server_error)
+      render_liquid_template_for(:error, 'message' => message, :status => status)
+    end
+
+    # Handle admin-application errors
+    # TODO: after rails 2.0.2, convert these to rescue_from [array] rather than 3 lines.
+    rescue_from ActiveRecord::RecordNotFound,        :with => :render_admin_not_found
+    rescue_from ActionController::UnknownController, :with => :render_admin_not_found
+    rescue_from ActionController::UnknownAction,     :with => :render_admin_not_found
+
+    def render_admin_not_found
+      # TODO: render this from the site's custom admin 404 file, if it's a multi-site install.
+      render :file => File.join(RAILS_ROOT, 'public/404.html'), :status => :not_found
+    end
+  
+    def render_admin_error
+      # TODO: render this from the site's custom 500 file, if it's a multi-site install
+      render :file => File.join(RAILS_ROOT, 'public/500.html'), :status => :internal_server_error
+    end
+  
+    def rescue_action_in_public(exception)
+      logger.debug "#{exception.class.name}: #{exception.to_s}"
+      exception.backtrace.each { |t| logger.debug " > #{t}" }
+      render_admin_error
+    end  
+
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/controllers/application.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/application.rb
--- mephisto-0.7.3/app/controllers/application.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/application.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,20 +1,36 @@
 class ApplicationController < ActionController::Base
+  require_dependency 'application/errors'
+
   include Mephisto::CachingMethods
-  cattr_accessor :site_count
   before_filter  :set_cache_root
   helper_method  :site
   attr_reader    :site
+
+  auto_include!
+
+  def self.inherited(klass)
+    super
+    klass.auto_include!
+  end
+  
+  filter_parameter_logging "password"
   
   protected
     helper_method :admin?
+    helper_method :global_admin?
     
     def admin?
       logged_in? && (current_user.admin? || current_user.site_admin?)
     end
   
+    def global_admin?
+      logged_in? && current_user.admin?
+    end
+      
     # so not the best place for this...
     def asset_image_args_for(asset, thumbnail = :tiny, options = {})
-      options = options.reverse_merge(:title => "#{asset.title} \n #{asset.tags.join(', ')}")
+      thumb_size = Array.new(2).fill(Asset.attachment_options[:thumbnails][thumbnail].to_i).join('x')
+      options    = options.reverse_merge(:title => "#{asset.title} \n #{asset.tags.join(', ')}", :size => thumb_size)
       if asset.movie?
         ['/images/mephisto/icons/video.png', options]
       elsif asset.audio?
@@ -24,7 +40,7 @@
       elsif asset.other?
         ['/images/mephisto/icons/doc.png', options]
       elsif asset.thumbnails_count.zero?
-        [asset.public_filename, options.update(:size => Array.new(2).fill(Asset.attachment_options[:thumbnails][thumbnail].to_i).join('x'))]
+        [asset.public_filename, options]
       else
         [asset.public_filename(thumbnail), options]
       end
@@ -44,22 +60,14 @@
         # use collect so it doesn't modify @articles
         assigns['articles'] = assigns['articles'].collect &:to_liquid 
       end
-      status          = (assigns.delete(:status) || '200 OK')
+      status          = (assigns.delete(:status) || :ok)
       @liquid_assigns = assigns
-      render :text => site.render_liquid_for(@section, template_type, assigns, self), :status => status
-    end
-
-    def show_error(message = 'An error occurred.', status = '500 Error')
-      render_liquid_template_for(:error, 'message' => message, :status => status)
-    end
-
-    def show_404
-      show_error 'Page Not Found', '404 NotFound'
+      render :text => site.call_render(@section, template_type, assigns, self), :status => status
     end
 
     def set_cache_root
       host = request.domain(request.subdomains.size + (request.subdomains.first == 'www' ? 0 : 1))
-      @site ||= Site.find_by_host(host) || Site.find(:first, :order => 'id')
+      @site ||= Site.find_by_host(host) || Site.find(:first, :order => 'id') || raise(ActiveRecord::RecordNotFound, "You need to create your first site!")
       self.class.page_cache_directory = site.page_cache_directory.to_s
     end
 
@@ -69,15 +77,5 @@
       yield
       ENV['TZ'] = old_tz
     end
-    
-    def rescue_action_in_public(exception)
-      logger.debug "#{exception.class.name}: #{exception.to_s}"
-      exception.backtrace.each { |t| logger.debug " > #{t}" }
-      case exception
-        when ActiveRecord::RecordNotFound, ::ActionController::UnknownController, ::ActionController::UnknownAction
-          render :file => File.join(RAILS_ROOT, 'public/404.html'), :status => '404 Not Found'
-        else
-          render :file => File.join(RAILS_ROOT, 'public/500.html'), :status => '500 Error'
-      end
-    end
+
 end
diff -Nur mephisto-0.7.3/app/controllers/backend_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/backend_controller.rb
--- mephisto-0.7.3/app/controllers/backend_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/backend_controller.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'meta_weblog_api'
-require 'movable_type_api'
-class BackendController < ApplicationController
-  session :off
-
-  web_service_dispatching_mode :layered
-  web_service(:metaWeblog) { MetaWeblogService.new(self)  }
-  web_service(:mt)         { MovableTypeService.new(self) }
-
-  alias xmlrpc api
-  
-  cache_sweeper :article_sweeper, :assigned_section_sweeper, :comment_sweeper
-end
diff -Nur mephisto-0.7.3/app/controllers/feed_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/feed_controller.rb
--- mephisto-0.7.3/app/controllers/feed_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/feed_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -36,7 +36,6 @@
     
     def comment_feed_for_site
       @comments = site.comments.find(:all, :limit => 15, :include => :article)
-      cached_references      << @section
       self.cached_references += @comments
       self.cached_references += @comments.collect(&:article_referenced_cache_key)
     end
diff -Nur mephisto-0.7.3/app/controllers/mephisto_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/mephisto_controller.rb
--- mephisto-0.7.3/app/controllers/mephisto_controller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/controllers/mephisto_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -18,7 +18,7 @@
       # @dispatch_path.first has the headers
       if @dispatch_path.first.is_a?(Hash)
         response.headers['Status'] = interpret_status @section
-        redirect_to @dispatch_path.first[:location]
+        redirect_to @dispatch_path.first[:location], :status=>301
       else
         head @section
       end
@@ -31,21 +31,23 @@
     end
 
     def dispatch_page
-      @article = @dispatch_path.empty? ? @section.articles.find_by_position : @section.articles.find_by_permalink(@dispatch_path.first)
+      Article.with_published do
+        @article = @dispatch_path.empty? ? @section.articles.find_by_position : @section.articles.find_by_permalink(@dispatch_path.first)
+      end
       show_404 and return unless @article
       Mephisto::Liquid::CommentForm.article = @article
       render_liquid_template_for(:page, 'section' => @section.to_liquid(true),
-                                        'article' => @article.to_liquid(:mode => :single))
+                                        'article' => @article.to_liquid(:mode => :single, :page => @dispatch_path.empty?))
     end
     
     def dispatch_comments
+      @skip_caching = true
       show_404 and return unless find_article
       if !request.post? || params[:comment].blank?
-        @skip_caching = true
         redirect_to site.permalink_for(@article) and return
       end
 
-      @comment = @article.comments.build(params[:comment].merge(:author_ip => request.remote_ip, :user_agent => request.user_agent, :referrer => request.referer))
+      @comment = @article.comments.build(params[:comment].merge(:user_id => session[:user], :author_ip => request.remote_ip, :user_agent => request.user_agent, :referrer => request.referer))
       @comment.check_approval site, request if @comment.valid?
       @comment.save!
       redirect_to dispatch_path(:path => (site.permalink_for(@article)[1..-1].split('/') << 'comments' << @comment.id.to_s), :anchor => @comment.dom_id)
@@ -53,9 +55,12 @@
       show_article_with 'errors' => @comment.errors.full_messages, 'submitted' => params[:comment]
     rescue Article::CommentNotAllowed
       show_article_with 'errors' => ["Commenting has been disabled on this article"]
+    rescue Comment::Previewing
+      show_article_with 'errors' => ["Previewing your comment"], 'submitted' => params[:comment]
     end
     
     def dispatch_comment
+      @skip_caching = true
       show_article_with 'message' => 'Thanks for the comment!'
     end
 
@@ -73,20 +78,25 @@
     end
 
     def dispatch_search
+      @section = params[:s].nil? ? nil : site.sections.detect { |s| s.path == params[:s] }
+      joins          = nil
       conditions     = ['(published_at IS NOT NULL AND published_at <= :now) AND (title LIKE :q OR excerpt LIKE :q OR body LIKE :q)', 
                        { :now => Time.now.utc, :q => "%#{params[:q]}%" }]
-      search_count   = site.articles.count(:all, :conditions => conditions)
-      @article_pages = Paginator.new self, search_count, site.articles_per_page, params[:page]
-      @articles      = site.articles.find(:all, :conditions => conditions, :order => 'published_at DESC',
-                         :include => [:user, :sections],
-                         :limit   =>  @article_pages.items_per_page,
-                         :offset  =>  @article_pages.current.offset)
+      if @section
+        conditions.first << ' AND (assigned_sections.section_id = :section)'
+        conditions.last[:section] = @section.id
+      end
+
+      @articles = site.articles.paginate(:conditions => conditions, :order => 'published_at DESC',
+                                         :include => [:user, :sections],
+                                         :per_page => site.articles_per_page, :page => params[:page])
       
       render_liquid_template_for(:search, 'articles'      => @articles,
-                                          'previous_page' => paged_search_url_for(@article_pages.current.previous),
-                                          'next_page'     => paged_search_url_for(@article_pages.current.next),
-                                          'search_string' => params[:q],
-                                          'search_count'  => search_count)
+                                          'previous_page' => paged_search_url_for(@articles.previous_page),
+                                          'next_page'     => paged_search_url_for(@articles.next_page),
+                                          'search_string' => CGI::escapeHTML(params[:q]),
+                                          'search_count'  => @articles.total_entries,
+                                          'section'       => @section)
       @skip_caching = true
     end
     
@@ -124,7 +134,7 @@
       show_404 and return unless @article || find_article
       Mephisto::Liquid::CommentForm.article = @article
       @article = @article.to_liquid(:mode => :single)
-      render_liquid_template_for(:single, assigns.merge('articles' => [@article], 'article' => @article))
+      render_liquid_template_for(:single, assigns.update('articles' => [@article], 'article' => @article))
     end
     alias dispatch_single show_article_with
 end
diff -Nur mephisto-0.7.3/app/drops/article_drop.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/drops/article_drop.rb
--- mephisto-0.7.3/app/drops/article_drop.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/drops/article_drop.rb	2008-03-31 02:18:56.000000000 -0400
@@ -6,12 +6,12 @@
   
   def initialize(source, options = {})
     super source
-    @options        = options
+    @options  = options
     @liquid.update \
-      'body'             => @source.body_html,
-      'excerpt'          => (@source.excerpt_html.nil? || @source.excerpt_html.empty? ? nil : @source.excerpt_html),
-      'accept_comments'  => @source.accept_comments?,
-      'is_page_home'     => (options[:page] == true)
+      'body'            => @source.body_html,
+      'excerpt'         => (@source.excerpt_html.blank? ? nil : @source.excerpt_html),
+      'accept_comments' => @source.accept_comments?,
+      'is_page_home'    => (options[:page] == true)
   end
   
   def author
@@ -19,12 +19,11 @@
   end
 
   def comments
-    @comments ||= liquify(*@source.comments.reject(&:new_record?))
+    @comments ||= liquify(*@source.comments) # .reject(&:new_record?) <-- show new comments as they're built as a preview
   end
   
   def sections
-    @sections ||= @source.sections.inject([]) { |all, s| s.home? ? all : all << s.to_liquid } # your days are numbered, home section!
-    @sections ||= liquify(*@source.sections) { |s| s.home? ? nil : s.to_liquid }
+    @sections ||= liquify(*@source.sections.reject(&:home?))
   end
 
   def tags
@@ -44,7 +43,7 @@
   end
 
   def url
-    @url ||= absolute_url(@site.permalink_for(@source))
+    @url ||= absolute_url(@site.permalink_for(@source)[1..-1])
   end
 
   def comments_feed_url
@@ -54,6 +53,10 @@
   def changes_feed_url
     @changes_feed_url ||= url + '/changes.xml'
   end
+  
+  def assets
+    @assets ||= liquify(*@source.assets)
+  end
 
   protected
     def body_for_mode(mode)
diff -Nur mephisto-0.7.3/app/drops/comment_drop.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/drops/comment_drop.rb
--- mephisto-0.7.3/app/drops/comment_drop.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/drops/comment_drop.rb	2008-03-31 02:18:56.000000000 -0400
@@ -19,7 +19,22 @@
     @url ||= absolute_url(@source.site.permalink_for(@source))
   end
 
+  def new_record
+    @source.new_record?
+  end
+
   def author_link
-    @source.author_url.blank? ? "<span>#{CGI::escapeHTML(@source.author)}</span>" : %Q{<a href="#{CGI::escapeHTML author_url}">#{CGI::escapeHTML @source.author}</a>}
+    @source.author_url.blank? ? "<span>#{@source.author}</span>" : %Q{<a href="#{author_url}">#{@source.author}</a>}
+  end
+  
+  def presentation_class
+    @presentation_class ||= case @source.user_id
+        when @source.article.user_id
+          "by-author"
+        when nil
+          "by-guest"
+        else
+          "by-user"
+      end
   end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/filters/core_filters.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/filters/core_filters.rb
--- mephisto-0.7.3/app/filters/core_filters.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/filters/core_filters.rb	2008-03-31 02:18:56.000000000 -0400
@@ -56,6 +56,10 @@
   def assign_to_global(value, name)
     @context.scopes.last[name] = value ; nil
   end
+  
+  def contains(source, text)  
+    !source[text].nil?
+  end
 
   protected
     def liquify(*records, &block)
diff -Nur mephisto-0.7.3/app/filters/drop_filters.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/filters/drop_filters.rb
--- mephisto-0.7.3/app/filters/drop_filters.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/filters/drop_filters.rb	2008-03-31 02:18:56.000000000 -0400
@@ -13,8 +13,12 @@
     @context['site'].find_descendant_sections(path)
   end
   
-  def linked_section_list(article, seperator = ', ')
-    article.sections.collect {|s| link_to_section s }.join(seperator)
+  def linked_section_list(article, separator = ', ')
+    article.sections.collect {|s| link_to_section s }.join(separator)
+  end
+  
+  def linked_tag_list(article, separator = ', ')
+    article.tags.collect {|t| link_to_tag t }.join(separator)
   end
 
   def latest_articles(site_or_section, limit = nil)
@@ -28,6 +32,22 @@
   def latest_comments(site, limit = nil)
     site.latest_comments(limit || site['articles_per_page'])
   end
+  
+  def find_asset(article, label)
+    article.assets.detect { |a| a.source.label == label }
+  end
+  
+  def next_article(article, section=nil)
+    if nxt = article.source.next(section ? section.source : nil)
+      nxt.to_liquid.tap { |n| n.context = @context if n }
+    end
+  end
+  
+  def previous_article(article, section=nil)
+    if prev = article.source.previous(section ? section.source : nil)
+      prev.to_liquid.tap { |p| p.context = @context if p }
+    end
+  end
 
   def monthly_articles(section, date = nil)
     date = parse_date(date)
@@ -38,11 +58,17 @@
     liquify(*@context['site'].source.articles.find(:all, :include => :tags, :conditions => ['tags.name in (?)', Tag.parse(tags)], :order => 'contents.created_at desc'))
   end
   
-  def assets_by_type(type)
-    liquify(*@context['site'].source.assets.find_all_by_content_types([type.to_sym], :all, :order => 'created_at desc'))
+  def tagged_articles_in_section(tags, section)
+    liquify(*section.source.articles.find(:all, :include => :tags, :conditions => ['tags.name in (?)', Tag.parse(tags)], :order => 'contents.published_at desc'))
+  end
+  
+  def assets_by_type(type, drop = nil)
+    drop ||= @context['site']
+    liquify(*drop.source.assets.find_all_by_content_types([type.to_sym], :all, :order => 'created_at desc'))
   end
   
-  def tagged_assets(tags)
-    liquify(*@context['site'].source.assets.find(:all, :include => :tags, :conditions => ['tags.name in (?)', Tag.parse(tags)], :order => 'assets.created_at desc'))
+  def tagged_assets(tags, drop = nil)
+    drop ||= @context['site']
+    liquify(*drop.source.assets.find(:all, :include => :tags, :conditions => ['tags.name in (?)', Tag.parse(tags)], :order => 'assets.created_at desc'))
   end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/filters/url_filters.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/filters/url_filters.rb
--- mephisto-0.7.3/app/filters/url_filters.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/filters/url_filters.rb	2008-03-31 02:18:56.000000000 -0400
@@ -4,26 +4,43 @@
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::AssetTagHelper
 
-  def link_to_article(article, text = nil)
-    content_tag :a, text || h(article['title']), :href => article['url']
+  def link_to_article(article, *args)
+    options = link_args_to_options(args)
+    text = options.delete(:text) || h(article['title'])
+    content_tag :a, text, { :href => article['url'], :title => text }.merge(options)
   end
   
-  def link_to_page(page, section = nil, text = nil)
-    content_tag :a, text || h(page['title']), page_anchor_options(page, section)
+  def link_to_page(page, section = nil, *args)
+    options = link_args_to_options(args)
+    text = options.delete(:text) || h(page['title'])
+    content_tag :a, text, page_anchor_options(page, section, { :title => text }.merge(options))
   end
 
-  def link_to_comments(article, text = nil)
-    content_tag :a, text || pluralize(article['comments_count'], 'comment'), :href => article['url']
+  def link_to_comments(article, *args)
+    options = link_args_to_options(args)
+    text = options.delete(:text) || pluralize(article['comments_count'], 'comment')
+    content_tag :a, text, { :href => article['url'] + '#comments', :title => text }.merge(options)
   end
   
-  def link_to_section(section, text = nil)
-    content_tag :a, text || h(section['name']), :href => section['url'], :title => section['title']
+  def link_to_section(section, *args)
+    options = link_args_to_options(args)
+    text = options.delete(:text) || h(section['name'])
+    content_tag :a, text, section_anchor_options(section, { :title => text }.merge(options))
   end
 
   def img_tag(img, options = {})
     tag 'img', {:src => asset_url(img), :alt => img.split('.').first }.merge(options)
   end
   
+  # Special link that checks for current section.  If it exists and it's a paged section, use link_to_page instead.
+  def link_to_search_result(article, *args)
+    if current_page_section && current_page_section[:is_paged]
+      link_to_page(article, current_page_section, *args)
+    else
+      link_to_article(article, *args)
+    end
+  end
+  
   def stylesheet_url(css)
     absolute_url :stylesheets, css
   end
@@ -54,12 +71,16 @@
     image_tag url, :class => 'gravatar', :size => "#{size}x#{size}", :alt => comment['author']
   end
 
-  def link_to_tag(tag)
-    content_tag :a, h(tag), :href => tag_url(tag)
+  def link_to_tag(tag, *args)
+    options = link_args_to_options(args)
+    text = options.delete(:text) || h(tag)
+    content_tag :a, text, { :href => tag_url(tag), :rel => 'tag', :title => text }.merge(options)
   end
 
-  def link_to_month(section, date = nil, format = 'my')
-    content_tag :a, format_date(date, format), :href => monthly_url(section, date)
+  def link_to_month(section, date = nil, format = 'my', *args)
+    options = link_args_to_options(args)
+    text = options.delete(:text) || h(format_date(date, format))
+    content_tag :a, text, { :href => monthly_url(section, date), :title => text }.merge(options)
   end
 
   def monthly_url(section, date = nil)
@@ -109,11 +130,33 @@
     atom_feed '/feed/' + section.source.to_feed_url.join('/'), (title.blank? ? "Articles for #{section['name']}" : title)
   end
 
+  def next(article, section = nil)
+    article.next(section)
+  end
+
+  def previous(article, section = nil)
+    article.previous(section)
+  end
+
   private
     # marks a page as class=selected
-    def page_anchor_options(page, section = nil)
-      options = {:href => page_url(page, section)}
-      current_page_article == page ? options.update(:class => 'selected') : options
+    def page_anchor_options(page, section = nil, options = {})
+      options.update(:href => page_url(page, section))
+      options[:class].nil? ? options.update(:class => 'selected') : options[:class] += ' selected' if current_page_article == page
+      options
+    end
+    
+    # marks a section as class=selected
+    def section_anchor_options(section, options = {})
+      options.update(:href => section['url'])
+      options[:class].nil? ? options.update(:class => 'selected') : options[:class] += ' selected' if current_page_section && (current_page_section.url == section.url)
+      options
+    end
+    
+    def link_args_to_options(args)
+      options = {}
+      [:text, :title, :id, :class, :rel].zip(args) {|key, value| options[key] = h(value) unless value.blank?}
+      options
     end
     
     def current_page_section
@@ -123,4 +166,4 @@
     def current_page_article
       @current_page_article ||= @context['article']
     end
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/app/helpers/admin/cached_pages_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/admin/cached_pages_helper.rb
--- mephisto-0.7.3/app/helpers/admin/cached_pages_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/admin/cached_pages_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,14 +1,4 @@
 module Admin::CachedPagesHelper
-  def pagination_remote_links(paginator, options={}, html_options={})
-     name   = options[:name]    || ActionController::Pagination::DEFAULT_OPTIONS[:name]
-     params = (options[:params] || ActionController::Pagination::DEFAULT_OPTIONS[:params]).clone
-     
-     pagination_links_each(paginator, options) do |n|
-       params[name] = n
-       link_to n.to_s, :page => n
-     end
-  end
-
   def display_cached_page_date(page)
     if Date.today == page.updated_at.to_date 
       if page.updated_at > Time.now - 4.hours
@@ -20,4 +10,4 @@
       page.updated_at.strftime("%b %d, %Y")
     end
   end
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/app/helpers/admin/plugins_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/admin/plugins_helper.rb
--- mephisto-0.7.3/app/helpers/admin/plugins_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/admin/plugins_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+module Admin
+  module PluginsHelper
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/helpers/application_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/application_helper.rb
--- mephisto-0.7.3/app/helpers/application_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/application_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,7 +2,7 @@
 module ApplicationHelper
 
   def author_link_for(comment)
-    return comment.author if comment.author_url.blank?
+    return h(comment.author) if comment.author_url.blank?
     link_to h(comment.author), "#{'http://' unless comment.author_url =~ /^https?:\/\//}#{comment.author_url}"
   end
 
@@ -52,16 +52,6 @@
     end
   end
 
-  def pagination_remote_links(paginator, options={}, html_options={})
-     name   = options[:name]    || ActionController::Pagination::DEFAULT_OPTIONS[:name]
-     params = (options[:params] || ActionController::Pagination::DEFAULT_OPTIONS[:params]).clone
-     
-     pagination_links_each(paginator, options) do |n|
-       params[name] = n
-       link_to_function n.to_s, "window.spotlight.search('#{n}')"
-     end
-  end
-
   def comment_expiration_options
     [['Are not allowed', -1],
      ['Never expire', 0], 
diff -Nur mephisto-0.7.3/app/helpers/feed_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/feed_helper.rb
--- mephisto-0.7.3/app/helpers/feed_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/helpers/feed_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,2 +1,12 @@
-module FeedHelper
+module FeedHelper  
+  # show paged url for an article if the section is a paged section
+  def section_url_for(article)
+    if @section && @section.show_paged_articles?
+      @section_articles ||= {}
+      @section_articles[@section.id] ||= (@section.articles.find(:first) || :false)
+      ([nil] << (@section_articles[@section.id].permalink == article.permalink ? @section.to_url : @section.to_page_url(article))).join("/")
+    else
+      site.permalink_for(article)
+    end
+  end
 end
diff -Nur mephisto-0.7.3/app/models/article.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/article.rb
--- mephisto-0.7.3/app/models/article.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/article.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,12 +1,13 @@
 class Article < Content
   class CommentNotAllowed < StandardError; end
-  
+    
   validates_presence_of :title, :user_id, :site_id
 
   before_validation { |record| record.set_default_filter! }
   after_validation :convert_to_utc
-  before_create :create_permalink
+  has_permalink :title
   after_save    :save_assigned_sections
+  after_update  :reset_comment_attributes
 
   acts_as_versioned :if_changed => [:title, :body, :excerpt], :limit => 5 do
     def self.included(base)
@@ -33,7 +34,7 @@
 
   has_many :events,   :order => 'created_at desc', :dependent => :delete_all
   with_options :order => 'created_at', :class_name => 'Comment' do |comment|
-    comment.has_many :comments,            :conditions => ['contents.approved = ?', true], :dependent => :delete_all  do
+    comment.has_many :comments,            :conditions => ['contents.approved = ?', true]  do
       def unapprove(id)
         returning find(id) do |comment|
           comment.approved = false
@@ -49,14 +50,33 @@
         end
       end
     end
-    comment.has_many :all_comments
+    comment.has_many :all_comments, :dependent => :delete_all
+  end
+  
+  has_many :assigned_assets, :order => 'position', :dependent => :destroy
+  has_many :assets, :through => :assigned_assets, :conditions => ['assigned_assets.active = ?', true], :select => 'assets.*, assigned_assets.label' do
+    def add(asset, label = nil)
+      returning AssignedAsset.find_or_create_by_article_id_and_asset_id(proxy_owner.id, asset.id) do |aa|
+        aa.label  = label
+        aa.active = true
+        aa.save!
+      end
+    end
+    
+    def remove(asset)
+      AssignedAsset.update_all ['active = ?', false], ['article_id = ? AND asset_id = ?', proxy_owner.id, asset.id]
+    end
   end
 
   class << self
+    def with_published(&block)
+      with_scope({:find => { :conditions => ['contents.published_at <= ? AND contents.published_at IS NOT NULL', Time.now.utc] } }, &block)
+    end
+
     def find_by_date(options = {})
-      find(:all, { :order => 'contents.published_at desc', 
-                   :conditions => ['contents.published_at <= ? AND contents.published_at IS NOT NULL', Time.now.utc] } \
-        .merge(options))
+      with_published do
+        find :all, {:order => 'contents.published_at desc'}.update(options)
+      end
     end
     
     def find_all_in_month(year, month, options = {})
@@ -70,7 +90,7 @@
     end
     
     def permalink_for(str)
-      str.gsub(/\W+/, ' ').strip.downcase.gsub(/\ +/, '-')
+      PermalinkFu.escape(str)
     end
   end
 
@@ -134,11 +154,52 @@
     set_default_filter_from user
   end
 
-  protected
-    def create_permalink
-      self.permalink = self.class.permalink_for(title.to_s) if permalink.blank?
+  def add_xml(builder)
+    add_podcast_xml(builder)
+  end
+
+  def next(section=nil)
+    return nil if section && !sections.include?(section)
+    section = sections[0] if (section.nil?)
+    self.class.with_published do
+      if section
+        if section.paged?
+          index = section.articles.index(self)
+          (index <= section.articles.length-1) ? section.articles[index+1] : nil
+          # article = section.articles.detect {|article| article.id == id }
+        else
+          site.articles.find :first, :conditions => ['published_at > ? and assigned_sections.section_id = ?', published_at, section.id], 
+            :joins => 'inner join assigned_sections on contents.id = assigned_sections.article_id',
+            :order => 'published_at'
+        end
+      else
+        site.articles.find :first, :conditions => ['published_at > ?', published_at], :order => 'published_at'
+      end
     end
+  end
+
+  def previous(section=nil)
+    return nil if section && !sections.include?(section)
+    section = sections[0] if (section.nil?)
+    self.class.with_published do
+      if section
+        if section.paged?
+          index = section.articles.index(self)
+          (index > 0) ? section.articles[index-1] : nil
+          # article = section.articles.detect {|article| article.id == id }
+        else
+          site.articles.find :first, :conditions => ['published_at < ? and assigned_sections.section_id = ?', published_at, section.id], 
+            :joins => 'inner join assigned_sections on contents.id = assigned_sections.article_id',
+            :order => 'published_at desc'
+        end
+      else
+        site.articles.find :first, :conditions => ['published_at < ?', published_at], :order => 'published_at desc'
+      end
+    end
+  end
 
+
+  protected
     def convert_to_utc
       self.published_at = published_at.utc if published_at
     end
@@ -156,4 +217,14 @@
     
       @new_sections = nil
     end
+    
+    def reset_comment_attributes
+      Content.update_all ['title = ?, published_at = ?, permalink = ?', title, published_at, permalink], ['article_id = ?', id]
+    end
+    
+    def add_podcast_xml(builder)
+      if asset = assets.find(:first, :conditions => ['label = ?', 'podcast'], :select => 'assets.*')
+        builder.link :rel => :enclosure, :type => asset.content_type, :length => asset.size, :href => asset.public_filename
+      end
+    end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/models/asset.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/asset.rb
--- mephisto-0.7.3/app/models/asset.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/asset.rb	2008-03-31 02:18:56.000000000 -0400
@@ -6,10 +6,10 @@
   # use #send due to a ruby 1.8.2 issue
   @@movie_condition = send(:sanitize_sql, ['content_type LIKE ? OR content_type IN (?)', 'video%', extra_content_types[:movie]]).freeze
   @@audio_condition = send(:sanitize_sql, ['content_type LIKE ? OR content_type IN (?)', 'audio%', extra_content_types[:audio]]).freeze
-  @@image_condition = send(:sanitize_sql, ['content_type IN (?)', Technoweenie::ActsAsAttachment.content_types]).freeze
+  @@image_condition = send(:sanitize_sql, ['content_type IN (?)', Technoweenie::AttachmentFu.content_types]).freeze
   @@other_condition = send(:sanitize_sql, [
     'content_type NOT LIKE ? AND content_type NOT LIKE ? AND content_type NOT IN (?)',
-    'audio%', 'video%', (extra_content_types[:movie] + extra_content_types[:audio] + Technoweenie::ActsAsAttachment.content_types)]).freeze
+    'audio%', 'video%', (extra_content_types[:movie] + extra_content_types[:audio] + Technoweenie::AttachmentFu.content_types)]).freeze
   cattr_reader *%w(movie audio image other).collect! { |t| "#{t}_condition".to_sym }
 
   class << self
@@ -45,7 +45,9 @@
   include Mephisto::TaggableMethods
 
   belongs_to :site
-  acts_as_attachment :storage => :file_system, :thumbnails => { :thumb => '120>', :tiny => '50>' }, :max_size => 30.megabytes
+  has_many :assigned_assets, :order => 'position', :dependent => :destroy
+  has_attachment :storage => :file_system, :thumbnails => { :thumb => '120>', :tiny => '50>' }, :max_size => 30.megabytes, 
+    :processor => (Object.const_defined?(:ASSET_IMAGE_PROCESSOR) ? ASSET_IMAGE_PROCESSOR : nil)
   before_validation_on_create :set_site_from_parent
   validates_presence_of :site_id
   validates_as_attachment
@@ -69,6 +71,7 @@
   end
 
   after_attachment_saved do |record|
+    File.chmod 0644, record.full_filename
     Asset.update_all ['thumbnails_count = ?', record.thumbnails.count], ['id = ?', record.id] unless record.parent_id
   end
 
@@ -82,7 +85,7 @@
 
   protected
     def rename_unique_filename
-      if (@old_filename || new_record?) && errors.empty? && site_id && filename
+      if ((@old_filename && !@old_filename.eql?(full_filename)) || new_record?) && errors.empty? && site_id && filename
         i      = 1
         pieces = filename.split('.')
         ext    = pieces.size == 1 ? nil : pieces.pop
diff -Nur mephisto-0.7.3/app/models/assigned_asset.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/assigned_asset.rb
--- mephisto-0.7.3/app/models/assigned_asset.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/assigned_asset.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+class AssignedAsset < ActiveRecord::Base
+  belongs_to :article, :counter_cache => 'assets_count'
+  belongs_to :asset
+  acts_as_list :scope => :article_id
+  validates_presence_of :article_id, :asset_id
+  validate_on_create :check_for_dupe_article_and_asset
+
+  protected
+    def check_for_dupe_article_and_asset
+      unless self.class.count(:all, :conditions => ['article_id = ? and asset_id = ?', article_id, asset_id]).zero?
+        errors.add_to_base("Cannot have a duplicate assignment for this article and asset")
+      end
+    end
+end
diff -Nur mephisto-0.7.3/app/models/assigned_section.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/assigned_section.rb
--- mephisto-0.7.3/app/models/assigned_section.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/assigned_section.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,14 +1,14 @@
 class AssignedSection < ActiveRecord::Base
   belongs_to :article
   belongs_to :section, :counter_cache => 'articles_count'
-  acts_as_list :scope => 'section_id = #{section_id}'
+  acts_as_list :scope => :section_id
   validates_presence_of :article_id, :section_id
   validate_on_create    :check_for_dupe_article_and_section
 
   protected
     def check_for_dupe_article_and_section
       unless self.class.count(:all, :conditions => ['article_id = ? and section_id = ?', article_id, section_id]).zero?
-        errors.add_to_base("Cannot have a duplicate categorization for this article and section")
+        errors.add_to_base("Cannot have a duplicate assignment for this article and section")
       end
     end
 end
diff -Nur mephisto-0.7.3/app/models/comment.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/comment.rb
--- mephisto-0.7.3/app/models/comment.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/comment.rb	2008-03-31 02:18:56.000000000 -0400
@@ -7,12 +7,23 @@
   before_validation :clean_up_author_url
   after_validation_on_create  :snag_article_attributes
   before_create  :check_comment_expiration
+  before_create  :sanitize_attributes
   before_save    :update_counter_cache
   before_destroy :decrement_counter_cache
   belongs_to :article
   has_one :event, :dependent => :destroy
-  attr_protected :approved
+  before_create  :check_if_previewing
 
+  attr_accessible :article, :article_id, :user_id, :user, :excerpt, :body, :author, :author_url, :author_email, :author_ip, :updater_id, :updater, :comment_age, :user_agent, :referrer, :preview
+  attr_accessor :preview
+  class Previewing < StandardError; end
+
+  # If the view sends the "preview" accessor, we raise this
+  # error so the controller can simply rescue 
+  def check_if_previewing
+    raise Comment::Previewing if preview
+  end
+  
   def self.find_all_by_section(section, options = {})
     find :all, options.update(:conditions => ['contents.approved = ? and assigned_sections.section_id = ?', true, section.id], 
       :select => 'contents.*', :joins => 'INNER JOIN assigned_sections ON assigned_sections.article_id = contents.article_id', 
@@ -67,12 +78,19 @@
   end
 
   protected
+    def sanitize_attributes
+      [:author, :author_url, :author_email, :author_ip, :user_agent, :referrer].each do |a|
+        self.send("#{a}=", CGI::escapeHTML(self.send(a).to_s))
+      end
+    end
+
     def snag_article_attributes
-      self.attributes = { :site => article.site, :filter => article.site.filter, :title => article.title, :published_at => article.published_at, :permalink => article.permalink }
+      self.filter ||= article.site.filter
+      [:site, :title, :published_at, :permalink].each { |a| self.send("#{a}=", article.send(a)) }
     end
 
     def check_comment_expiration
-      raise Article::CommentNotAllowed unless article.accept_comments?
+      raise Article::CommentNotAllowed, "#{article.status} does not allow comments" unless article.accept_comments?
     end
 
     def update_counter_cache
diff -Nur mephisto-0.7.3/app/models/resources.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/resources.rb
--- mephisto-0.7.3/app/models/resources.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/resources.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,7 +1,8 @@
 class Resources < Attachments
-  NON_IMAGE_EXTNAMES = %w(.js .css)
+  @@non_image_extnames = %w(.js .css)
+  cattr_reader :non_image_extnames
   def image?(path)
-    !NON_IMAGE_EXTNAMES.include?(path.extname)
+    !non_image_extnames.include?(path.extname)
   end
   
   def content_type(path)
@@ -12,6 +13,7 @@
       when '.jpg', '.jpeg' then 'image/jpeg'
       when '.gif'          then 'image/gif'
       when '.swf'          then 'application/x-shockwave-flash'
+      when '.ico'          then 'image/x-icon'
     end
   end
   
diff -Nur mephisto-0.7.3/app/models/site.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/site.rb
--- mephisto-0.7.3/app/models/site.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/site.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,10 +1,32 @@
+require 'uri'
+
 class Site < ActiveRecord::Base
-  @@theme_path = Pathname.new(RAILS_ROOT) + 'themes'
-  cattr_reader :theme_path
+  @@default_assigns = {}
+  @@theme_path      = Pathname.new(RAILS_ROOT) + 'themes'
+  cattr_reader :theme_path, :default_assigns
 
   cattr_accessor :multi_sites_enabled, :cache_sweeper_tracing
+  
+  # @@template_handlers = HashWithIndifferentAccess.new if @@template_handlers.nil?
+  @@template_handlers = {}
+  
+  # Register a class that knows how to handle template files with the given
+  # extension. This can be used to implement new template types.
+  # The constructor for the class must take a Site instance
+  # as a parameter, and the class must implement a #render method that
+  # has the following signature
+  # def render(section, layout, template, assigns ={}, controller = nil)
+  # and return the rendered template as a string.
+  def self.register_template_handler(extension, klass)
+    @@template_handlers[extension] = klass
+  end
+  register_template_handler(".liquid", Mephisto::Liquid::LiquidTemplate)
+
+  def self.extensions
+    @@template_handlers.keys
+  end
 
-  has_many  :sections, :order => "position" do
+  has_many  :sections, :order => "position", :dependent => :destroy do
     def home
       find_by_path ''
     end
@@ -19,7 +41,7 @@
     end
   end
 
-  has_many  :articles do
+  has_many  :articles, :dependent => :destroy do
     def find_by_permalink(options)
       conditions = 
         returning ["(contents.published_at IS NOT NULL AND contents.published_at <= ?)", Time.now.utc] do |cond|
@@ -41,13 +63,13 @@
     end
   end
   
-  has_many  :comments, :order => 'comments.created_at desc'
+  has_many  :comments, :order => 'comments.created_at desc', :dependent => :delete_all
   
-  has_many  :events
+  has_many  :events, :dependent => :destroy
   
-  has_many  :cached_pages
+  has_many  :cached_pages, :dependent => :destroy
   
-  has_many  :assets, :order => 'created_at desc', :conditions => 'parent_id is null'
+  has_many  :assets, :order => 'created_at desc', :conditions => 'parent_id is null', :dependent => :destroy
 
   has_many :memberships, :dependent => :destroy
   has_many :members, :through => :memberships, :source => :user
@@ -60,13 +82,23 @@
   validates_format_of     :host, :with => Format::DOMAIN
   validates_uniqueness_of :host
   validate :check_permalink_style
-  after_create { |s| s.sections.create(:name => 'Home') }
+  
+  after_create :setup_site_theme_directories
+  after_create { |site| site.sections.create(:name => 'Home') }
+  before_destroy :flush_cache_and_remove_site_directories    
 
   with_options :order => 'contents.created_at DESC', :class_name => 'Comment' do |comment|
     comment.has_many :comments,            :conditions => ['contents.approved = ?', true]
     comment.has_many :unapproved_comments, :conditions => ['contents.approved = ? or contents.approved is null', false]
     comment.has_many :all_comments
   end
+  
+  def self.search_by_host_or_title(search_string)
+    conditions = search_string.blank? ? nil : ["host LIKE ? OR title LIKE ?"] + ["%#{search_string}%"] * 2
+    with_scope( :find => { :conditions => conditions } ) do
+      yield
+    end
+  end
 
   def users(options = {})
     User.find_all_by_site self, options
@@ -123,7 +155,7 @@
   end
 
   def theme
-    @theme ||= themes[current_theme_path] || themes.first
+    @theme ||= themes[current_theme_path] || themes.first || raise(MissingThemesError.new(self))
   end
 
   def change_theme_to(new_theme_path)
@@ -150,23 +182,26 @@
   end
 
   def search_url(query, page = nil)
-    "/#{search_path}?q=#{CGI::escapeHTML(query)}#{%(&page=#{CGI::escapeHTML(page.to_s)}) unless page.blank?}"
+    "/#{search_path}?q=#{CGI::escapeHTML(query)}#{%(&amp;page=#{CGI::escapeHTML(page.to_s)}) unless page.blank?}"
   end
 
   def tag_url(*tags)
-    ['', tag_path, *tags] * '/'
+    ['', tag_path, *tags.collect { |t| URI::escape(t.to_s) }] * '/' 
   end
 
   def accept_comments?
     comment_age.to_i > -1
   end
 
-  def render_liquid_for(section, template_type, assigns = {}, controller = nil)
+  def call_render(section, template_type, assigns = {}, controller = nil)
     assigns.update('site' => to_liquid(section), 'mode' => template_type)
-    parse_inner_template(set_content_template(section, template_type), assigns, controller)
-    parse_template(set_layout_template(section, template_type), assigns, controller)
+    assigns.update(default_assigns) unless default_assigns.empty?
+    template = set_content_template(section, template_type)
+    layout = set_layout_template(section, template_type)
+    handler = @@template_handlers[theme.extension] || @@template_handlers[".liquid"]
+    handler.new(self).render(section, layout, template, assigns, controller)
   end
-
+  
   def to_liquid(current_section = nil)
     SiteDrop.new self, current_section
   end
@@ -194,6 +229,13 @@
     end
   end
 
+#need non protected method for ErbTemplate - psq
+  def find_preferred_template(template_type, custom_template)
+    preferred = templates.find_preferred(template_type, custom_template)
+    return preferred if preferred && preferred.file?
+    raise MissingTemplateError.new(template_type, templates.collect_templates(template_type, custom_template).collect(&:basename))
+  end
+
   protected
     def cached_log_message_for(log_message, pages)
       pages.inject([log_message, "Expiring #{pages.size} page(s)"]) { |msg, p| msg << " - #{p.url}" }.join("\n")
@@ -259,33 +301,38 @@
         else
           case template_type
             when :tag    then tag_layout
-            when :search then search_layout
+            when :search then sections.detect(&:home?).layout
           end
         end
       find_preferred_template(:layout, layout_template)
     end
 
-    def find_preferred_template(template_type, custom_template)
-      preferred = templates.find_preferred(template_type, custom_template)
-      return preferred if preferred && preferred.file?
-      raise MissingTemplateError.new(template_type, templates.collect_templates(template_type, custom_template).collect(&:basename))
-    end
+    private
     
-    def parse_template(template, assigns, controller)
-      # give the include tag access to files in the site's fragments directory
-      Liquid::Template.file_system = Liquid::LocalFileSystem.new(File.join(theme.path, 'templates'))
-      tmpl = Liquid::Template.parse(template.read.to_s)
-      returning tmpl.render(assigns, :registers => {:controller => controller}) do |result|
-        yield tmpl, result if block_given?
+    def setup_site_theme_directories
+      begin
+        theme_path = "#{RAILS_ROOT}/themes/site-#{self.id}/simpla"
+        FileUtils.mkdir_p("#{RAILS_ROOT}/themes/site-#{self.id}")
+        FileUtils.cp_r("#{RAILS_ROOT}/themes/default", theme_path)
+        Dir[File.join(theme_path, '**/.svn')].each do |dir|
+          FileUtils.rm_rf dir
+        end
+      rescue
+        logger.error "ERROR: removing directories for site #{self.host}, check file permissions."
+        errors.add_to_base "Unable to create theme directories."
+        false
       end
     end
-    
-    def parse_inner_template(template, assigns, controller)
-      parse_template(template, assigns, controller) do |tmpl, result|
-        # Liquid::Template takes a copy of the assigns.  
-        # merge any new values in to the assigns and pass them to the layout
-        tmpl.assigns.each { |k, v| assigns[k] = v } if tmpl.respond_to?(:assigns)
-        assigns['content_for_layout'] = result
+
+    def flush_cache_and_remove_site_directories
+      begin
+        CachedPage.expire_pages self, self.cached_pages
+        FileUtils.rm_rf("#{RAILS_ROOT}/themes/site-#{self.id}")
+        FileUtils.rm_rf("#{RAILS_ROOT}/public/cache/#{self.host}")
+      rescue
+        logger.error "ERROR: removing directories for site #{self.host}, check file permissions."
+        false
       end
     end
+
 end
diff -Nur mephisto-0.7.3/app/models/tag.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/tag.rb
--- mephisto-0.7.3/app/models/tag.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/tag.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,4 @@
 class Tag < ActiveRecord::Base
-  @@tag_parse_regex = /((?: |)['"]{0,1})['"]?\s*(.*?)\s*(?:[,'"]|$)(?:\1(?: |$))/
   has_many :taggings
 
   class << self
@@ -7,23 +6,19 @@
       find_by_name(tag.to_s)
     end
 
-    # parses a comma separated list of tags into tag names
-    # handles all kinds of different tags. (comma seperated, space seperated (in quotation marks))
-    # should handle most the common keyword formats.
-    #
-    # e.g.: b'log, emacs fun, rails, ruby => "b'log", "emacs fun", "rails", "ruby"
-    #       "b'log" "emacs fun" "rails" "ruby" => "b'log", "emacs fun", "rails", "ruby"
-    #       'b\'log' 'emacs fun' 'rails' 'ruby' => "b'log", "emacs fun", "rails", "ruby"
+    # parses a list of tags into tag names
     #
     #   Tag.parse('a, b, c')
     #   # => ['a', 'b', 'c']
+    #
+    #   Tag.parse("a b c")
+    #   # => ['a', 'b', 'c']
+    #
+    #   Tag.parse(%(a "b c"))
+    #   # => ['a', 'b c']
     def parse(list)
       return list if list.is_a?(Array)
-      returning list.scan(@@tag_parse_regex) do |tags|
-        tags.collect! { |t| t.last.strip!; t.last }
-        tags.uniq!
-        tags.delete_if &:blank?
-      end
+      list.include?(',') ? parse_with_commas(list) : parse_with_spaces(list)
     end
 
     # Parses comma separated tag list and returns tags for them.
@@ -44,6 +39,38 @@
         found_tags + (tag_names - found_tags.collect(&:name)).collect { |s| create!(:name => s) }
       end
     end
+  
+    private
+      def parse_with_commas(list)
+        cleanup_tags(list.split(','))
+      end
+      
+      def parse_with_spaces(list)
+        tags = []
+
+        # first, pull out the quoted tags
+        list.gsub!(/\"(.*?)\"\s*/ ) { tags << $1; "" }
+        
+        # then, get whatever's left
+        tags.concat list.split(/\s/)
+
+        cleanup_tags(tags)
+      end
+    
+      def cleanup_tags(tags)
+        tags.tap do |t|
+          t.collect! do |tag|
+            unless tag.blank?
+              tag.downcase!
+              tag.gsub!(/:/, '')
+              tag.strip!
+              tag
+            end
+          end
+          t.compact!
+          t.uniq!
+        end
+      end
   end
 
   def ==(comparison_object)
diff -Nur mephisto-0.7.3/app/models/templates.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/templates.rb
--- mephisto-0.7.3/app/models/templates.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/templates.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,15 +1,18 @@
 class Templates < Attachments
-  @@template_types = [:section, :single, :archive, :search, :error, :tag, :layout].collect! { |f| "#{f}.liquid" }
+  @@template_types = ["section", "single", "archive", "search", "error", "tag", "layout"]
   @@template_types.sort!
-  cattr_reader :template_types
 
+  def template_types(extension = ".liquid")
+    @@template_types.collect { |f| "#{f}"+extension }
+  end
+  
   def [](template_name)
-    template_name = File.basename(template_name.to_s).sub /\.liquid$/, ''
-    theme.path + "#{template_name =~ /layout$/ ? 'layouts' : 'templates'}/#{template_name}.liquid"
+    template_name = File.basename(template_name.to_s).sub /#{theme.extension}$/, ''
+    theme.path + "#{template_name =~ /layout$/ ? 'layouts' : 'templates'}/#{template_name}#{theme.extension}"
   end
 
   def collect_templates(template_type, *custom_templates)
-    custom_templates.push(template_type).collect! { |t| self[t] }
+    custom_templates.push(template_type.to_s+theme.extension).collect! { |t| self[t] }
   end
 
   # adds the custom_template to the top of the hierarchy if given
@@ -17,7 +20,7 @@
     collect_templates(template_type, custom_template).detect(&:file?)
   end
   
-  def custom
-    @custom ||= collect { |p| p.basename.to_s } - template_types
+  def custom(extension = ".liquid")
+    @custom ||= (collect { |p| p.basename.to_s } - template_types(extension)).sort
   end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/models/theme.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/theme.rb
--- mephisto-0.7.3/app/models/theme.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/theme.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,9 +1,9 @@
 class Theme
   @@root_theme_files   = %w(about.yml preview.png)
   @@theme_directories  = %w(templates layouts javascripts stylesheets images)
-  @@allowed_extensions = %w(.js .css .liquid .png .gif .jpg .swf)
+  @@allowed_extensions = %w(.js .css .png .gif .jpg .swf .ico) | Site.extensions
   cattr_reader :root_theme_files, :theme_directories, :allowed_extensions
-  attr_reader :path, :base_path
+  attr_reader :path, :base_path, :extension
 
   def self.import(zip_file, options = {})
     dest        = options[:to].is_a?(Pathname) ? options[:to] : Pathname.new(options[:to] || '.')
@@ -47,6 +47,8 @@
       @base_path = base
       @path      = Pathname.new(@base_path)
     end
+    layout = (@path + "layouts").children(false).select {|v| v.to_s =~ /^layout/}[0] if (@path + "layouts").directory?
+    @extension = layout.extname if layout
   end
 
   def current?
@@ -98,7 +100,7 @@
     Pathname.glob(File.join(base_path, '*/*')).each do |path|
       next unless path.file?
       @attachments << path
-      (path.extname == '.liquid' ? @templates : @resources) << path
+      ((path.extname == @extension) ? @templates : @resources) << path
     end
     @attachments
   end
diff -Nur mephisto-0.7.3/app/models/user.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/user.rb
--- mephisto-0.7.3/app/models/user.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/user.rb	2008-03-31 02:18:56.000000000 -0400
@@ -6,7 +6,10 @@
 
   # Virtual attribute for the unencrypted password
   attr_accessor :password
-
+  
+  #Only these can be modified through bulk-setters like update_attributes, new, create
+  attr_accessible :login, :email, :password, :password_confirmation, :filter
+  
   validates_presence_of     :login, :email
   validates_format_of       :email, :with => Format::EMAIL
   validates_presence_of     :password,                   :if => :password_required?
diff -Nur mephisto-0.7.3/app/models/user_mailer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/user_mailer.rb
--- mephisto-0.7.3/app/models/user_mailer.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/models/user_mailer.rb	2008-03-31 02:18:56.000000000 -0400
@@ -6,7 +6,7 @@
   def forgot_password(user)
     setup_email(user)
     @subject += 'Request to change your password'
-    @body[:url]  = url_for :controller => :account, :action => :activate, :id => user.token
+    @body[:url]  = url_for :controller => 'account', :action => 'activate', :id => user.token
   end
 
   protected
diff -Nur mephisto-0.7.3/app/views/account/login.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/account/login.rhtml
--- mephisto-0.7.3/app/views/account/login.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/account/login.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 <div class="little-box">
-<% form_tag({:controller=>:account, :action=>:login}, { :id => 'login_form' }) do -%>
+<% form_tag({:controller=>'account', :action=>'login'}, { :id => 'login_form' }) do -%>
   <dl>
     <dt><%= label_tag 'login', 'Login' %></dt>
     <dd><%= text_field_tag 'login', params[:login], :class => 'big' %></dd>
diff -Nur mephisto-0.7.3/app/views/admin/articles/_article.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_article.rhtml
--- mephisto-0.7.3/app/views/admin/articles/_article.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_article.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -5,9 +5,9 @@
     <% if article.comments.size == 0 %>
       none
     <% else %>
-      <%= link_to article.comments.size.to_s.rjust(2, '0'), { :action => 'comments', :id => article } %>
+      <%= link_to article.comments.size.to_s.rjust(2, '0'), article_comments_path(article) %>
     <% end %>
   </td>
   <td><span class="date"><%= published_at_for article %></span></td>
-  <td><%= article.published? ? link_to(image_tag('/images/mephisto/icons/24-zoom-in.png', :style => 'vertical-align: middle'), article.full_permalink) : '&nbsp;' %></td>
+  <td><%= article.published? ? link_to(image_tag('/images/mephisto/icons/24-zoom-in.png', :style => 'vertical-align: middle'), @site.permalink_for(article)) : '&nbsp;' %></td>
 </tr>
diff -Nur mephisto-0.7.3/app/views/admin/articles/_form.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_form.rhtml
--- mephisto-0.7.3/app/views/admin/articles/_form.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_form.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -5,11 +5,11 @@
   <dl>
     <dt><label for="article_title">Title</label></dt>
     <dd><%= form.text_field :title, :class => 'big'  %></dd>
-    <dt id="x-lbl" style="<%= @style %>"><%= form.label_for :excerpt %> <span class="hint">(<%= link_to_function 'Cancel', %(['x-lbl', 'x-body'].each(Element.toggle)) %>)</span></dt>
+    <dt id="x-lbl" style="<%= @style %>"><%= form.label_for :excerpt %> <span class="hint">(<%= link_to_function 'Hide', %(['x-lbl', 'x-body'].each(Element.toggle)) %>)</span></dt>
     <dd id="x-body" style="<%= @style %>"><%= form.text_area :excerpt, :rows => '8', :class => 'fat'  %></dd>
     <dt><label for="article_body">Write your article</label> <span class="hint">(<%= link_to_function 'Add an excerpt', %(['x-lbl', 'x-body'].each(Element.toggle)) %>)</span></dt>
     <dd><%= form.text_area :body, :class => 'fat', :rows => 25  %></dd>
-    <dt><label for="article_tag">Tags</label> <span class="hint">Enter one or more tags separated by a comma.</span></dt>
+    <dt><label for="article_tag">Tags</label> <span class="hint">Enter one or more tags separated by a comma or a space (for example, <em>"Web Dev" Tutorials</em> or <em>Web Dev, Tutorials</em>).</span></dt>
     <dd><%= form.text_field :tag %></dd>
   </dl>
 </div>
@@ -22,7 +22,7 @@
   <dt id="publish-date-lbl"<%= %( style="display:none") unless @article.new_record? || @published -%>><%= label_tag 'article_created_at', 'Publish on this date:' %></dt>
   <dd id="publish-date"<%= %( style="display:none") unless @article.new_record? || @published -%>>
     <%= form.datetime_select :published_at, 
-          :start_year => (@article.published_at || Time.now.utc).year-1, :discard_year => true, :order => [:month, :day, :year] %>
+          :start_year => (@article.published_at || Time.now.utc).year-1, :end_year => (Time.now.utc.year + 5), :order => [:month, :day, :year] %>
   </dd>
 </dl>
 <!-- /end optional fields -->
diff -Nur mephisto-0.7.3/app/views/admin/articles/_page_nav.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_page_nav.rhtml
--- mephisto-0.7.3/app/views/admin/articles/_page_nav.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_page_nav.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -2,13 +2,15 @@
 <% content_for :action_nav do %>
 <div id="page-nav">
   <ul id="act-nav" class="clear">
-  <% if admin? || @article.user_id == current_user.id -%>
-    <li><%= link_to_remote 'Delete this article', :url => {:action => 'destroy', :id => @article}, :confirm => 'Are you sure you want to delete this article?' %></li>
-  <% unless @article.comment_age == -1 -%>
+    <% if controller.controller_name == 'comments' && controller.action_name == 'index' && @comments.size > 0 -%>
+      <li><%= link_to_remote "Delete these #{@filter != 'all' ? @filter : ''} comments", :confirm => "Are you sure you wish to delete all #{@filter != 'all' ? @filter : ''} comments?",
+          :url => { :controller => 'comments', :action => 'destroy', :id => @article }, :with => "ArticleForm.getAvailableComments().toQueryString('comment')"
+        %></li>
+    <% end -%>
+  <% if @article && (admin? || @article.user_id == current_user.id) && @article.comment_age != -1 -%>
     <li id="close-article-comments"><%= link_to_remote 'Close comments for this article', 
       :url => { :controller => 'admin/comments', :action => 'close', :id => @article } %></li>
   <% end -%>
-  <% end -%>
   <% if controller.action_name == 'edit' -%>
     <li><%= link_to('Preview', {:action => 'show', :id => @article}, {:target => '_blank'}) %></li>
   <% end -%>
@@ -16,17 +18,15 @@
       <a class="trigger" id="cog" href="#">&nbsp;</a>
       <div id="optgroup" style="display: none">
         <ul id="options">
-        <% unless @article.new_record? -%>
-          <li><%= link_to 'Edit this article', :action => :edit, :id => @article, :version => nil %></li>
+        <% unless @article.nil? || @article.new_record? -%>
+          <li><%= link_to 'Edit this article', :controller => 'articles', :action => 'edit', :id => @article, :version => nil %></li>
         <% end -%>
-        <% if @article.comments.any? && controller.action_name != 'comments' -%>
-          <li><%= link_to "View comments", :controller => 'articles', :action => 'comments', :id => @article %></li>
+        <% if @article && @article.comments.size > 0 && !(controller.controller_name == 'comments' && controller.action_name == 'index') -%>
+          <li><%= link_to "View comments", :controller => 'comments', :action => 'index', :article_id => @article %></li>
         <% end %>
-        <% if controller.action_name == 'comments' && @comments.any? -%>
-          <li><%= link_to_remote "Delete all #{@filter != 'all' ? @filter : ''} comments", :confirm => "Are you sure you wish to delete all #{@filter != 'all' ? @filter : ''} comments?",
-              :url => { :action => 'destroy_comment', :id => @article }, :with => "ArticleForm.getAvailableComments().toQueryString('comment')"
-            %></li>
-        <% end -%>
+				<% if @article && (admin? || @article.user_id == current_user.id) -%>
+					<li><%= link_to_remote 'Delete this article', :url => article_path(@article), :method => :delete, :confirm => 'Are you sure you want to delete this article?' %></li>
+				<% end -%>
         </ul>
       </div>
     </li>
@@ -38,7 +38,7 @@
     <li><a href="#">&nbsp;</a></li>
   </ul>
   <ul id="attributes">
-    <% unless controller.action_name == 'comments' %>
+    <% if @article && controller.controller_name == 'articles' && controller.action_name == 'edit' -%>
     <li><label for="search">Revision:</label></li>
     <li>
       <select name="filter" id="revisionnum">
@@ -46,15 +46,15 @@
         <%= options_from_collection_for_select @article.versions.reverse, :version, :version, params[:version].to_i %>
       </select>
     </li>
-    <% end %>
-    <% if controller.action_name == 'comments' -%>
+    <% end -%>
+    <% if controller.controller_name == 'comments' && controller.action_name == 'index' -%>
     <li><label for="comments_view">Show comments:</label></li>
     <li>
       <select id="comments-view">
         <%= options_for_select ['All', 'Unapproved', 'Approved'], params[:filter].to_s.humanize %>
       </select>
     </li>
-    <% end %>
+    <% end -%>
   </ul>
 </div>
-<% end unless @article.new_record? && @article.comments.empty? -%>
\ No newline at end of file
+<% end unless @article && @article.new_record? && @article.comments.size == 0 -%>
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/articles/_shared_options.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_shared_options.rhtml
--- mephisto-0.7.3/app/views/admin/articles/_shared_options.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/_shared_options.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -14,6 +14,7 @@
 <div class="sgroup" id="filetabs">
   <ul class="stabs">
     <li id="tab-latest"><a href="#latest-files" class="selected" title="Latest files uploaded">Latest</a></li>
+    <li id="tab-attached"><a href="#attached-files" title="Attached Assets">Attached</a></li>
     <li id="tab-search"><a href="#search-files" title="Search for files">Search</a></li>
     <li id="tab-files"><a href="#upload-files" title="Upload new files">Upload</a></li>
     <li id="tab-bucket"><a href="#bucket" title="Upload new files">Bucket</a></li>
@@ -21,8 +22,13 @@
   
   <div id="tabpanels">
     <div class="tabpanel" id="latest-files">
-      <ul id="latest-assets">
-        <%= render :partial => "admin/assets/widget", :collection => @assets %>
+      <ul id="latest-assets" class="asset-list">
+        <%= render :partial => "admin/assets/widget", :collection => @assets, :locals => { :prefix => 'latest' } %>
+      </ul>
+    </div>
+    <div class="tabpanel" id="attached-files" style="display:none;">
+      <ul id="attached-assets" class="asset-list">
+        <%= render :partial => "admin/assets/widget", :collection => @article.assets, :locals => { :prefix => 'attached' } %>
       </ul>
     </div>
     <div class="tabpanel" id="search-files" style="display:none;">
@@ -32,7 +38,7 @@
       </label>
       <input class="searchbox" type="text" size="30" name="q" id="search-files-q" />
       <input type="button" value="Search" onclick="TinyTab.callbacks['search-files']($F('search-files-q'))" />
-      <ul id="search-assets"></ul>
+      <ul id="search-assets" class="asset-list"></ul>
     </div>
     <div class="tabpanel" id="upload-files" style="display:none;">
       <p>
@@ -42,12 +48,8 @@
       <p><strong>2.</strong> <input type="button" value="Upload" onclick="Asset.upload('article-form');" /></p>
     </div>
     <div class="tabpanel" id="bucket" style="display:none;">
-      <ul id="bucket-assets">
-        <% session[:bucket].each do |filename, values| -%>
-        <li>
-          <%= link_to(image_tag(*values), filename, :target => '_blank') %>
-        </li>
-        <% end unless session[:bucket].blank? %>
+      <ul id="bucket-assets" class="asset-list">
+        <%= render :partial => "admin/assets/widget", :collection => @bucket_assets, :locals => { :prefix => 'bucket' } %>
       </ul>
     </div>
   </div>
diff -Nur mephisto-0.7.3/app/views/admin/articles/approve.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/approve.rjs
--- mephisto-0.7.3/app/views/admin/articles/approve.rjs	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/approve.rjs	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-page["comment-#{@comment.id}"].add_class_name 'disabled'
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/articles/attach.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/attach.rjs
--- mephisto-0.7.3/app/views/admin/articles/attach.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/attach.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.insert_html :bottom, 'attached-assets', :partial => 'admin/assets/widget', :object => @asset, :locals => { :prefix => 'attached' }
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/articles/comments.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/comments.rhtml
--- mephisto-0.7.3/app/views/admin/articles/comments.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/comments.rhtml	1969-12-31 19:00:00.000000000 -0500
@@ -1,57 +0,0 @@
-<%= render :partial => "page_nav" %>
-
-
-<h3 style="border-bottom:1px solid #ccc;padding:5px">Comments on <%= link_to @article.title, { :action => 'edit', :id => @article }, :style => 'border:none' %> <span class="right"><%= @article.published? ? link_to(image_tag('/images/mephisto/icons/24-zoom-in.png', :style => 'vertical-align: middle'), @article.full_permalink, :style => 'border:none;') : '&nbsp;' %></span></h3>
-
-<ul class="pagelist commentlist">
-  <% if @comments.any? %>
-  <% @comments.reverse.each_with_index do |comment, i| -%>
-  <li class="event-comment<%= " shade" if (i % 2 > 0) %>" id="comment-<%= comment.id %>">
-    <% if false %>
-    <input type="checkbox" title="" />
-    <% end %>
-    <a name="comment-<%= comment.id %>"></a> 
-    <% unless comment.body.blank? -%>
-    <blockquote><p>"<%= strip_tags(comment.body) %>"</p></blockquote>
-    <% end -%>
-    <span class="meta">
-      <cite>&mdash; <%= author_link_for comment %><%= %( (#{comment.author_email})) unless comment.author_email.blank? %> said <%=  time_ago_in_words comment.created_at %> ago</cite>
-      
-    <% if comment.approved? -%>
-      <%= link_to_remote 'Unapprove', :url => { :action => 'unapprove',       :id => @article, :comment => comment } %> | 
-    <% else -%>
-      <%= link_to_remote 'Approve',   :url => { :action => 'approve',         :id => @article, :comment => comment } %> | 
-    <% end -%>
-      <%= link_to_remote 'Delete',    :url => { :action => 'destroy_comment', :id => @article, :comment => comment } %>
-    </span>
-  </li>
-  <% end -%>
-  <% else %>
-    <li class="event-none shade">This article has no <%= params[:filter].to_s.humanize.downcase %> comments.</li>
-  <% end %>
-</ul>
-
-
-<% content_for :sidebar do %>
-  <% if @articles.size > 1 -%>
-  <div class="sgroup">
-    <h3>Comments awaiting your approval</h3>
-    <ul class="slist">
-    <% @articles.each do |article, count| -%>
-    <% if article.title != @article.title -%>
-      <li><%= link_to "<strong>(#{count})</strong> #{h(article.title)}", :controller => 'articles', :action => 'comments', :id => article.id, :filter => :unapproved %></li>
-    <% end -%>
-    <% end -%>
-    </ul>
-  </div>
-  <% end -%>
-<% end %>
-
-
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
-  var comment = $(document.location.hash.substring(1));
-  if(comment) Element.addClassName(comment, 'focused');
-  
-// ]]>
-</script>
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/articles/destroy_comment.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/destroy_comment.rjs
--- mephisto-0.7.3/app/views/admin/articles/destroy_comment.rjs	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/destroy_comment.rjs	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-@comments.each do |comment|
-  page["comment-#{comment.id}"].add_class_name 'disabled'
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/articles/edit.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/edit.rhtml
--- mephisto-0.7.3/app/views/admin/articles/edit.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/edit.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -1,23 +1,24 @@
 <%= render :partial => "page_nav" %>
 
 <% fields_for :article, @version do |f| -%>
-<% content_for :sidebar do %>
-  <%= render :partial => 'shared_options', :locals => { :form => f } %>
-<% end %>
+  <% content_for :sidebar do %>
+    <%= render :partial => 'shared_options', :locals => { :form => f } %>
+  <% end %>
 <% end %>
 
 <%= error_messages_for :article %>
 
 <% content_for :form do -%>
-  <%= form_tag({:action => 'update', :id => @article}, {:id => 'article-form', :multipart => true}) %>
+  <%= form_tag({:action => 'update', :id => @article}, {:id => 'article-form', :multipart => true, :method => :put}) %>
 <% end -%>
 
 <% fields_for :article, @version do |f| -%>
-<%= render :partial => 'form', :object => f %>
-<p class="btns">
-  <%= submit_tag 'Apply Changes' %>
-  <%= submit_tag 'Save without Revision' %>
-  <%= link_to "cancel", :controller => "articles" %></p>
+  <%= render :partial => 'form', :object => f %>
+  <p class="btns">
+    <%= submit_tag 'Apply Changes' %>
+    <%= submit_tag 'Save without Revision' %>
+    <%= link_to "cancel", :controller => "articles" %>
+  </p>
 <% end -%>
 
 
diff -Nur mephisto-0.7.3/app/views/admin/articles/index.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/index.rhtml
--- mephisto-0.7.3/app/views/admin/articles/index.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/index.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -36,7 +36,12 @@
 </div>
 <% end %>
 
-<% if @articles.any? %>
+<% if @articles.size > 0 -%>
+
+<% content_tag :p, :class => 'total' do %>
+  Total: <%= content_tag :strong, @articles.total_entries %> articles.
+<% end %>
+
 <!-- begin article list -->
 <table id="article-list" cellspacing="0" cellpadding="0">
   <thead>
@@ -54,13 +59,10 @@
 </table>
 <!-- /end article list -->
 
-
 <!-- begin pagination -->
-<div id="pagination">
-<% if @article_pages.page_count > 1 -%>
-Pages: <strong><%= pagination_links @article_pages, :params => { :action => :index } %></strong>
+<% if @articles.page_count > 1 -%>
+  <%= will_paginate @articles, :id => 'pagination' %>
 <% end -%>
-</div>
 <!-- /end pagination -->
 
 <% else %>
@@ -79,7 +81,7 @@
     <h3>Comments awaiting your approval</h3>
     <ul class="slist">
     <% @comments.each do |article, count| -%>
-      <li><%= link_to "<strong>(#{count})</strong> #{h(article.title)}", :controller => 'articles', :action => 'comments', :id => article.id, :filter => :unapproved %></li>
+      <li><%= link_to "<strong>(#{count})</strong> #{h(article.title)}", article_comments_path(article), :filter => :unapproved %></li>
     <% end -%>
     </ul>
   </div>
diff -Nur mephisto-0.7.3/app/views/admin/articles/label.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/label.rjs
--- mephisto-0.7.3/app/views/admin/articles/label.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/articles/label.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page["label-attached-widget-#{params[:version]}"].replace_html "Save"
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/assets/_assets.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/_assets.rhtml
--- mephisto-0.7.3/app/views/admin/assets/_assets.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/_assets.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -27,8 +27,6 @@
     <div class="empty" style="margin: 20px;">You have no files of this type or have yet to upload any files. <%= link_to 'Upload one now &raquo;', :action => 'new' %></div>
   <% end %>
 
-<% if @asset_pages.page_count > 1 %>
-  <div id="pagination">
-    Pages: <strong><%= pagination_remote_links @asset_pages, :params => { :action => :index } %></strong>
-  </div>
-<% end %>
\ No newline at end of file
+<% if @assets.page_count > 1 %>
+  <%= will_paginate @assets, :id => 'pagination' %>
+<% end %>
diff -Nur mephisto-0.7.3/app/views/admin/assets/_widget.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/_widget.rhtml
--- mephisto-0.7.3/app/views/admin/assets/_widget.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/_widget.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -1,3 +1,18 @@
-<li id="<%= widget.dom_id(:widget) %>">
+<li id="<%= widget.dom_id("#{prefix}-widget") %>" class="widget<%= ' selected-widget' if @article && @article.assets.include?(widget) %>">
+<% if prefix == 'attached' -%>
+  <div>
+    <%= link_to asset_image_for(widget), widget.public_filename %>
+    <span>
+      <%= text_field_tag :version, (widget.respond_to?(:label) ? widget.label : nil), :id => widget.dom_id("#{prefix}-widget-version"), :class => 'txt' %>
+      <a href="#" class="label-widget" id="<%= widget.dom_id("label-#{prefix}-widget") %>">Save</a>
+    </span>
+  </div>
+<% else -%>
   <%= link_to asset_image_for(widget), widget.public_filename %>
-</li>
\ No newline at end of file
+<% end -%>
+  <a href="#"><%= image_tag('mephisto/icons/8-em-cross.png', :size => '16x16', :id => widget.dom_id("detach-#{prefix}-widget"), 
+        :style => 'display:none', :class => 'detach-widget') %></a>
+  <a href="#"><%= image_tag('mephisto/icons/8-em-plus.png', :size => '16x16', :id => widget.dom_id("attach-#{prefix}-widget"), 
+        :style => 'display:none', :class => 'attach-widget') %></a>
+</li>
+<% if widget_counter.remainder(4).zero? && widget_counter > 0 %><br /><% end %>
diff -Nur mephisto-0.7.3/app/views/admin/assets/edit.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/edit.rhtml
--- mephisto-0.7.3/app/views/admin/assets/edit.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/edit.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -6,7 +6,7 @@
 
   <%= error_messages_for :asset %>
   <dl class="group">
-    <dt><label for="asset_tag">Tags</label> <span class="hint">Enter one or more tags separated by a comma.</span></dt>
+    <dt><label for="asset_tag">Tags</label> <span class="hint">Enter one or more tags separated by a comma or a space (for example, <em>"Web Dev" Tutorials</em> or <em>Web Dev, Tutorials</em>).</span></dt>
     <dd><%= f.text_field :tag %></dd>
     <dt><label for="asset_uploaded_data">Select a file</label></dt>
     <dd><%= f.file_field :uploaded_data %></dd>
diff -Nur mephisto-0.7.3/app/views/admin/assets/index.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/index.rhtml
--- mephisto-0.7.3/app/views/admin/assets/index.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/assets/index.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -43,7 +43,7 @@
     <ul id="assets">
       <% session[:bucket].each do |filename, values| -%>
       <li>
-        <%= link_to(image_tag(*values), filename, :target => '_blank') %>
+        <%= image_tag(*values) %>
       </li>
       <% end unless session[:bucket].blank? %>
     </ul>
@@ -55,4 +55,4 @@
       <strong><%= number_to_human_size site.assets.sum(:size) %></strong>.
     </p>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff -Nur mephisto-0.7.3/app/views/admin/cached_pages/pages.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/cached_pages/pages.rhtml
--- mephisto-0.7.3/app/views/admin/cached_pages/pages.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/cached_pages/pages.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -1,34 +1,23 @@
-<% if @cached_pages.size > 0 -%>
-<!-- begin cached pages list -->
-<div class="pages">
-<% if @cached_page_pages.page_count > 1 %>
-Pages: <strong><%= pagination_remote_links @cached_page_pages, :params => { :action => :index } %></strong>
-<% end %>
-</div>
-<h2>Cached Pages</h2><br/>
-<table id="cached-pages" cellspacing="0" cellpadding="0">
-  <thead>
-    <tr>
-      <th scope="col" class="small-col">&nbsp;</th>
-      <th scope="col">URL</th>
-      <th scope="col">Date</th>
-      <th scope="col">Actions</th>
-    </tr>
-  </thead>
+<% unless @cached_pages.empty? -%>
+  <%= will_paginate @cached_pages, :class => 'pages' if @cached_pages.page_count > 1 %>
+  <!-- begin cached pages list -->
+  <h2>Cached Pages</h2><br/>
+  <table id="cached-pages" cellspacing="0" cellpadding="0">
+    <thead>
+      <tr>
+        <th scope="col" class="small-col">&nbsp;</th>
+        <th scope="col">URL</th>
+        <th scope="col">Date</th>
+        <th scope="col">Actions</th>
+      </tr>
+    </thead>
 
-  <tbody id="pages">
-    <%= render :partial => 'page', :collection => @cached_pages %>
-  </tbody>
-</table>
-<!-- /end cached pages list -->
+    <tbody id="pages">
+      <%= render :partial => 'page', :collection => @cached_pages %>
+    </tbody>
+  </table>
+  <!-- /end cached pages list -->
+  <%= will_paginate @cached_pages, :id => 'pagination' if @cached_pages.page_count > 1 %>
 <% else -%>
   <div class="empty">There currently aren't any pages being cached by Mephisto.</div>
-<% end -%>
-
-<!-- begin pagination -->
-<div id="pagination">
-<% if @cached_page_pages.page_count > 1 %>
-Pages: <strong><%= pagination_links @cached_page_pages, :params => { :action => :index } %></strong>
-<% end %>
-</div>
-<!-- /end pagination -->
\ No newline at end of file
+<% end -%>
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/comments/_comment.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_comment.rhtml
--- mephisto-0.7.3/app/views/admin/comments/_comment.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_comment.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+
+  <li class="event-comment<%= cycle(" shade", "") %>" id="comment-<%= comment.id %>">
+    <h3><a name="comment-<%= comment.id %>"></a> <%= link_to comment.article.title, :controller => 'articles', :action => 'edit', :id => comment.article %></h3>
+    <blockquote><p>"<%= truncate strip_tags(comment.body), 255 %>"</p></blockquote>
+    <span class="meta">
+      <cite>&mdash; <%= author_link_for comment %><%= %( (#{comment.author_email})) unless comment.author_email.blank? %></cite>
+
+    <%= link_to_remote 'Edit', :url => edit_article_comment_path(@article, comment), :method => :get %> |    
+    <% if comment.approved? -%>
+      <%= link_to_remote 'Unapprove', :url => unapprove_article_comment_path(comment.article, comment) %> | 
+    <% else -%>
+      <%= link_to_remote 'Approve',   :url => approve_article_comment_path(comment.article, comment) %> | 
+    <% end -%>
+      <%= link_to_remote 'Delete',    :url => article_comment_path(comment.article, comment), :method => :delete %>
+    </span>
+  </li>
diff -Nur mephisto-0.7.3/app/views/admin/comments/_edit_comment.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_edit_comment.rhtml
--- mephisto-0.7.3/app/views/admin/comments/_edit_comment.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_edit_comment.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+<li id="edit-comment-<%= comment.id %>">
+  <%= error_messages_for :comment %>
+  <% remote_form_for :comment, :url => article_comment_path(@article, comment), :html => { :method => :put, :onsubmit => "$('comment-#{comment.id}-spinner').show()" } do |form| %>
+    <%= render :partial => 'form', :object => form %>
+    <%= submit_tag "Update" %>
+    <span style="display:none;" id="comment-<%= comment.id %>-spinner"><img src="/images/mephisto/spinner.gif" /> Saving..</span>
+    <%= link_to_function "Cancel", "$('comment-#{comment.id}').show(); $('edit-comment-#{comment.id}').remove()" %>
+  <% end # form %>
+</li>
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/comments/_form.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_form.rhtml
--- mephisto-0.7.3/app/views/admin/comments/_form.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_form.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+  <p>
+    <label for="author">Name (required)</label>
+    <%= form.text_field :author %>
+  </p>
+  <p>
+    <label for="email">Mail (will not be published</label>
+    <%= form.text_field :author_email %>
+  </p>
+  <p>
+    <label for="url">Website</label>
+    <%= form.text_field :author_url %>
+  </p>
+  <p>
+    <%= form.text_area :body, { :rows => '10' } %>
+  </p>
+
diff -Nur mephisto-0.7.3/app/views/admin/comments/_new_comment.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_new_comment.rhtml
--- mephisto-0.7.3/app/views/admin/comments/_new_comment.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/_new_comment.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+  <%= error_messages_for :comment %>
+  <% remote_form_for :comment, :url => article_comments_path(@article) do |form| %>
+    <%= render :partial => 'form', :object => form %>
+    <%= submit_tag "Create" %> or <%= link_to_function "hide", "$('new-comment-form').toggle()" %>
+  <% end # form %>
diff -Nur mephisto-0.7.3/app/views/admin/comments/approve.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/approve.rjs
--- mephisto-0.7.3/app/views/admin/comments/approve.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/approve.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page["comment-#{@comment.id}"].add_class_name 'disabled'
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/comments/create.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/create.rjs
--- mephisto-0.7.3/app/views/admin/comments/create.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/create.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+  if @comment.new_record?
+    page.replace_html 'new-comment-form', :partial => 'new_comment'
+  else
+    page['new-comment-form'].reset
+    page.insert_html :top, 'comment-list', :partial => 'comment', :object => @comment
+  end
diff -Nur mephisto-0.7.3/app/views/admin/comments/destroy.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/destroy.rjs
--- mephisto-0.7.3/app/views/admin/comments/destroy.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/destroy.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+@comments.each do |comment|
+  page["comment-#{comment.id}"].add_class_name 'disabled'
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/comments/edit.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/edit.rjs
--- mephisto-0.7.3/app/views/admin/comments/edit.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/edit.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+  page.insert_html :after, "comment-#{@comment.id}", :partial => 'edit_comment', :locals => { :comment => @comment }
+  page.hide "comment-#{@comment.id}"
diff -Nur mephisto-0.7.3/app/views/admin/comments/index.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/index.rhtml
--- mephisto-0.7.3/app/views/admin/comments/index.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/index.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -1,33 +1,65 @@
-<% content_for :action_nav do %>
-<!-- begin action nav -->
-<div id="page-nav">
-  <ul id="act-nav" class="clear">
-    <li><%= link_to_remote 'Delete these comments', :confirm => "Are you sure you wish to delete all of these comments?",
-        :url  => { :controller => 'articles', :action => 'destroy_comment' }, 
-        :with => "ArticleForm.getAvailableComments().toQueryString('comment')"
-      %></li>
-  </ul>
-</div>
-<!-- /end action nav -->
-<% end %>
+<%= render :partial => "admin/articles/page_nav" %>
+
+<h3 style="border-bottom:1px solid #ccc;padding:5px">
+<% if @article -%>
+Comments on <%= link_to @article.title, edit_article_path(@article), :style => 'border:none' %> <span class="right"><%= @article.published? ? link_to(image_tag('/images/mephisto/icons/24-zoom-in.png', :style => 'vertical-align: middle'), @site.permalink_for(@article), :style => 'border:none;') : '&nbsp;' %></span>
+<% else -%>
+Comments for all articles
+<% end -%>
+</h3>
 
-<h3><%= pluralize(@comments.size, 'Unapproved Comment') %></h3>
+<% if @article -%>
+  <%= link_to_function "New comment", "$('new-comment-form').toggle()" %>
+  <div id="new-comment-form" style="display:none"><%= render :partial => "new_comment" %></div>
+<% end -%>
 
-<ul class="pagelist commentlist">
-  <% @comments.reverse.each_with_index do |comment, i| -%>
-  <li class="event-comment<%= " shade" if (i % 2 > 0) %>" id="comment-<%= comment.id %>">
-    <h3><a name="comment-<%= comment.id %>"></a> <%= link_to comment.article.title, :controller => 'articles', :action => :edit, :id => comment.article %></h3>
-    <blockquote><p>"<%= truncate strip_tags(comment.body), 255 %>"</p></blockquote>
+<ul class="pagelist commentlist" id="comment-list">
+  <% if @comments.any? %>
+  <% @comments.reverse.each do |comment| -%>
+  <li class="event-comment<%= cycle("", " shade") %>" id="comment-<%= comment.id %>">
+    <a name="comment-<%= comment.id %>"></a> 
+    <% unless comment.body.blank? -%>
+    <blockquote><p>"<%= strip_tags(comment.body) %>"</p></blockquote>
+    <% end -%>
     <span class="meta">
-      <cite>&mdash; <%= author_link_for comment %><%= %( (#{comment.author_email})) unless comment.author_email.blank? %></cite>
-      
+      <cite>&mdash; <%= author_link_for comment %><%= %( (#{comment.author_email})) unless comment.author_email.blank? %> said <%=  time_ago_in_words comment.created_at %> ago</cite>
+    
+    <%= link_to_remote 'Edit', :url => edit_article_comment_path(comment.article, comment), :method => :get %> |
     <% if comment.approved? -%>
-      <%= link_to_remote 'Unapprove', :url => { :action => 'unapprove', :controller => 'articles', :id => comment.article, :comment => comment } %> | 
+      <%= link_to_remote 'Unapprove', :url => unapprove_article_comment_path(comment.article, comment) %> | 
     <% else -%>
-      <%= link_to_remote 'Approve',   :url => { :action => 'approve', :controller => 'articles', :id => comment.article, :comment => comment } %> | 
+      <%= link_to_remote 'Approve',   :url => approve_article_comment_path(comment.article, comment) %> | 
     <% end -%>
-      <%= link_to_remote 'Delete',    :url => { :action => 'destroy_comment', :controller => 'articles', :id => comment.article, :comment => comment } %>
+    <%= link_to_remote 'Delete',    :url => article_comment_path(comment.article, comment), :method => :delete %>
     </span>
   </li>
   <% end -%>
+  <% else %>
+    <li class="event-none shade">This article has no <%= params[:filter].to_s.humanize.downcase %> comments.</li>
+  <% end %>
 </ul>
+
+
+<% content_for :sidebar do %>
+  <% if @articles.size > 1 -%>
+  <div class="sgroup">
+    <h3>Comments awaiting your approval</h3>
+    <ul class="slist">
+    <% @articles.each do |article, count| -%>
+    <% if @article.nil? || article.title != @article.title -%>
+      <li><%= link_to "<strong>(#{count})</strong> #{h(article.title)}", :controller => 'comments', :action => 'index', :article_id => article.id, :filter => :unapproved %></li>
+    <% end -%>
+    <% end -%>
+    </ul>
+  </div>
+  <% end -%>
+<% end %>
+
+
+<script type="text/javascript" language="javascript" charset="utf-8">
+// <![CDATA[
+  var comment = $(document.location.hash.substring(1));
+  if(comment) Element.addClassName(comment, 'focused');
+  
+// ]]>
+</script>
diff -Nur mephisto-0.7.3/app/views/admin/comments/unapproved.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/unapproved.rhtml
--- mephisto-0.7.3/app/views/admin/comments/unapproved.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/unapproved.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+<% content_for :action_nav do %>
+<!-- begin action nav -->
+<div id="page-nav">
+  <ul id="act-nav" class="clear">
+    <li><%= link_to_remote 'Delete these comments', :confirm => "Are you sure you wish to delete all of these comments?",
+        :url  => { :controller => 'articles', :action => 'destroy_comment' }, 
+        :with => "ArticleForm.getAvailableComments().toQueryString('comment')"
+      %></li>
+  </ul>
+</div>
+<!-- /end action nav -->
+<% end %>
+
+<h3><%= pluralize(@comments.size, 'Unapproved Comment') %></h3>
+
+<ul class="pagelist commentlist">
+  <% @comments.reverse.each_with_index do |comment, i| -%>
+    <%= render :partial => 'comment', :object => comment %>
+  <% end -%>
+</ul>
diff -Nur mephisto-0.7.3/app/views/admin/comments/update.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/update.rjs
--- mephisto-0.7.3/app/views/admin/comments/update.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/comments/update.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+
+  page.replace "comment-#{@comment.id}", :partial => 'comment', :object => @comment
+  page.remove "edit-comment-#{@comment.id}"
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/design/_sidebar.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/design/_sidebar.rhtml
--- mephisto-0.7.3/app/views/admin/design/_sidebar.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/design/_sidebar.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -3,10 +3,10 @@
 <p>Modify a template by selecting it from the list below.  Add a new layout by creating a Liquid template with an 
   *_layout suffix (e.g custom_layout).</p>
 <ul id="attachments">
-  <% @theme.templates.template_types.each do |template| -%>
+  <% @theme.templates.template_types(@theme.extension).each do |template| -%>
     <li><%= link_to template, url_for_theme(:controller => 'templates', :action => 'edit', :filename => template) %></li>
   <% end -%>
-  <% @theme.templates.custom.each_with_index do |template, i| -%>
+  <% @theme.templates.custom(@theme.extension).each_with_index do |template, i| -%>
     <li id="templates-<%= i %>">
       <%= delete_link :templates, template, "templates-#{i}" %>
       <%= link_to template, url_for_theme(:controller => 'templates', :action => 'edit', :filename => template) %>
diff -Nur mephisto-0.7.3/app/views/admin/overview/_comment_event.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/overview/_comment_event.rhtml
--- mephisto-0.7.3/app/views/admin/overview/_comment_event.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/overview/_comment_event.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -1,14 +1,22 @@
 <% with_options :controller => 'articles', :id => event.article_id do |article| -%>
 <li id="event-<%= event.id %>" class="event-comment<%= " shade" if shaded %>">
-  <%= link_to event.article.title, :controller => 'articles', :action => 'comments', :id => event.article_id, :anchor => "comment-#{event.comment_id}" %> received a comment.
+  <div id="comment-<%= event.comment_id %>">
+    <%= link_to event.article.title, :controller => 'articles', :action => 'comments', :id => event.article_id, :anchor => "comment-#{event.comment_id}" %> received a comment.
   
-  <span class="event-time"><%= event_time_for event, later %></span>
-  <% unless event.body.blank? -%>
-  <blockquote><p>&quot;<%= truncate strip_tags(event.body), 100 %>&quot;</p></blockquote>
-  <% end -%>
-  <span class="meta">
-    &mdash; <%=h event.author %>
-  </span>
-
+    <span class="event-time"><%= event_time_for event, later %></span>
+    <% unless event.body.blank? -%>
+    <blockquote><p>&quot;<%= truncate strip_tags(event.body), 100 %>&quot;</p></blockquote>
+    <% end -%>
+    <span class="meta">&mdash; <%=h event.author %></span>
+ 
+    <% if event.comment -%>
+      <% if event.comment.approved? -%>
+        <%= link_to_remote 'Unapprove', :url => unapprove_article_comment_path(event.article_id, event.comment_id) %> | 
+      <% else -%>
+        <%= link_to_remote 'Approve',   :url => approve_article_comment_path(event.article_id, event.comment_id) %> | 
+      <% end -%>
+      <%= link_to_remote 'Delete',    :url => article_comment_path(event.article_id, event.comment_id), :method => :delete %>
+    <% end -%>
+  </div>
 </li>
 <% end -%>
diff -Nur mephisto-0.7.3/app/views/admin/overview/index.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/overview/index.rhtml
--- mephisto-0.7.3/app/views/admin/overview/index.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/overview/index.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -9,7 +9,7 @@
     <li><%= link_to "Upload asset", new_asset_path %></li>
     
   <% if @articles.any? -%>
-    <li><%= link_to "Moderate Comments",  :controller => 'comments' %></li>
+    <li><%= link_to "Moderate Comments", moderate_path %></li>
   <% end -%>
   </ul>
 </div>
diff -Nur mephisto-0.7.3/app/views/admin/plugins/_plugin.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/plugins/_plugin.rhtml
--- mephisto-0.7.3/app/views/admin/plugins/_plugin.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/plugins/_plugin.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+<tr class="published" >
+  <td class="published">
+	<% if plugin.configurable? -%>
+		<%= link_to plugin.mephisto_name, :action => 'show', :id => plugin.name %>
+	<% else -%>
+		<%=h plugin.mephisto_name %>
+	<% end -%>
+</td>
+  <td  class="published"><%= plugin.configurable? ? link_to(image_tag('/images/mephisto/icons/8-em-check.png', :style => 'vertical-align: middle'), :action => "show", :id => plugin.name) : '&nbsp;' %></span> </td>
+ </tr>
diff -Nur mephisto-0.7.3/app/views/admin/plugins/index.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/plugins/index.rhtml
--- mephisto-0.7.3/app/views/admin/plugins/index.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/plugins/index.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+<% if @plugins.size > 0 -%>
+	<!-- begin plugin list -->
+	<table id="article-list" cellspacing="0" cellpadding="0" align="center" width="75%">
+	 <thead>
+	   <tr>
+	     <th scope="col">Plugin</th>
+	     <th scope="col">Configurable?</th>
+	     <th scope="col">&nbsp;</th>
+	   </tr>
+	 </thead>
+	 <tbody id="plugins">
+	     <%= render :partial => 'plugin', :collection => @plugins -%>
+	 </tbody>
+	</table>
+<!-- /end plugin list -->
+<% end %>
+
+<% content_for :action_nav do %>
+<!-- begin action nav -->
+<div id="page-nav">
+  <ul id="act-nav" class="clear">
+  </ul>
+</div>
+<!-- /end action nav -->
+<% end -%>
+
+<% content_for :sidebar do %>
+<div class="sgroup">
+Configurable plugins may include modifiable properties, notes, homepage, author, and version information.
+</div>
+<% end %>
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/plugins/show.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/plugins/show.rhtml
--- mephisto-0.7.3/app/views/admin/plugins/show.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/plugins/show.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,54 @@
+
+<% content_for :sidebar do %>
+<div class="sgroup">
+	<h3>Errata</h3>
+	<% unless @plugin.notes.blank? -%>
+		<p><b>Notes</b>:</p>
+		<p> <%= simple_format @plugin.notes %> </p>
+		<br/>
+	<% end %>
+	<% unless @plugin.author.blank? -%>
+		<p><b>Author</b>: <%=h @plugin.author %></p>
+	<% end -%>
+	<% unless @plugin.homepage.blank? -%>
+		<p><b>Homepage</b>:	<a href="<%= @plugin.homepage %>"><%= @plugin.homepage %></a> </p>
+	<% end -%>
+	<% unless @plugin.version.blank? -%>
+		<p><b>Ver.</b>: <%= @plugin.version %> </p>
+	<% end -%>
+</div>
+<% end %>
+
+<% content_for :action_nav do %>
+<div id="page-nav">
+  <ul id="act-nav" class="clear">
+	<li>
+ 	 	<%= link_to 'Restore Defaults', :action => 'destroy', :id => @plugin.name %>
+	</li>
+	<li>
+ 	 	<%= link_to 'Index', :action => 'index' %>
+	</li>
+  </ul>
+</div>
+<% end %>
+
+<% content_for :form  do -%>
+	<%= form_tag({:action => 'update', :id => @plugin.name}, {:id => 'plugin-config-form'}) %>
+<% end -%>
+
+<% if @plugin.default_options.any? -%>
+<div class="group">
+	<dl>
+		<dt><label for="plugin_config">Configuration</label></dt>
+			<% @plugin.default_options.keys.each do |key| %>
+				<dd><label for="options_<%= key %>"><%= key.to_s.humanize %></label></dt> <dd> <%= send "#{@plugin.default_options[key]}_tag", "options[#{key}]", @plugin.send(key) %> </dd>
+			<% end %>
+	</dl>
+		
+	<p class="buttons">	
+		<%= submit_tag %> 
+	</p>
+</div>
+<% else -%>
+No configuration listed (perhaps not needed).
+<% end -%>
diff -Nur mephisto-0.7.3/app/views/admin/settings/index.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/settings/index.rhtml
--- mephisto-0.7.3/app/views/admin/settings/index.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/settings/index.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -3,6 +3,7 @@
 <div id="page-nav">
   <ul id="act-nav" class="clear">
     <li><%= link_to "General", '#general' %></li>
+    <li><%= link_to "Spam Prevention", '#spam' %></li>
     <li><%= link_to "Comments", '#spam' %></li>
     <li><%= link_to "Publishing", '#publish' %></li>
     <% if ActionController::Base.perform_caching -%>
@@ -79,16 +80,6 @@
       <label for="site_search_path">Search area url</label>
     </dt>
     <dd><%= f.text_field :search_path %></dd>
-    <% if @layouts.any? -%>
-    <dt>
-      <label for="site_search_layout">Search area layout</label>
-    </dt>
-    <dd>
-      <select name="site[search_layout]">
-        <%= options_from_templates_for_select(@layouts, @site.search_layout) %>
-      </select>
-    </dd>
-    <% end -%>
     <dt>
       <label for="site_tag_path">Tag area url</label>
     </dt>
diff -Nur mephisto-0.7.3/app/views/admin/sites/index.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/sites/index.rhtml
--- mephisto-0.7.3/app/views/admin/sites/index.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/sites/index.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+<% content_for :action_nav do -%>
+<!-- begin action nav -->
+<div id="page-nav">
+  <ul id="act-nav" class="clear">
+    <li><%= link_to "New", :action => "new" %></li>
+  </ul>
+</div>
+<!-- /end action nav -->
+<div id="filter" class="manual">
+  <ul class="clear">
+    <li><a href="#">&nbsp;</a></li>
+  </ul>
+  <% form_tag({:action => 'index'}, :method => 'get') do -%>
+  <ul id="attributes">
+    <li><label>Search: <%= text_field_tag :search_string, params[:search_string] %></label></li>
+    <li><input type="submit" value="Go" /></li>
+  </ul>
+  <% end -%>
+</div>
+<% end %>
+
+<% if @sites.size > 0 %>
+<!-- begin article list -->
+<table id="article-list" cellspacing="0" cellpadding="0">
+  <thead>
+    <tr>
+      <th scope="col">Host</th>
+      <th scope="col">Title</th>
+    </tr>
+  </thead>
+  <tbody id="articles">
+<% @sites.each do |site| -%>
+    <tr>
+      <td><%= link_to(h(site.host), {:action => 'show', :id => site}) %></td>
+      <td><%=h site.title %></td>
+    </tr>
+<% end -%>
+  </tbody>
+</table>
+<!-- /end article list -->
+
+
+<!-- begin pagination -->
+<% if @sites.page_count > 1 -%>
+  <%= will_paginate @sites, :id => 'pagination' %>
+<% end -%>
+<!-- /end pagination -->
+<% end %>
diff -Nur mephisto-0.7.3/app/views/admin/sites/new.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/sites/new.rhtml
--- mephisto-0.7.3/app/views/admin/sites/new.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/sites/new.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+<% content_for :action_nav do -%>
+<!-- begin action nav -->
+<div id="page-nav">
+  <ul id="act-nav" class="clear">
+    <li><%= link_to "Sites", :action => "index" %></li>
+  </ul>
+</div>
+<!-- /end action nav -->
+<% end %>
+
+<div id="general" class="setgroup">
+	<%= error_messages_for :site %>
+  <% form_for :site, :url => {:action => 'create'} do |f| %>
+  <dl class="setform">
+    <dt><label for="site_host">Host</label></dt>
+    <dd><%= f.text_field :host %></dd>
+    <dt><label for="site_title">Website title</label></dt>
+    <dd><%= f.text_field :title %></dd>
+    <dt><label for="site_subtitle">Website subtitle</label></dt>
+    <dd><%= f.text_field :subtitle %></dd>
+    <dt>
+      <label for="site_email">Administrator email</label>
+      <span class="hint">Shown in emails sent from your site</span>
+    </dt>
+    <dd><%= f.text_field :email %></dd>
+  </dl>
+	<p class="btns"><%= submit_tag 'Create new site' %></p>
+	<% end %>
+</div>
diff -Nur mephisto-0.7.3/app/views/admin/sites/show.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/sites/show.rhtml
--- mephisto-0.7.3/app/views/admin/sites/show.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/sites/show.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+<% content_for :action_nav do -%>
+<!-- begin action nav -->
+<div id="page-nav">
+  <ul id="act-nav" class="clear">
+    <li><%= link_to "Sites", :action => "index" %></li>
+  </ul>
+</div>
+<!-- /end action nav -->
+<% end %>
+
+<% form_for :site, :url => { :action => "update", :id => @site } do |f| -%>
+<%= f.error_messages %>
+<div id="general" class="setgroup">
+  <h3><%=h @site.title %> <small>(<%= mail_to @site.email %>)</small></h3>
+  <dl class="setform">
+		<dt><label for="site_host">Host</label></dt>
+		<dd><%= f.text_field :host %></dd>
+    <dt><label>Theme Path</label></dt>
+    <dd><%=h @site.theme_path %></dd>
+		<dt>
+			See and update the <%= link_to 'other site settings.', :controller => 'settings', :action => 'index', :host => @site.host %>
+		</dt>
+  </dl>
+	<p class="btns">
+		<%= f.submit :Save %> or
+		<%= link_to 'Delete', {:action => 'destroy', :id => @site}, :confirm => "Are you sure you wish to delete this site?", :method => :post %>
+	</p>
+</div>
+<% end -%>
diff -Nur mephisto-0.7.3/app/views/admin/templates/edit.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/templates/edit.rhtml
--- mephisto-0.7.3/app/views/admin/templates/edit.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/templates/edit.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,7 @@
     <ul id="act-nav" class="clear">
       <li><%= link_to "New template", url_for_theme(:controller => 'design') %></li>
       <li><%= link_to "Manage themes", :controller => 'themes' %></li>
-    <% if @theme.templates.custom.include?(@tmpl.basename.to_s) -%>
+    <% if @theme.templates.custom(@theme.extension).include?(@tmpl.basename.to_s) -%>
       <li><%= link_to 'Delete this file', url_for_theme(:action => 'remove', :filename => @tmpl.basename), 
                 :confirm => "Are you sure you want to delete #{@tmpl.basename}?\nThis action can't be undone!" %></li>
     <% end -%>
diff -Nur mephisto-0.7.3/app/views/admin/users/_user.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/users/_user.rhtml
--- mephisto-0.7.3/app/views/admin/users/_user.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/users/_user.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -2,11 +2,11 @@
     <%= avatar_for user %>
     <h3><%= link_to user.login, :action => 'show', :id => user %></h3>
     <%= user.email %>
-  <% unless user == current_user -%>
+  <% unless user.admin? || user == current_user -%>
     <p>
       <%= check_box_tag user.dom_id(:user_toggle), user.id,  user.deleted_at.nil?, :onclick => "UserForm.toggle(this);" %>
       <strong><label for="<%= user.dom_id(:user_toggle) %>">Allow this user to login</label></strong>
-    <% if !user.admin? && admin? -%> |
+    <% if admin? -%> |
       <%= check_box_tag user.dom_id(:user_toggle_admin), user.id,  user.site_admin?, :onclick => "UserForm.toggleAdmin(this);" %>
       <strong><label for="<%= user.dom_id(:user_toggle_admin) %>">Site admin?</label></strong>
     <% end -%>
diff -Nur mephisto-0.7.3/app/views/admin/users/admin.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/users/admin.rjs
--- mephisto-0.7.3/app/views/admin/users/admin.rjs	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/users/admin.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -1,2 +1,6 @@
-page.call 'Flash.notice', @membership.admin? ? "#{@user.login} is now an admin." : "#{@user.login}'s admin rights were revoked."
-page["#{@user.dom_id}-progress"].hide
\ No newline at end of file
+if @allowed
+  page.call 'Flash.notice', @membership.admin? ? "#{@user.login} is now an admin." : "#{@user.login}'s admin rights were revoked."
+  page["#{@user.dom_id}-progress"].hide
+else
+  page.call 'Flash.errors', @error || "Had problems saving the record."
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/admin/users/destroy.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/users/destroy.rjs
--- mephisto-0.7.3/app/views/admin/users/destroy.rjs	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/admin/users/destroy.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -1,8 +1,12 @@
-page.call 'Flash.notice', "#{@user.login} was disabled."
-page["#{@user.dom_id}-progress"].hide
-page << 'function foo() {'
-page[@user.dom_id].remove
-page[:disabled_users].show
-page.insert_html :bottom, :disabled_users, :partial => 'user'
-page << '}'
-page[@user.dom_id].visual_effect :drop_out, :afterFinish => ActiveSupport::JSON::Variable.new("foo")
\ No newline at end of file
+if @allowed
+  page.call 'Flash.notice', "#{@user.login} was disabled."
+  page["#{@user.dom_id}-progress"].hide
+  page << 'function foo() {'
+  page[@user.dom_id].remove
+  page[:disabled_users].show
+  page.insert_html :bottom, :disabled_users, :partial => 'user'
+  page << '}'
+  page[@user.dom_id].visual_effect :drop_out, :afterFinish => ActiveSupport::JSON::Variable.new("foo")
+else
+  page.call 'Flash.errors', @error || "Had problems saving the record."
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/feed/_article.rxml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/feed/_article.rxml
--- mephisto-0.7.3/app/views/feed/_article.rxml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/feed/_article.rxml	2008-03-31 02:18:56.000000000 -0400
@@ -8,8 +8,11 @@
   article.sections.each do |section|
     xm.category "term" => section.name unless section.home?
   end
+  article.tags.each do |tag|
+    xm.category "term" => tag.name
+  end
   xm.link "rel" => "alternate", "type" => "text/html", 
-    "href" => "http://#{request.host_with_port}#{request.relative_url_root}#{site.permalink_for(article)}"
+    "href" => "http://#{request.host_with_port}#{request.relative_url_root}#{section_url_for article}"
   xm.title     strip_tags(article.title)
   unless article.excerpt_html.blank?
     xm << %{<summary type="html">#{sanitize_feed_content article.excerpt_html}</summary>}
@@ -19,4 +22,5 @@
             #{sanitize_feed_content [article.excerpt_html, article.body_html].compact * "\n"}
           </content>}
   end
+  article.add_xml(xm)
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/feed/_comment.rxml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/feed/_comment.rxml
--- mephisto-0.7.3/app/views/feed/_comment.rxml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/feed/_comment.rxml	2008-03-31 02:18:56.000000000 -0400
@@ -9,7 +9,7 @@
     xm.category "term" => section.name unless section.home?
   end
   xm.link "rel" => "alternate", "type" => "text/html",
-    "href" => "http://#{request.host_with_port}#{request.relative_url_root}#{site.permalink_for(article)}"
+    "href" => "http://#{request.host_with_port}#{request.relative_url_root}#{section_url_for article}"
   xm.title "Comment on '#{strip_tags(article.title)}' by #{comment.author}"
   xm << %{<content type="html">#{sanitize_feed_content comment.body_html, true}</content>}
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/app/views/layouts/application.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/layouts/application.rhtml
--- mephisto-0.7.3/app/views/layouts/application.rhtml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/layouts/application.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -18,7 +18,11 @@
       <% if admin? -%>
         <li><%= link_to 'Settings', :controller => 'settings' %></li>
       <% end -%>
+			<% if Site.multi_sites_enabled && global_admin? %>
+				<li><%= link_to 'Sites', :controller => '/admin/sites' %></li>
+			<% end %>
         <li><%= link_to 'Account', :controller => 'users', :action => 'show', :id => current_user %></li>
+
         <li><%= link_to 'Logout', :controller => '/account', :action => 'logout' %></li>
       </ul>
 
@@ -31,12 +35,22 @@
             <li><%= link_to 'Overview',  :controller => '/admin/overview' %></li>
             <li><%= link_to 'Articles',  :controller => '/admin/articles' %></li>
             <li><%= link_to 'Assets',    :controller => '/admin/assets' %></li>
+          <% Mephisto::Plugin.tabs.each do |tab| -%>
+            <li><%= link_to tab.first, tab.last %></li>
+          <% end -%>
           </ul>
           <% if admin? -%>
           <ul id="nav-r">
             <li><%= link_to 'Sections', :controller => '/admin/sections' %></li>
             <li><%= link_to 'Design',   :controller => '/admin/design' %></li>
             <li><%= link_to "Users",    :controller => "users" %></li>
+					<% if false -%>
+						hidden because plugins are in for a change
+            <li><%= link_to 'Plugins',  :controller => '/admin/plugins' %></li>
+					<% end -%>
+          <% Mephisto::Plugin.admin_tabs.each do |tab| -%>
+            <li><%= link_to tab.first.to_s.tableize.humanize, tab.last %></li>
+          <% end -%>
           </ul>
           <% end -%>
         <% end -%>
@@ -92,4 +106,4 @@
       </div>
     </div>
   </body>
-</html>
\ No newline at end of file
+</html>
diff -Nur mephisto-0.7.3/app/views/mephisto/_article.rxml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/mephisto/_article.rxml
--- mephisto-0.7.3/app/views/mephisto/_article.rxml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/app/views/mephisto/_article.rxml	2008-03-31 02:18:56.000000000 -0400
@@ -5,6 +5,12 @@
   xm.id        "tag:#{request.host_with_port},#{article.updated_at.to_date.to_s :db}:#{article.id}:#{article.version}"
   xm.published article.published_at.xmlschema if article.published_at
   xm.updated   article.updated_at.xmlschema
+  article.sections.each do |section|
+    xm.category "term" => section.name unless section.home?
+  end if article.respond_to?(:sections)
+  article.tags.each do |tag|
+    xm.category "term" => tag.name
+  end
   xm.link "rel" => "alternate", "type" => "text/html", "href" => "http://#{request.host_with_port}#{site.permalink_for(article)}"
   xm.title     strip_tags(article.title)
   unless article.excerpt_html.blank?
diff -Nur mephisto-0.7.3/config/environment.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/environment.rb
--- mephisto-0.7.3/config/environment.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/environment.rb	2008-03-31 02:18:56.000000000 -0400
@@ -10,16 +10,22 @@
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
+require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
+require File.join(File.dirname(__FILE__), '../lib/mephisto/plugin')
 
 # requires vendor-loaded redcloth
 require 'RedCloth-3.0.4/lib/redcloth' unless Object.const_defined?(:RedCloth)
+
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
   
   # Skip frameworks you're not going to use
-  # config.frameworks -= [ :action_web_service ]
+  config.frameworks -= [ :active_resource ]
 
   config.load_paths += %W( #{RAILS_ROOT}/app/cachers #{RAILS_ROOT}/app/drops #{RAILS_ROOT}/app/filters )
+  
+  # NFI why this is here.  find and eradicate the bug.
+  config.load_paths += %W( #{RAILS_ROOT}/vendor/rails/actionwebservice/lib )
 
   # Force all environments to use the same logger level 
   # (by default production uses :info, the others :debug)
@@ -27,7 +33,8 @@
 
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake create_sessions_table')
-  config.action_controller.session_store = :active_record_store
+  # config.action_controller.session_store = :active_record_store
+  config.action_controller.session = { :session_key => "_mephisto_session", :secret => "bd088a0f5b476fe5a2c02653a93ed14a95a8396829ce4e726ee77553ab6438a98d0f3e6d80fc6b120370ba047f28e09f71543ae5f842365e5070e7db51fb2cb9" }
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
@@ -37,43 +44,5 @@
   config.active_record.schema_format = :ruby
 end
 
-# Include your application configuration below
-require 'mephisto_init'
-
-# Set this if you're running under a sub directory
-# ActionController::AbstractRequest.relative_url_root = '/blog'
-
-# turn this on to get detailed cache sweeper logging in production mode
-# Site.cache_sweeper_tracing = true
-
-# Enable if you want to host multiple sites on this app
-# Site.multi_sites_enabled = true
-
-# shouldn't need to set the host, it's set automatically
-UserMailer.default_url_options[:host] = 'localhost:3000'
-UserMailer.mail_from = 'webmaster@localhost'
-
-# OPTIONAL - Redirections
-# Deny a route by immediately returning a 404
-#
-#   Mephisto::Routing.deny 'articles/trackback/*' # return 404
-#
-# Specify multiple denied routes:
-# 
-#   Mephisto::Routing.deny 'articles/trackback/*', 'monkey/foo/*'
-#
-# Redirect elsewhere.  You can fill in variables marked by ? or * with variable names beginning with :
-#
-# Redirect /old/foo to /new/foo and /old/foo/bar to /new/foo/bar
-#
-#   Mephisto::Routing.redirect 'old/*' => 'new/$1'
-#
-# Redirect with a more specific set of variables
-#
-#   Mephisto::Routing.redirect 'article/?/?/?' => 'new/$2/$1/$3'
-
-# Multiple redirections at a time
-#
-#   Mephisto::Routing.redirect \
-#     'old/*' => 'new/$1',
-#     'article/?/?/?' => 'new/$2/$1/$3'
\ No newline at end of file
+# Don't update this file, make custom tweaks in config/initializers/custom.rb, 
+# or create your own file in config/initializers
\ No newline at end of file
diff -Nur mephisto-0.7.3/config/environments/development.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/environments/development.rb
--- mephisto-0.7.3/config/environments/development.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/environments/development.rb	2008-03-31 02:18:56.000000000 -0400
@@ -8,9 +8,6 @@
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils        = true
 
-# Enable the breakpoint server that script/breakpointer connects to
-config.breakpoint_server = true
-
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
diff -Nur mephisto-0.7.3/config/initializers/custom.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/custom.rb
--- mephisto-0.7.3/config/initializers/custom.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/custom.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,40 @@
+# Set this if you're running under a sub directory
+# ActionController::AbstractRequest.relative_url_root = '/blog'
+
+# turn this on to get detailed cache sweeper logging in production mode
+# Site.cache_sweeper_tracing = true
+
+# Enable if you want to host multiple sites on this app
+# Site.multi_sites_enabled = true
+
+# shouldn't need to set the host, it's set automatically
+UserMailer.default_url_options[:host] = 'localhost:3000'
+UserMailer.mail_from = 'webmaster@localhost'
+
+# defaults to ImageScience, then RMagick, then nothing
+# ASSET_IMAGE_PROCESSOR = :image_science || :rmagick || :none
+
+# OPTIONAL - Redirections
+# Deny a route by immediately returning a 404
+#
+#   Mephisto::Routing.deny 'articles/trackback/*' # return 404
+#
+# Specify multiple denied routes:
+# 
+#   Mephisto::Routing.deny 'articles/trackback/*', 'monkey/foo/*'
+#
+# Redirect elsewhere.  You can fill in variables marked by ? or * with variable names beginning with :
+#
+# Redirect /old/foo to /new/foo and /old/foo/bar to /new/foo/bar
+#
+#   Mephisto::Routing.redirect 'old/*' => 'new/$1'
+#
+# Redirect with a more specific set of variables
+#
+#   Mephisto::Routing.redirect 'article/?/?/?' => 'new/$2/$1/$3'
+
+# Multiple redirections at a time
+#
+#   Mephisto::Routing.redirect \
+#     'old/*' => 'new/$1',
+#     'article/?/?/?' => 'new/$2/$1/$3'
\ No newline at end of file
diff -Nur mephisto-0.7.3/config/initializers/mephisto_init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/mephisto_init.rb
--- mephisto-0.7.3/config/initializers/mephisto_init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/mephisto_init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,44 @@
+# this is for standard library loading and configuration.  All the hardcore monkey patching is in the mephisto plugin.
+require 'tzinfo'
+require 'zip/zipfilesystem'
+require 'action_controller/dispatcher'
+require 'coderay'
+require 'ruby_pants'
+require 'xmlrpc_patch'
+
+ActiveRecord::Base.observers = [:article_observer, :comment_observer]
+
+# temporarily moved to vendor/plugins/aaa/init.rb to make sure
+# it's loaded before all other plugins
+# Object::RAILS_PATH = Pathname.new(File.expand_path(RAILS_ROOT))
+
+require 'mephisto'
+
+class ActionController::Dispatcher
+  def self.register_liquid_tags
+    Mephisto.liquid_filters.each { |mod| Liquid::Template.register_filter mod }
+    Mephisto.liquid_tags.each { |name, klass| Liquid::Template.register_tag name, klass }
+  end
+  
+  def cleanup_application_with_plugins(force = false)
+    returning cleanup_application_without_plugins(force) do
+      self.class.register_liquid_tags
+    end
+  end
+  
+  alias_method_chain :cleanup_application, :plugins
+end
+
+ActionController::Dispatcher.register_liquid_tags
+
+Inflector.inflections do |inflect|
+  #inflect.plural /^(ox)$/i, '\1en'
+  #inflect.singular /^(ox)en/i, '\1'
+  #inflect.irregular 'person', 'people'
+  inflect.uncountable %w( audio )
+end
+
+Engines::Plugin::Config.set_table_name 'mephisto_plugins'
+
+Dependencies.autoloaded_constants.delete "Mephisto"
+Dependencies.autoloaded_constants.delete "Mephisto::Plugin"
diff -Nur mephisto-0.7.3/config/initializers/metaprogramming.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/metaprogramming.rb
--- mephisto-0.7.3/config/initializers/metaprogramming.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/metaprogramming.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+# need to make pathname safe for windows!
+Pathname.class_eval do
+  def read(*args)
+    returning [] do |s|
+      File.open(@path, 'rb') { |f| s << f.read }
+    end.to_s
+  end
+end
+
+Symbol.class_eval do
+  def to_liquid
+    to_s
+  end
+end
+
+# http://rails.techno-weenie.net/tip/2005/12/23/make_fixtures
+ActiveRecord::Base.class_eval do
+  # person.dom_id #-> "person-5"
+  # new_person.dom_id #-> "person-new"
+  # new_person.dom_id(:bare) #-> "new"
+  # person.dom_id(:person_name) #-> "person-name-5"
+  def dom_id(prefix=nil)
+    display_id = new_record? ? "new" : id
+    prefix ||= self.class.name.underscore
+    prefix != :bare ? "#{prefix.to_s.dasherize}-#{display_id}" : display_id
+  end
+
+  # Write a fixture file for testing
+  def self.to_fixture(fixture_path = nil)
+    File.open(File.expand_path(fixture_path || "test/fixtures/#{table_name}.yml", RAILS_ROOT), 'w') do |out|
+      YAML.dump find(:all).inject({}) { |hsh, record| hsh.merge(record.id => record.attributes) }, out
+    end
+  end
+
+  expiring_attr_reader :referenced_cache_key, '"[#{[id, self.class.name] * ":"}]"'
+end
+
+class Object
+  def tap
+    yield self; self;
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/config/initializers/templating.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/templating.rb
--- mephisto-0.7.3/config/initializers/templating.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/templating.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,32 @@
+module Liquid
+  AllowedVariableCharacters = /[a-zA-Z_.-]/ unless Liquid.const_defined?(:AllowedVariableCharacters)
+end
+
+Liquid::For.send :include, Mephisto::Liquid::ForWithSorting
+
+WhiteListHelper.tags.merge %w(table tr td)
+
+class MissingTemplateError < StandardError
+  attr_reader :template_type, :templates
+  def initialize(template_type, templates)
+    @template_type = template_type
+    @templates     = templates
+    super "No template found for #{template_type}, checked #{templates.to_sentence}."
+  end
+end
+
+class MissingThemesError < StandardError
+  attr_reader :site
+  def initialize(site)
+    @site = site
+    super "No themes found in '#{site.theme_path.to_s}/#{site.current_theme_path}'.  This must be set correctly in the site settings."
+  end
+end
+
+class ThemeError < StandardError
+  attr_reader :theme
+  def initialize(theme, message)
+    @theme = theme
+    super message
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/config/initializers/time_hacks.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/time_hacks.rb
--- mephisto-0.7.3/config/initializers/time_hacks.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/time_hacks.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,54 @@
+# Time.now.to_ordinalized_s :long
+# => "February 28th, 2006 21:10"
+module ActiveSupport::CoreExtensions::Time::Conversions
+  def to_ordinalized_s(format = :default)
+    format = ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS[format] 
+    return to_default_s if format.nil?
+    strftime(format.gsub(/%d/, '_%d_')).gsub(/_(\d+)_/) { |s| s.to_i.ordinalize }
+  end
+end
+
+ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.update \
+  :standard  => '%B %d, %Y @ %I:%M %p',
+  :stub      => '%B %d',
+  :time_only => '%I:%M %p',
+  :plain     => '%B %d %I:%M %p',
+  :mdy       => '%B %d, %Y',
+  :my        => '%B %Y'
+
+class Time
+  class << self
+    # Used for getting multifield attributes like those generated by a 
+    # select_datetime into a new Time object. For example if you have 
+    # following <tt>params={:meetup=>{:"time(1i)=>..."}}</tt> just do 
+    # following:
+    #
+    # <tt>Time.parse_from_attributes(params[:meetup], :time)</tt>
+    def parse_from_attributes(attrs, field, method=:gm)
+      attrs = attrs.keys.sort.grep(/^#{field.to_s}\(.+\)$/).map { |k| attrs[k] }
+      attrs.any? ? Time.send(method, *attrs) : nil
+    end
+
+    def delta(year, month = nil, day = nil)
+      from = Time.local(year, month || 1, day || 1)
+      
+      to = 
+        if !day.blank?
+          from.advance :days => 1
+        elsif !month.blank?
+          from.advance :months => 1
+        else
+          from.advance :years => 1
+        end
+      return [from.midnight, to.midnight-1]
+    end
+  end
+
+  def to_delta(delta_type = :day)
+    case delta_type
+      when :year then self.class.delta(year)
+      when :month then self.class.delta(year, month)
+      else self.class.delta(year, month, day)
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/config/initializers/xml_simple_doctype_fix.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/xml_simple_doctype_fix.rb
--- mephisto-0.7.3/config/initializers/xml_simple_doctype_fix.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/config/initializers/xml_simple_doctype_fix.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+# http://tinyurl.com/377j6s
+REXML::Document.class_eval { def doctype() nil end }
\ No newline at end of file
diff -Nur mephisto-0.7.3/db/migrate/033_user_hostile_template_migration.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/033_user_hostile_template_migration.rb
--- mephisto-0.7.3/db/migrate/033_user_hostile_template_migration.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/033_user_hostile_template_migration.rb	2008-03-31 02:18:56.000000000 -0400
@@ -5,7 +5,7 @@
   class DbFile < ActiveRecord::Base; end
   class Attachment < ActiveRecord::Base
     belongs_to :site
-    acts_as_attachment
+    has_attachment
   end
   class Avatar   < Attachment; end
   class Asset    < Attachment; end
diff -Nur mephisto-0.7.3/db/migrate/068_moment_of_silence.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/068_moment_of_silence.rb
--- mephisto-0.7.3/db/migrate/068_moment_of_silence.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/068_moment_of_silence.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+class MomentOfSilence < ActiveRecord::Migration
+  def self.up
+    # makes up for migration #68 in the stable branch, which is the same as #072 on trunk
+  end
+
+  def self.down
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/db/migrate/069_add_mephisto_plugins.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/069_add_mephisto_plugins.rb
--- mephisto-0.7.3/db/migrate/069_add_mephisto_plugins.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/069_add_mephisto_plugins.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+class AddMephistoPlugins < ActiveRecord::Migration
+  def self.up
+    create_table :mephisto_plugins do |t|
+      t.column :name, :string
+      t.column :options, :text
+      t.column :type, :string
+    end
+  end
+
+  def self.down
+    drop_table :mephisto_plugins
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/db/migrate/070_remove_site_search_layout.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/070_remove_site_search_layout.rb
--- mephisto-0.7.3/db/migrate/070_remove_site_search_layout.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/070_remove_site_search_layout.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+class RemoveSiteSearchLayout < ActiveRecord::Migration
+  def self.up
+    remove_column "sites", "search_layout"
+  end
+
+  def self.down
+    add_column "sites", "search_layout",      :string
+  end
+end
diff -Nur mephisto-0.7.3/db/migrate/071_create_assigned_assets.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/071_create_assigned_assets.rb
--- mephisto-0.7.3/db/migrate/071_create_assigned_assets.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/071_create_assigned_assets.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+class CreateAssignedAssets < ActiveRecord::Migration
+  def self.up
+    create_table :assigned_assets do |t|
+      t.column :article_id, :integer
+      t.column :asset_id, :integer
+      t.column :position, :integer
+      t.column :label, :string
+      t.column :created_at, :datetime
+      t.column :active, :boolean
+    end
+    add_column "contents", "assets_count", :integer, :default => 0
+    add_column "content_versions", "assets_count", :integer, :default => 0
+  end
+
+  def self.down
+    drop_table :assigned_assets
+    remove_column "contents", "assets_count"
+    remove_column "content_versions", "assets_count"
+  end
+end
diff -Nur mephisto-0.7.3/db/migrate/072_filter_current_comments.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/072_filter_current_comments.rb
--- mephisto-0.7.3/db/migrate/072_filter_current_comments.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/072_filter_current_comments.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+class FilterCurrentComments < ActiveRecord::Migration
+  def self.up
+    transaction do
+      Comment.find(:all).each do |c|
+        Comment.update_all ['author = ?, author_url = ?, author_email = ?, author_ip = ?, user_agent = ?, referrer = ?', 
+          CGI::escapeHTML(c.author), CGI::escapeHTML(c.author_url), CGI::escapeHTML(c.author_email), CGI::escapeHTML(c.author_ip),
+          CGI::escapeHTML(c.user_agent), CGI::escapeHTML(c.referrer)], ['id = ?', c.id]
+      end
+    end
+  end
+
+  def self.down
+  end
+end
diff -Nur mephisto-0.7.3/db/migrate/073_add_some_indexing_idiot.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/073_add_some_indexing_idiot.rb
--- mephisto-0.7.3/db/migrate/073_add_some_indexing_idiot.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/073_add_some_indexing_idiot.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+class AddSomeIndexingIdiot < ActiveRecord::Migration
+  def self.up
+    return if indexes(:assigned_sections).any? { |idx| idx.name == 'idx_a_sections_article_section' }
+    add_index :assigned_sections, [:article_id, :section_id], :name => :idx_a_sections_article_section
+    add_index :contents, :published_at, :name => :idx_articles_published
+    add_index :contents, [:article_id, :approved, :type], :name => :idx_comments
+  end
+
+  def self.down
+    remove_index :assigned_sections, :name => :idx_a_sections_article_section
+    remove_index :contents, :name => :idx_articles_published
+    remove_index :contents, :name => :idx_comments
+  end
+end
diff -Nur mephisto-0.7.3/db/migrate/074_remove_orphan_comments.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/074_remove_orphan_comments.rb
--- mephisto-0.7.3/db/migrate/074_remove_orphan_comments.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/074_remove_orphan_comments.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+class RemoveOrphanComments < ActiveRecord::Migration
+  def self.up
+    article_ids = select_values("SELECT id FROM contents WHERE type = 'Article'")
+    Comment.delete_all(['article_id NOT IN (?)', article_ids])
+  end
+
+  def self.down
+  end
+end
diff -Nur mephisto-0.7.3/db/migrate/075_drop_session_table.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/075_drop_session_table.rb
--- mephisto-0.7.3/db/migrate/075_drop_session_table.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/migrate/075_drop_session_table.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+class DropSessionTable < ActiveRecord::Migration
+  def self.up
+    remove_index :sessions, :name => :sessions_session_id_index
+    drop_table :sessions
+  end
+
+  def self.down
+    create_table "sessions", :force => true do |t|
+      t.string   "session_id"
+      t.text     "data"
+      t.datetime "updated_at"
+    end
+
+    add_index "sessions", ["session_id"], :name => "sessions_session_id_index"
+  end
+end
diff -Nur mephisto-0.7.3/db/schema.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/schema.rb
--- mephisto-0.7.3/db/schema.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/db/schema.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,183 +1,212 @@
-# This file is autogenerated. Instead of editing this file, please use the
-# migrations feature of ActiveRecord to incrementally modify your database, and
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 67) do
+ActiveRecord::Schema.define(:version => 75) do
 
   create_table "assets", :force => true do |t|
-    t.column "content_type",     :string
-    t.column "filename",         :string
-    t.column "size",             :integer
-    t.column "parent_id",        :integer
-    t.column "thumbnail",        :string
-    t.column "width",            :integer
-    t.column "height",           :integer
-    t.column "site_id",          :integer
-    t.column "created_at",       :datetime
-    t.column "title",            :string
-    t.column "thumbnails_count", :integer,  :default => 0
-    t.column "user_id",          :integer
+    t.string   "content_type"
+    t.string   "filename"
+    t.integer  "size"
+    t.integer  "parent_id"
+    t.string   "thumbnail"
+    t.integer  "width"
+    t.integer  "height"
+    t.integer  "site_id"
+    t.datetime "created_at"
+    t.string   "title"
+    t.integer  "thumbnails_count", :default => 0
+    t.integer  "user_id"
+  end
+
+  create_table "assigned_assets", :force => true do |t|
+    t.integer  "article_id"
+    t.integer  "asset_id"
+    t.integer  "position"
+    t.string   "label"
+    t.datetime "created_at"
+    t.boolean  "active"
   end
 
   create_table "assigned_sections", :force => true do |t|
-    t.column "article_id", :integer
-    t.column "section_id", :integer
-    t.column "position",   :integer, :default => 1
+    t.integer "article_id"
+    t.integer "section_id"
+    t.integer "position",   :default => 1
   end
 
+  add_index "assigned_sections", ["article_id", "section_id"], :name => "idx_a_sections_article_section"
+
   create_table "cached_pages", :force => true do |t|
-    t.column "url",        :string
-    t.column "references", :text
-    t.column "updated_at", :datetime
-    t.column "site_id",    :integer
-    t.column "cleared_at", :datetime
+    t.string   "url"
+    t.text     "references"
+    t.datetime "updated_at"
+    t.integer  "site_id"
+    t.datetime "cleared_at"
   end
 
   create_table "content_versions", :force => true do |t|
-    t.column "content_id",     :integer
-    t.column "version",        :integer
-    t.column "article_id",     :integer
-    t.column "user_id",        :integer
-    t.column "title",          :string
-    t.column "permalink",      :string
-    t.column "excerpt",        :text
-    t.column "body",           :text
-    t.column "excerpt_html",   :text
-    t.column "body_html",      :text
-    t.column "created_at",     :datetime
-    t.column "updated_at",     :datetime
-    t.column "published_at",   :datetime
-    t.column "author",         :string,   :limit => 100
-    t.column "author_url",     :string
-    t.column "author_email",   :string
-    t.column "author_ip",      :string,   :limit => 100
-    t.column "comments_count", :integer,                 :default => 0
-    t.column "updater_id",     :integer
-    t.column "versioned_type", :string,   :limit => 20
-    t.column "site_id",        :integer
-    t.column "approved",       :boolean,                 :default => false
-    t.column "comment_age",    :integer,                 :default => 0
-    t.column "filter",         :string
-    t.column "user_agent",     :string
-    t.column "referrer",       :string
+    t.integer  "content_id"
+    t.integer  "version"
+    t.integer  "article_id"
+    t.integer  "user_id"
+    t.string   "title"
+    t.string   "permalink"
+    t.text     "excerpt"
+    t.text     "body"
+    t.text     "excerpt_html"
+    t.text     "body_html"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "published_at"
+    t.string   "author",         :limit => 100
+    t.string   "author_url"
+    t.string   "author_email"
+    t.string   "author_ip",      :limit => 100
+    t.integer  "comments_count",                :default => 0
+    t.integer  "updater_id"
+    t.string   "versioned_type", :limit => 20
+    t.integer  "site_id"
+    t.boolean  "approved",                      :default => false
+    t.integer  "comment_age",                   :default => 0
+    t.string   "filter"
+    t.string   "user_agent"
+    t.string   "referrer"
+    t.integer  "assets_count",                  :default => 0
   end
 
   create_table "contents", :force => true do |t|
-    t.column "article_id",     :integer
-    t.column "user_id",        :integer
-    t.column "title",          :string
-    t.column "permalink",      :string
-    t.column "excerpt",        :text
-    t.column "body",           :text
-    t.column "excerpt_html",   :text
-    t.column "body_html",      :text
-    t.column "created_at",     :datetime
-    t.column "updated_at",     :datetime
-    t.column "published_at",   :datetime
-    t.column "type",           :string,   :limit => 20
-    t.column "author",         :string,   :limit => 100
-    t.column "author_url",     :string
-    t.column "author_email",   :string
-    t.column "author_ip",      :string,   :limit => 100
-    t.column "comments_count", :integer,                 :default => 0
-    t.column "updater_id",     :integer
-    t.column "version",        :integer
-    t.column "site_id",        :integer
-    t.column "approved",       :boolean,                 :default => false
-    t.column "comment_age",    :integer,                 :default => 0
-    t.column "filter",         :string
-    t.column "user_agent",     :string
-    t.column "referrer",       :string
+    t.integer  "article_id"
+    t.integer  "user_id"
+    t.string   "title"
+    t.string   "permalink"
+    t.text     "excerpt"
+    t.text     "body"
+    t.text     "excerpt_html"
+    t.text     "body_html"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "published_at"
+    t.string   "type",           :limit => 20
+    t.string   "author",         :limit => 100
+    t.string   "author_url"
+    t.string   "author_email"
+    t.string   "author_ip",      :limit => 100
+    t.integer  "comments_count",                :default => 0
+    t.integer  "updater_id"
+    t.integer  "version"
+    t.integer  "site_id"
+    t.boolean  "approved",                      :default => false
+    t.integer  "comment_age",                   :default => 0
+    t.string   "filter"
+    t.string   "user_agent"
+    t.string   "referrer"
+    t.integer  "assets_count",                  :default => 0
   end
 
+  add_index "contents", ["published_at"], :name => "idx_articles_published"
+  add_index "contents", ["article_id", "approved", "type"], :name => "idx_comments"
+
   create_table "events", :force => true do |t|
-    t.column "mode",       :string
-    t.column "user_id",    :integer
-    t.column "article_id", :integer
-    t.column "title",      :text
-    t.column "body",       :text
-    t.column "created_at", :datetime
-    t.column "author",     :string,   :limit => 100
-    t.column "comment_id", :integer
-    t.column "site_id",    :integer
+    t.string   "mode"
+    t.integer  "user_id"
+    t.integer  "article_id"
+    t.text     "title"
+    t.text     "body"
+    t.datetime "created_at"
+    t.string   "author",     :limit => 100
+    t.integer  "comment_id"
+    t.integer  "site_id"
+  end
+
+  create_table "feedbacks", :force => true do |t|
+    t.integer  "site_id"
+    t.string   "name"
+    t.string   "email"
+    t.text     "body"
+    t.string   "key"
+    t.datetime "created_at"
   end
 
   create_table "memberships", :force => true do |t|
-    t.column "site_id",    :integer
-    t.column "user_id",    :integer
-    t.column "created_at", :datetime
-    t.column "admin",      :boolean,  :default => false
+    t.integer  "site_id"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.boolean  "admin",      :default => false
   end
 
-  create_table "sections", :force => true do |t|
-    t.column "name",                :string
-    t.column "show_paged_articles", :boolean, :default => false
-    t.column "articles_per_page",   :integer, :default => 15
-    t.column "layout",              :string
-    t.column "template",            :string
-    t.column "site_id",             :integer
-    t.column "path",                :string
-    t.column "articles_count",      :integer, :default => 0
-    t.column "archive_path",        :string
-    t.column "archive_template",    :string
-    t.column "position",            :integer, :default => 1
-  end
-
-  create_table "sessions", :force => true do |t|
-    t.column "session_id", :string
-    t.column "data",       :text
-    t.column "updated_at", :datetime
+  create_table "mephisto_plugins", :force => true do |t|
+    t.string "name"
+    t.text   "options"
+    t.string "type"
   end
 
-  add_index "sessions", ["session_id"], :name => "sessions_session_id_index"
+  create_table "sections", :force => true do |t|
+    t.string  "name"
+    t.boolean "show_paged_articles", :default => false
+    t.integer "articles_per_page",   :default => 15
+    t.string  "layout"
+    t.string  "template"
+    t.integer "site_id"
+    t.string  "path"
+    t.integer "articles_count",      :default => 0
+    t.string  "archive_path"
+    t.string  "archive_template"
+    t.integer "position",            :default => 1
+  end
 
   create_table "sites", :force => true do |t|
-    t.column "title",              :string
-    t.column "subtitle",           :string
-    t.column "email",              :string
-    t.column "ping_urls",          :text
-    t.column "articles_per_page",  :integer,                :default => 15
-    t.column "host",               :string
-    t.column "akismet_key",        :string,  :limit => 100
-    t.column "akismet_url",        :string
-    t.column "approve_comments",   :boolean
-    t.column "comment_age",        :integer
-    t.column "timezone",           :string
-    t.column "filter",             :string
-    t.column "permalink_style",    :string
-    t.column "search_path",        :string
-    t.column "tag_path",           :string
-    t.column "search_layout",      :string
-    t.column "tag_layout",         :string
-    t.column "current_theme_path", :string
+    t.string  "title"
+    t.string  "subtitle"
+    t.string  "email"
+    t.text    "ping_urls"
+    t.integer "articles_per_page",                 :default => 15
+    t.string  "host"
+    t.boolean "approve_comments"
+    t.integer "comment_age"
+    t.string  "timezone"
+    t.string  "filter"
+    t.string  "permalink_style"
+    t.string  "search_path"
+    t.string  "tag_path"
+    t.string  "tag_layout"
+    t.string  "current_theme_path"
+    t.string  "akismet_key",        :limit => 100
+    t.string  "akismet_url"
   end
 
   add_index "sites", ["host"], :name => "index_sites_on_host"
 
   create_table "taggings", :force => true do |t|
-    t.column "tag_id",        :integer
-    t.column "taggable_id",   :integer
-    t.column "taggable_type", :string
+    t.integer "tag_id"
+    t.integer "taggable_id"
+    t.string  "taggable_type"
   end
 
   create_table "tags", :force => true do |t|
-    t.column "name", :string
+    t.string "name"
   end
 
   create_table "users", :force => true do |t|
-    t.column "login",            :string,   :limit => 40
-    t.column "email",            :string,   :limit => 100
-    t.column "crypted_password", :string,   :limit => 40
-    t.column "salt",             :string,   :limit => 40
-    t.column "activation_code",  :string,   :limit => 40
-    t.column "activated_at",     :datetime
-    t.column "created_at",       :datetime
-    t.column "updated_at",       :datetime
-    t.column "deleted_at",       :datetime
-    t.column "token",            :string
-    t.column "token_expires_at", :datetime
-    t.column "filter",           :string
-    t.column "admin",            :boolean,                 :default => false
+    t.string   "login",            :limit => 40
+    t.string   "email",            :limit => 100
+    t.string   "crypted_password", :limit => 40
+    t.string   "salt",             :limit => 40
+    t.string   "activation_code",  :limit => 40
+    t.datetime "activated_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "deleted_at"
+    t.string   "token"
+    t.datetime "token_expires_at"
+    t.string   "filter"
+    t.boolean  "admin",                           :default => false
   end
 
 end
diff -Nur mephisto-0.7.3/lib/authenticated_system.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/authenticated_system.rb
--- mephisto-0.7.3/lib/authenticated_system.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/authenticated_system.rb	2008-03-31 02:18:56.000000000 -0400
@@ -51,7 +51,7 @@
 
     # move to the last store_location call or to the passed default one
     def redirect_back_or_default(default)
-      location_stored? ? redirect_to_url(session[:return_to]) : redirect_to(default)
+      redirect_to(location_stored? ? session[:return_to] : default)
       session[:return_to] = nil
     end
     
diff -Nur mephisto-0.7.3/lib/format.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/format.rb
--- mephisto-0.7.3/lib/format.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/format.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,6 @@
 module Format
-  DOMAIN = /^([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)+((a[cdefgilmnoqrstuwxz]|aero|arpa)|(b[abdefghijmnorstvwyz]|biz)|(c[acdfghiklmnorsuvxyz]|cat|com|coop)|d[ejkmoz]|(e[ceghrstu]|edu)|f[ijkmor]|(g[abdefghilmnpqrstuwy]|gov)|h[kmnrtu]|(i[delmnoqrst]|info|int)|(j[emop]|jobs)|k[eghimnprwyz]|l[abcikrstuvy]|(m[acdghklmnopqrstuvwxyz]|mil|mobi|museum)|(n[acefgilopruz]|name|net)|(om|org)|(p[aefghklmnrstwy]|pro)|qa|r[eouw]|s[abcdeghijklmnortvyz]|(t[cdfghjklmnoprtvwz]|travel)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])$/ unless const_defined?(:DOMAIN)
+  # yes this is valid ruby, even if textmate's highlighter can't grok it
+  DOMAIN = /^([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)+((a[cdefgilmnoqrstuwxz]|aero|arpa)|(b[abdefghijmnorstvwyz]|biz)|(c[acdfghiklmnorsuvxyz]|cat|com|coop)|d[ejkmoz]|(e[ceghrstu]|edu)|f[ijkmor]|(g[abdefghilmnpqrstuwy]|gov)|(h[kmnrtu]#{RAILS_ENV=='test'?'|host':''})|(i[delmnoqrst]|info|int)|(j[emop]|jobs)|k[eghimnprwyz]|l[abcikrstuvy]|(m[acdghklmnopqrstuvwxyz]|mil|mobi|museum)|(n[acefgilopruz]|name|net)|(om|org)|(p[aefghklmnrstwy]|pro)|qa|r[eouw]|s[abcdeghijklmnortvyz]|(t[cdfghjklmnoprtvwz]|travel)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])$/ unless const_defined?(:DOMAIN)
   STRING = /^[a-z0-9-]+$/
   EMAIL  = /(\A(\s*)\Z)|(\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z)/i
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto/directory_plugin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/directory_plugin.rb
--- mephisto-0.7.3/lib/mephisto/directory_plugin.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/directory_plugin.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+# Object model of a plugin in plugins/vendor. May or may not have an internal Mephisto::Plugins::Plugin (an AR).
+module Mephisto
+  class DirectoryPlugin
+    @@filter = /^mephisto_(\w+)$/
+    attr_accessor :plugin, :path
+    
+    def self.scan
+      Dir.new("#{RAILS_ROOT}/vendor/plugins/").collect do |entry|
+        # don't list "invisible" plugins nor directories/files hidden on the filesystem
+        entry =~ @@filter ? new($1) : nil
+      end.compact
+    end
+    
+    def initialize(path)
+      @path = path
+    end
+    
+    def klass
+      @klass ||= Mephisto::Plugin[@path] rescue :false
+    end
+    
+    def configurable?
+      klass != :false
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto/dispatcher.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/dispatcher.rb
--- mephisto-0.7.3/lib/mephisto/dispatcher.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/dispatcher.rb	2008-03-31 02:18:56.000000000 -0400
@@ -112,8 +112,8 @@
       old_published          = article.published_at
       article.published_at ||= Time.now.utc
       article.article_id   ||= article.id
-      permalink_style.split('/').inject [''] do |s, piece|
-        s << ((name = variable_format?(piece)) && PERMALINK_OPTIONS.keys.include?(name.to_sym) ? variable_value_for(article, name) : piece)
+      '/' + permalink_style.split('/').collect! do |piece|
+        (name = variable_format?(piece)) && PERMALINK_OPTIONS.keys.include?(name.to_sym) ? variable_value_for(article, name) : piece
       end.join('/')
     ensure
       article.published_at = old_published
diff -Nur mephisto-0.7.3/lib/mephisto/liquid/comment_form.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/comment_form.rb
--- mephisto-0.7.3/lib/mephisto/liquid/comment_form.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/comment_form.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,10 +1,18 @@
 module Mephisto
   module Liquid
     class CommentForm < ::Liquid::Block
-      cattr_accessor :article
+      def self.article
+        Thread.current[:comment_form_article]
+      end
+      
+      def self.article=(value)
+        Thread.current[:comment_form_article] = value
+      end
     
+      # Provides the required input, error, and form fields
+      # TODO: make this more accessible to users (let them mess it up, rather than forcing a structure on them)
       def render(context)
-        return '' unless article.accept_comments?
+        return '' unless self.class.article.accept_comments?
         result = []
         context.stack do
           if context['message'].blank? 
diff -Nur mephisto-0.7.3/lib/mephisto/liquid/for_with_sorting.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/for_with_sorting.rb
--- mephisto-0.7.3/lib/mephisto/liquid/for_with_sorting.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/for_with_sorting.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+module Mephisto
+  module Liquid
+    module ForWithSorting
+      def self.included(base)
+        base.alias_method_chain :render, :sorting
+      end
+
+      def render_with_sorting(context)
+        context.registers[:for] ||= Hash.new(0)
+        
+        collection = context[@collection_name]
+        collection = collection.to_a if collection.is_a?(Range)
+        
+        return '' if collection.nil? or collection.empty?
+        
+        if @attributes['sort_by']
+          sorted_name = "sorted_#{@collection_name.tr '.', '_'}"
+          context[sorted_name] = collection.sort_by { |i| i[@attributes['sort_by']] }
+          @collection_name = sorted_name
+        end
+        
+        render_without_sorting(context)
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto/liquid/liquid_template.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/liquid_template.rb
--- mephisto-0.7.3/lib/mephisto/liquid/liquid_template.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/liquid_template.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,33 @@
+module Mephisto
+  module Liquid
+    class LiquidTemplate
+
+      def initialize(site)
+        @site = site
+      end
+  
+      def render(section, layout, template, assigns ={}, controller = nil)
+        parse_inner_template(template, assigns, controller)
+        parse_template(layout, assigns, controller)
+      end  
+
+      def parse_template(template, assigns, controller)
+        # give the include tag access to files in the site's fragments directory
+        ::Liquid::Template.file_system = ::Liquid::LocalFileSystem.new(File.join(@site.theme.path, 'templates'))
+        tmpl = ::Liquid::Template.parse(template.read.to_s)
+        returning tmpl.render(assigns, :registers => {:controller => controller}) do |result|
+          yield tmpl, result if block_given?
+        end
+      end
+  
+      def parse_inner_template(template, assigns, controller)
+        parse_template(template, assigns, controller) do |tmpl, result|
+          # Liquid::Template takes a copy of the assigns.  
+          # merge any new values in to the assigns and pass them to the layout
+          tmpl.assigns.each { |k, v| assigns[k] = v } if tmpl.respond_to?(:assigns)
+          assigns['content_for_layout'] = result
+        end
+      end  
+    end
+  end
+end
diff -Nur mephisto-0.7.3/lib/mephisto/liquid/url_methods.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/url_methods.rb
--- mephisto-0.7.3/lib/mephisto/liquid/url_methods.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/liquid/url_methods.rb	2008-03-31 02:18:56.000000000 -0400
@@ -12,8 +12,10 @@
 
       def absolute_url(*path)
         return "#{relative_url_root}/" if path.empty?
+        is_absolute = path.first.to_s[/(^\/)/]
         path.collect! { |p| p.to_s.gsub /(^\/)|(\/$)/, '' }
-        path.empty? ? "#{relative_url_root}/" : path.unshift(relative_url_root).join('/')
+        path.unshift(is_absolute ? '' : relative_url_root)
+        path * '/'
       end
     end
   end
diff -Nur mephisto-0.7.3/lib/mephisto/plugin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/plugin.rb
--- mephisto-0.7.3/lib/mephisto/plugin.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/plugin.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,58 @@
+require File.join(File.dirname(__FILE__), 'plugin_about_patch')
+
+# needs to be loaded before or at beginning of plugin init stage because it
+# allows to use add_tab and add_admin_tab from plugin init.rb
+
+module Mephisto 
+  def self.plugins
+    @@plugins ||= Engines::Plugin::List.new Engines.plugins.select{ |plugin| plugin.mephisto_plugin? }
+  end
+  
+  module Plugin
+    @@tabs       = []
+    @@admin_tabs = []
+    mattr_reader :tabs, :admin_tabs
+    
+    # delegate read access to about info
+    %w(author homepage version notes).each do |property|
+      module_eval "def #{property}; about['#{property}'] end", __FILE__, __LINE__
+    end
+
+    # Keeps track of custom adminstration tabs. Each item is an array of arguments to be passed to link_to.
+    def add_tab(*args)
+      args.push(:controller => args.first.to_s.downcase) if (args.size == 1)
+      Mephisto::Plugin.tabs << args
+    end
+
+    # Keeps track of custom adminstration tabs for ADMIN users only.  Each item is an array of arguments to be passed to link_to.
+    def add_admin_tab(*args)
+      args.push(:controller => args.first.to_s.downcase) if (args.size == 1)
+      Mephisto::Plugin.admin_tabs << args
+    end
+    
+    def mephisto_plugin?
+      name =~ /^mephisto_(\w+)$/
+    end
+    
+    def configurable?
+      not default_options.empty?
+    end
+    
+    def mephisto_name
+      name.sub /^mephisto_/, ''
+    end
+    alias :conf_name :mephisto_name
+  end
+end
+
+Engines::Plugin.send :include, Mephisto::Plugin
+
+module Engines
+  class Plugin < Rails::Plugin
+    protected
+      # override engine default list for Mephisto plugins
+      def default_code_paths
+        %w(app/controllers app/helpers app/models app/drops components lib)
+      end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto/plugin_about_patch.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/plugin_about_patch.rb
--- mephisto-0.7.3/lib/mephisto/plugin_about_patch.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/plugin_about_patch.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+# separately patching Rails::Plugin assuming that this patch will be accepted:
+# http://dev.rubyonrails.org/ticket/10979
+
+unless Rails::Plugin.respond_to?(:directory)
+  Rails::Plugin.class_eval do
+    attr_reader :directory, :name, :about
+  
+    alias :initialize_without_about_info :initialize
+    def initialize(directory)
+      initialize_without_about_info(directory)
+      load_about_information
+    end
+
+    private
+
+    def load_about_information
+      begin
+        about_yml_path = File.join(@directory, "about.yml")
+        parsed_yml = File.exist?(about_yml_path) ? YAML.load(File.read(about_yml_path)) : {}
+        @about = parsed_yml || {}
+      rescue Exception
+        @about = {}
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto/plugins.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/plugins.rb
--- mephisto-0.7.3/lib/mephisto/plugins.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/plugins.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+# Empty module to hold plugin models
+module Mephisto
+  module Plugins
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto/routing.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/routing.rb
--- mephisto-0.7.3/lib/mephisto/routing.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/routing.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,10 @@
 module Mephisto
   class Routing
+    # Adds Mephisto routes.  Yield a given block to allow custom routes.
+    #
+    #   Mephisto::Routing.connect_with map do
+    #     map.foo ...
+    #   end
     def self.connect_with(map)
       map.feed    'feed/*sections', :controller => 'feed', :action => 'feed'
       
@@ -9,22 +14,38 @@
         m.js     'javascripts/:path.:ext', :dir => 'javascripts'
         m.images 'images/:path.:ext',      :dir => 'images'
       end
-      
+
+      map.moderate 'admin/articles/comments',       :controller => 'admin/comments', :action => 'index'
+      map.purge    'admin/articles/comments/purge', :controller => 'admin/comments', :action => 'destroy'
+
+      map.resources :articles, :path_prefix => 'admin', :controller => 'admin/articles' do |r|
+        r.resources :comments, :controller => 'admin/comments', :member => { :unapprove => :post, :approve => :post, :edit => :get, :preview => :post }
+      end
+
       map.overview 'admin/overview.xml', :controller => 'admin/overview', :action => 'feed'
       map.admin    'admin', :controller => 'admin/overview', :action => 'index'
       map.resources :assets, :path_prefix => '/admin', :controller => 'admin/assets', :member => { :add_bucket => :post },
         :collection => { :latest => :post, :search => :post, :upload => :post, :clear_bucket => :post }
       
-      map.connect 'xmlrpc', :controller => 'backend', :action => 'xmlrpc' 
+      # Where oh where is my xmlrpc code?
+      # map.connect 'xmlrpc', :controller => 'backend', :action => 'xmlrpc' 
       
-      map.connect ':controller/:action/:id/:version', :version => nil, :controller => /routing_navigator|account|(admin\/\w+)/
+      map_from_plugins(map)
+      
+      map.connect ':controller/:action/:id/:version', :version => nil, :controller => /routing_navigator|account|(admin\/\w+)/, :id => /[^\/]*/
+
+      yield if block_given?
       
       map.dispatch '*path', :controller => 'mephisto', :action => 'dispatch'
       map.home '', :controller => 'mephisto', :action => 'dispatch'
     end
     
-    def self.redirections
-      @redirections ||= {}
+    class << self
+      expiring_attr_reader :redirections,  '{}'
+    end
+    
+    def self.map_from_plugins(map)      
+      Engines.plugins.each { |plugin| map.from_plugin(plugin.name) }
     end
     
     def self.deny(*paths)
@@ -53,8 +74,9 @@
     end
     
     protected
+      @@sanitize_path_regex = /^(\/)|(https?:\/\/)/
       def self.sanitize_path(path)
-        path =~ /^(\/)|(https?:\/\/)/ ? path : "/#{path.split("://").last}"
+        path =~ @@sanitize_path_regex ? path : "/#{path.split("://").last}"
       end
       
       def self.convert_redirection_to_regex(path)
diff -Nur mephisto-0.7.3/lib/mephisto/version.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/version.rb
--- mephisto-0.7.3/lib/mephisto/version.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto/version.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,9 +1,9 @@
 module Mephisto
   module Version
     MAJOR  = 0
-    MINOR  = 7
-    TINY   = 3
+    MINOR  = 8
+    TINY   = 0
     STRING = [MAJOR, MINOR, TINY].join('.').freeze
-    TITLE  = "Noh-Varr".freeze
+    TITLE  = "Drax".freeze
   end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto.rb
--- mephisto-0.7.3/lib/mephisto.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+module Mephisto
+  @@liquid_filters = [CoreFilters, DropFilters, UrlFilters]
+  @@liquid_tags    = {:textile => Mephisto::Liquid::Textile, :commentform => Mephisto::Liquid::CommentForm, :head => Mephisto::Liquid::Head}
+  mattr_reader :liquid_tags, :liquid_filters
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/mephisto_init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto_init.rb
--- mephisto-0.7.3/lib/mephisto_init.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/mephisto_init.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,148 +0,0 @@
-require 'tzinfo'
-require 'zip/zipfilesystem'
-require 'dispatcher'
-require 'coderay'
-require 'ruby_pants'
-require 'xmlrpc_patch'
-
-RAILS_PATH = Pathname.new(File.expand_path(RAILS_ROOT))
-
-ActiveRecord::Base.observers = [:article_observer, :comment_observer]
-
-Inflector.inflections do |inflect|
-  #inflect.plural /^(ox)$/i, '\1en'
-  #inflect.singular /^(ox)en/i, '\1'
-  #inflect.irregular 'person', 'people'
-  inflect.uncountable %w( audio )
-end
-
-class << Dispatcher
-  def register_liquid_tags
-    [CoreFilters, DropFilters, UrlFilters].each { |f| Liquid::Template.register_filter f }
-    Liquid::Template.register_tag(:textile,     Mephisto::Liquid::Textile)
-    Liquid::Template.register_tag(:commentform, Mephisto::Liquid::CommentForm)
-    Liquid::Template.register_tag(:head,        Mephisto::Liquid::Head)
-  end
-  
-  def reset_application_with_plugins!
-    returning reset_application_without_plugins! do
-      register_liquid_tags
-    end
-  end
-  
-  alias_method_chain :reset_application!, :plugins
-end
-
-Dispatcher.register_liquid_tags
-# http://rails.techno-weenie.net/tip/2005/12/23/make_fixtures
-ActiveRecord::Base.class_eval do
-  # person.dom_id #-> "person-5"
-  # new_person.dom_id #-> "person-new"
-  # new_person.dom_id(:bare) #-> "new"
-  # person.dom_id(:person_name) #-> "person-name-5"
-  def dom_id(prefix=nil)
-    display_id = new_record? ? "new" : id
-    prefix ||= self.class.name.underscore
-    prefix != :bare ? "#{prefix.to_s.dasherize}-#{display_id}" : display_id
-  end
-
-  # Write a fixture file for testing
-  def self.to_fixture(fixture_path = nil)
-    File.open(File.expand_path(fixture_path || "test/fixtures/#{table_name}.yml", RAILS_ROOT), 'w') do |out|
-      YAML.dump find(:all).inject({}) { |hsh, record| hsh.merge(record.id => record.attributes) }, out
-    end
-  end
-
-  def referenced_cache_key
-    "[#{[id, self.class.name] * ':'}]"
-  end
-end
-
-ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS.update \
-  :standard  => '%B %d, %Y @ %I:%M %p',
-  :stub      => '%B %d', # XXX what is the meaning of stub in this context?  (Basically it means short)
-  :time_only => '%I:%M %p',
-  :plain     => '%B %d %I:%M %p',
-  :mdy       => '%B %d, %Y',
-  :my        => '%B %Y'
-
-# Time.now.to_ordinalized_s :long
-# => "February 28th, 2006 21:10"
-module ActiveSupport::CoreExtensions::Time::Conversions
-  def to_ordinalized_s(format = :default)
-    format = ActiveSupport::CoreExtensions::Time::Conversions::DATE_FORMATS[format] 
-    return to_default_s if format.nil?
-    strftime(format.gsub(/%d/, '_%d_')).gsub(/_(\d+)_/) { |s| s.to_i.ordinalize }
-  end
-end
-
-class Time
-  class << self
-    # Used for getting multifield attributes like those generated by a 
-    # select_datetime into a new Time object. For example if you have 
-    # following <tt>params={:meetup=>{:"time(1i)=>..."}}</tt> just do 
-    # following:
-    #
-    # <tt>Time.parse_from_attributes(params[:meetup], :time)</tt>
-    def parse_from_attributes(attrs, field, method=:gm)
-      attrs = attrs.keys.sort.grep(/^#{field.to_s}\(.+\)$/).map { |k| attrs[k] }
-      attrs.any? ? Time.send(method, *attrs) : nil
-    end
-  end
-
-  def to_delta(delta_type = :day)
-    case delta_type
-      when :year then self.class.delta(year)
-      when :month then self.class.delta(year, month)
-      else self.class.delta(year, month, day)
-    end
-  end
-      
-  def self.delta(year, month = nil, day = nil)
-    from = Time.local(year, month || 1, day || 1)
-    
-    to = 
-      if !day.blank?
-        from.advance :days => 1
-      elsif !month.blank?
-        from.advance :months => 1
-      else
-        from.advance :years => 1
-      end
-    return [from.midnight, to.midnight-1]
-  end
-end
-
-# need to make pathname safe for windows!
-Pathname.class_eval do
-  def read(*args)
-    returning '' do |s|
-      File.open @path, 'rb' do |f|
-        s << f.read
-      end
-    end
-  end
-end
-
-class MissingTemplateError < StandardError
-  attr_reader :template_type, :templates
-  def initialize(template_type, templates)
-    @template_type = template_type
-    @templates     = templates
-    super "No template found for #{template_type}, checked #{templates.to_sentence}."
-  end
-end
-
-class ThemeError < StandardError
-  attr_reader :theme
-  def initialize(theme, message)
-    @theme = theme
-    super message
-  end
-end
-
-Symbol.class_eval do 
- def to_liquid
-   to_s
- end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/lib/tasks/bootstrap.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/tasks/bootstrap.rake
--- mephisto-0.7.3/lib/tasks/bootstrap.rake	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/tasks/bootstrap.rake	2008-03-31 02:18:56.000000000 -0400
@@ -1,7 +1,7 @@
 SITE_DIR = File.join(RAILS_ROOT, 'themes/site-' + (ENV['SITE_ID'] || '1'))
 namespace :db do
   desc "Loads a schema.rb file into the database and then loads the initial database fixtures."
-  task :bootstrap do
+  task :bootstrap do |task_args|
     mkdir_p File.join(RAILS_ROOT, 'log')
     
     require 'rubygems' unless Object.const_defined?(:Gem)
@@ -25,11 +25,11 @@
       raise
     end
     
-    %w(environment db:schema:load db:bootstrap:load tmp:create).each { |t| Rake::Task[t].execute }
+    %w(environment db:schema:load db:bootstrap:load tmp:create).each { |t| Rake::Task[t].execute task_args}
     if File.exists?(SITE_DIR)
       puts "skipping default theme creation..."
     else
-      Rake::Task["db:bootstrap:copy_default_theme"].execute
+      Rake::Task["db:bootstrap:copy_default_theme"].execute task_args
       puts "copied default theme to #{SITE_DIR}..."
     end
     
diff -Nur mephisto-0.7.3/lib/tasks/common.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/tasks/common.rake
--- mephisto-0.7.3/lib/tasks/common.rake	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/tasks/common.rake	2008-03-31 02:18:56.000000000 -0400
@@ -2,6 +2,7 @@
 task :deploy_edge do
   ENV['SHARED_PATH']  = '../../shared' unless ENV['SHARED_PATH']
   ENV['RAILS_PATH'] ||= File.join(ENV['SHARED_PATH'], 'rails')
+  ENV['REPO_BRANCH'] ||= 'trunk'
   
   checkout_path = File.join(ENV['RAILS_PATH'], 'trunk')
   export_path   = "#{ENV['RAILS_PATH']}/rev_#{ENV['REVISION']}"
@@ -11,7 +12,7 @@
   unless File.exists?(checkout_path)
     puts 'setting up rails trunk'    
     get_framework_for checkout_path do |framework|
-      system "svn co http://dev.rubyonrails.org/svn/rails/trunk/#{framework}/lib #{checkout_path}/#{framework}/lib --quiet"
+      system "svn co http://dev.rubyonrails.org/svn/rails/#{ENV['REPO_BRANCH']}/#{framework}/lib #{checkout_path}/#{framework}/lib --quiet"
     end
   end
 
diff -Nur mephisto-0.7.3/lib/tasks/switchtower.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/tasks/switchtower.rake
--- mephisto-0.7.3/lib/tasks/switchtower.rake	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/lib/tasks/switchtower.rake	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-# =============================================================================
-# A set of rake tasks for invoking the SwitchTower automation utility.
-# =============================================================================
-
-desc "Push the latest revision into production using the release manager"
-task :deploy do
-  system "switchtower -vvvv -r config/deploy -a deploy"
-end
-
-desc "Rollback to the release before the current release in production"
-task :rollback do
-  system "switchtower -vvvv -r config/deploy -a rollback"
-end
-
-desc "Describe the differences between HEAD and the last production release"
-task :diff_from_last_deploy do
-  system "switchtower -vvvv -r config/deploy -a diff_from_last_deploy"
-end
-
-desc "Enumerate all available deployment tasks"
-task :show_deploy_tasks do
-  system "switchtower -r config/deploy -a show_tasks"
-end
-
-desc "Execute a specific action using the release manager"
-task :remote_exec do
-  unless ENV['ACTION']
-    raise "Please specify an action (or comma separated list of actions) via the ACTION environment variable"
-  end
-
-  actions = ENV['ACTION'].split(",").map { |a| "-a #{a}" }.join(" ")
-  system "switchtower -vvvv -r config/deploy #{actions}"
-end
diff -Nur mephisto-0.7.3/public/.htaccess technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/.htaccess
--- mephisto-0.7.3/public/.htaccess	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/.htaccess	1969-12-31 19:00:00.000000000 -0500
@@ -1,40 +0,0 @@
-# General Apache options
-AddHandler fastcgi-script .fcgi
-AddHandler cgi-script .cgi
-Options +FollowSymLinks +ExecCGI
-
-# If you don't want Rails to look in certain directories,
-# use the following rewrite rules so that Apache won't rewrite certain requests
-# 
-# Example:
-#   RewriteCond %{REQUEST_URI} ^/notrails.*
-#   RewriteRule .* - [L]
-
-# Redirect all requests not available on the filesystem to Rails
-# By default the cgi dispatcher is used which is very slow
-# 
-# For better performance replace the dispatcher with the fastcgi one
-#
-# Example:
-#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
-RewriteEngine On
-
-# If your Rails application is accessed via an Alias directive,
-# then you MUST also set the RewriteBase in this htaccess file.
-#
-# Example:
-#   Alias /myrailsapp /path/to/myrailsapp/public
-#   RewriteBase /myrailsapp
-
-RewriteRule ^$ index.html [QSA]
-RewriteRule ^([^.]+)$ $1.html [QSA]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
-
-# In case Rails experiences terminal errors
-# Instead of displaying this message you can supply a file here which will be rendered instead
-# 
-# Example:
-#   ErrorDocument 500 /500.html
-
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
diff -Nur mephisto-0.7.3/public/install.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/install.html
--- mephisto-0.7.3/public/install.html	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/install.html	2008-03-31 02:18:56.000000000 -0400
@@ -1,87 +1,87 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />		
-		<title>Installing Mephisto</title>
-		<link rel="stylesheet" href="stylesheets/mephisto.css" type="text/css" charset="utf-8" />
-	</head>
-	<body>
-	
-  	<!-- div.header -->
-  	<div id="header">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />   
+    <title>Installing Mephisto</title>
+    <link rel="stylesheet" href="stylesheets/mephisto/mephisto.css" type="text/css" charset="utf-8" />
+  </head>
+  <body>
+  
+    <!-- div.header -->
+    <div id="header">
 
 
-  	  <h1><a href="http://mephistoblog.com">Mephisto</a></h1>
+      <h1><a href="http://mephistoblog.com">Mephisto</a></h1>
 
-  	  <!-- div.nav -->	
-  	  <div id="nav">
+      <!-- div.nav -->  
+      <div id="nav">
           <ul>
-      	    <li><a href="/">Installing</a></li>
+            <li><a href="/">Installing</a></li>
           </ul>
-  	  </div> 
-  	  <!-- /div.nav -->  
-    	
-  	</div>
-  	<!-- /div.header -->
-  	
-
-      	  
-	  <div id="container">  	
+      </div> 
+      <!-- /div.nav -->  
+      
+    </div>
+    <!-- /div.header -->
+    
+    <div id="container">    
       
       <!-- div.content -->
-    	<div id="content">
-    	  
-    	  <!-- div.left -->
-    	  <div id="main">
-
-    	    
-    	    <div id="main-content" style="padding: 20px">
-    	      <h2 style="margin: 10px 0">Installing Mephisto</h2>
-    	      <p>Get Mephisto up and running like a pro!</p>
-    	      
-            <p><strong>Note:</strong> We are targetting Rails v1.2 for the Mephisto 1.0 release.  So you will have to freeze to edge rails to get Mephisto working properly.</p>
-            
-            <pre><code>rake rails:freeze:edge</code></pre>
+      <div id="content">
+        
+        <!-- div.left -->
+        <div id="main">
+          
+          <div id="main-content" style="padding: 20px">
+            <h2 style="margin: 10px 0">Installing Mephisto</h2>
+            <p>Follow these steps to get Mephisto up and running like a pro!</p>
+            <br />
+            <p><strong>Note:</strong> We are targeting the Rails 2.0 release series for Mephisto 1.0. Therefore, if you are using gem rails (most hosting environments do),
+               you will need to freeze edge rails: <code>rake rails:freeze:edge</code></p>
+            <br />
+
+            <p>You can visit the <a href="http://mephistoblog.com/docs/setup">Mephisto install documentation</a> on the site to get the most recent content, 
+              however for the impatient, here's the quick setup guide:</p>
+            <br />
+            <ol style="padding-left:35px">
+              <li>Create a database named mephisto (or one of your choosing).</li>
+                <li>Copy config/database.example.yml to config/database.yml</li>
+                <li>Edit database.yml and set your database credentials.</li>
+                <li>Upload the entire mephisto directory to your webserver.</li>
+                <li>Make sure you upload the tzinfo gem (see above) with the directory, or that your host has it preinstalled.</li>
+                <li>Run rake db:bootstrap from a terminal of some sorts (use rake db:bootstrap <span class="caps">RAILS</span>_ENV=production to be sure you’ve bootstrapped the production database.)</li>
+                <li>Login to your administration at http://domain.com/admin with the username: admin and password: test</li>
+              </ol>
+
             
-            <p>As of this writing, Mephisto is fine on the absolute latest edge rails.</p>
-    	      
-    	      <p>See the latest directions in the <a href="http://mephistoblog.com/docs/setup">Mephisto Docs</a>.</p>
-    	      
-    	      <ol style="padding-left: 20px">
-    	        <li>Create a database named <strong>mephisto</strong> (or one of your choosing).</li>
-    	        <li>Copy <strong>config/database.example.yml</strong> to <strong>config/database.yml</strong></li>
-    	        <li>Open <strong>config/database.yml</strong> and set your database credentials.</li>
-    	        <li>Upload the entire mephisto directory to your webserver.</li>
-    	        <li>Run <strong>rake db:bootstrap RAILS_ENV=production</strong> from a terminal of some sorts.</li>
-    	        <li>Login to your administration at <strong>http://domain.com/admin</strong> with the username: <strong>admin</strong> and password: <strong>test</strong></li>
-    	      </ol>
-    	      
-    	      <h3>For help, visit the following:</h3>
-    	      <ul style="padding-left: 20px">
-    	        <li><a href="http://mephistoblog.com">Official Mephisto Site</a></li>
-    	        <li><a href="http://mephisto.stikipad.com">The Mephisto Community Wiki</a></li>
-    	        <li><a href="http://groups.google.com/group/MephistoBlog">The Mephisto Google Group</a></li>
-    	      </ul>
-    	    </div>
-    	    <div id="shadow"></div>
-    	  </div>
-    	  <!-- /div.left -->
-    	  
-    	  <!-- div.right -->
-    	  <div id="sbar">
-    	    <h3>About Mephisto</h3>
-    	    <p>Mephisto was baked to golden perfection by <a href="http://weblog.techno-weenie.net">Rick Olson</a><em>(Development)</em> 
-    	      and <a href="http://encytemedia.com/">Justin Palmer</a><em>(UI/Design)</em> with contributions from a bunch of wicked cool people.
-    	  </div>
-    	  <!-- /div.right -->
-    	</div>
-    	<!-- /div.content -->
-    	
-    	<!-- begin div.footer -->
-    	<div id="footer">
-
-    	</div>
-  	</div>
-	</body>
+            <br />
+            <h3>For further help, to join the community and get involved, visit the following:</h3>
+            <br />
+            <ul style="padding-left: 35px">
+              <li><a href="http://mephistoblog.com">The Official Mephisto Site</a></li>
+              <li><a href="http://mephisto.stikipad.com">The Mephisto Community Wiki</a></li>
+              <li><a href="http://groups.google.com/group/MephistoBlog">The Mephisto Google Group</a></li>
+            </ul>
+          </div>
+          <div id="shadow"></div>
+        </div>
+        <!-- /div.left -->
+        
+        <!-- div.right -->
+        <div id="sbar">
+          <h3>About Mephisto</h3>
+          <p>Mephisto was baked to golden perfection by <a href="http://weblog.techno-weenie.net">Rick Olson</a><em>(Development)</em> 
+            and <a href="http://encytemedia.com/">Justin Palmer</a><em>(UI/Design)</em> with contributions from a bunch of wicked cool people.
+        </div>
+        <!-- /div.right -->
+      </div>
+      <!-- /div.content -->
+      
+      <!-- begin div.footer -->
+      <div id="footer">
+
+      </div>
+    </div>
+  </body>
 </html>
\ No newline at end of file
diff -Nur mephisto-0.7.3/public/javascripts/mephisto/application.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/javascripts/mephisto/application.js
--- mephisto-0.7.3/public/javascripts/mephisto/application.js	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/javascripts/mephisto/application.js	2008-03-31 02:18:56.000000000 -0400
@@ -206,9 +206,9 @@
 Asset = {
   upload: function(form) {
     form = $(form);
-    article_id   = location.href.match(/\/edit\/([0-9]+)/);
+    article_id   = location.href.match(/\/(edit|upload)\/([0-9]+)/);
     form.action  = Mephisto.root + "/admin/articles/upload"
-    if(article_id) form.action += "/" + article_id[1]
+    if(article_id) form.action += "/" + article_id[2]
     form.submit();
   },
   
@@ -295,11 +295,36 @@
   getAvailableComments: function() {
     return $$('ul.commentlist li').reject(function(div) { return !(div.visible() && !div.hasClassName('disabled') && div.id.match(/^comment-/)); }).collect(function(div) { return div.id.match(/comment-(\d+)/)[1] });
   },
-  
+
+  attachAsset: function(assetId) {
+    var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1];
+    var attached  = $('attached-widget-' + assetId);
+    if(attached) return;
+    new Ajax.Request('/admin/articles/attach/' + articleId + '/' + assetId);
+    $$('.widget').each(function(asset) { if(assetId == asset.getAttribute('id').match(/-(\d+)$/)[1]) asset.addClassName('selected-widget'); });
+  },
+
+  labelAsset: function(assetId) {
+    var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1];
+    var attached  = $('attached-widget-' + assetId);
+    var label     = $('attached-widget-version-' + assetId);
+    new Ajax.Request('/admin/articles/label/' + articleId + '/' + assetId + '?label=' + escape(label.value));
+    if(attached) return;
+  },
+
+  detachAsset: function(assetId) {
+    var articleId = location.href.match(/\/([0-9]+)\/(edit|upload)/)[1];
+    var attached  = $('attached-widget-' + assetId);
+    if(!attached) return;
+    new Ajax.Request('/admin/articles/detach/' + articleId + '/' + assetId);
+    new Effect.DropOut(attached, {afterFinish: function() { attached.remove(); }});
+    $$('.widget').each(function(asset) { if(assetId == asset.getAttribute('id').match(/-(\d+)$/)[1]) asset.removeClassName('selected-widget'); });
+  },
+
   getRevision: function() {
     var rev = $F(this)
-    var url = Mephisto.root + '/admin/articles/edit/' + location.href.match(/\/edit\/([0-9]+)/)[1];
-    if(rev != '0') url += "/" + rev;
+    var url = Mephisto.root + '/admin/articles/' + location.href.match(/\/([0-9]+)\/edit/)[1] + "/edit";
+		if(rev != '0') url += "?version=" + rev;
     location.href = url;
   }
 }
@@ -548,7 +573,37 @@
     $('published').value = '0';
     $('article-search').submit();
   },
+
+  'li.widget:mouseover': function() {
+    var attach = $('attach-' + this.getAttribute('id'));
+    var detach = $('detach-' + this.getAttribute('id'));
+    if(attach) attach.show();
+    if(detach) detach.show();
+  },
+  
+  'li.widget:mouseout': function() {
+    var attach = $('attach-' + this.getAttribute('id'));
+    var detach = $('detach-' + this.getAttribute('id'));
+    if(attach) attach.hide();
+    if(detach) detach.hide();
+  },
   
+  '.attach-widget:click': function() {
+    ArticleForm.attachAsset(this.getAttribute('id').match(/-(\d+)$/)[1]);
+    return false;
+  },
+  
+  '.label-widget:click': function() {
+    ArticleForm.labelAsset(this.getAttribute('id').match(/-(\d+)$/)[1]);
+    this.innerHTML = 'Saving...'
+    return false;
+  },
+  
+  '.detach-widget:click': function() {
+    ArticleForm.detachAsset(this.getAttribute('id').match(/-(\d+)$/)[1]);
+    return false;
+  },
+
   'a.theme_dialog:click': function() {
     var img = this.down('img');
     var pieces = img.src.split('/');
diff -Nur mephisto-0.7.3/public/stylesheets/mephisto/mephisto.css technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/stylesheets/mephisto/mephisto.css
--- mephisto-0.7.3/public/stylesheets/mephisto/mephisto.css	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/public/stylesheets/mephisto/mephisto.css	2008-03-31 02:18:56.000000000 -0400
@@ -1199,6 +1199,14 @@
   text-align: center;
   border-top: 1px solid #ccc;
   padding: 10px 0;
+  font-weight:bold;
+}
+
+#main p.total {
+  margin:-0.3em 0 1.2em 0;
+  padding: 0.3em 3em;
+  background: #eee;
+  text-align:center;
 }
 
 
@@ -1305,29 +1313,75 @@
  *=ASSET MANAGEMENT
  */
 
-#assets, #files, #latest-assets, #bucket-assets, #search-assets {
+#assets, #files, ul.asset-list {
   list-style: none;
   margin-top: 5px;
 }
 
-#assets li, #files li, #latest-assets li, #bucket-assets li, #search-assets li {
+#assets li, #files li, ul.asset-list li {
   display: inline;
+  white-space: no-wrap;
   margin-left: 5px;
   margin-bottom: 5px;
 }
 
-#assets li a img,
+#attached-assets li {
+  display:block;
+}
+
+#attached-assets li div {
+  position:relative;
+}
+
+#attached-assets li div a {
+  display:inline;
+}
+
+#attached-assets div input.txt {
+  width:125px;
+}
+
+#attached-assets div span {
+  position:absolute;
+  top:20px;  right:8px;
+}
+
+ul.asset-list .widget {
+  position:relative;
+}
+
+.widget .attach-widget {
+  z-index:500;
+  position:absolute;
+  top:-13px; left:-23px;
+}
+
+.widget .detach-widget {
+  z-index:500;
+  position:absolute;
+  top:-36px; left:-23px;
+}
+
+#attached-assets .widget .attach-widget {
+  position:absolute;
+  top:11px; left:-23px;
+}
+
+#attached-assets .widget .detach-widget {
+  position:absolute;
+  top:34px; left:-23px;
+}
+
+#assets        li a img,
 #latest-assets li a img,
 #bucket-assets li a img,
-#search-assets li a img {
+#search-assets li a img,
+ul.asset-list  li a img {
   padding: 4px;
   background: #fff;
 }
 
-#assets img,
-#latest-assets img,
-#bucket-assets img,
-#search-assets img {
+ul.asset-list img {
   max-height: 50px;
   max-width: 50px;
   padding: 3px;
@@ -1335,6 +1389,10 @@
   border: 1px solid #8BCACD;
 }
 
+ul.asset-list .selected-widget img {
+  border-color:#000;
+}
+
 #assets span,
 #latest-assets span,
 #bucket-assets span,
diff -Nur mephisto-0.7.3/script/spec technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/script/spec
--- mephisto-0.7.3/script/spec	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/script/spec	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
+require 'spec'
+exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))
diff -Nur mephisto-0.7.3/script/spec_server technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/script/spec_server
--- mephisto-0.7.3/script/spec_server	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/script/spec_server	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../rspec/lib' # For svn
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin
+require 'rubygems'
+require 'drb/drb'
+require 'rbconfig'
+require 'spec'
+require 'optparse'
+
+# This is based on Florian Weber's TDDMate
+module Spec
+  module Runner
+    class RailsSpecServer
+      def run(argv, stderr, stdout)
+        $stdout = stdout
+        $stderr = stderr
+
+        base = ActiveRecord::Base
+        def base.clear_reloadable_connections!
+          active_connections.each do |name, conn|
+            if conn.requires_reloading?
+              conn.disconnect!
+              active_connections.delete(name)
+            end
+          end
+        end        
+
+        if ::Dispatcher.respond_to?(:cleanup_application)
+          ::Dispatcher.cleanup_application
+        elsif ::Dispatcher.respond_to?(:reset_application!)
+          ::Dispatcher.reset_application!
+        end
+        ::Dependencies.mechanism = :load
+        require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
+        load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
+
+        ::Spec::Runner::CommandLine.run(
+          ::Spec::Runner::OptionParser.parse(
+            argv,
+            $stderr,
+            $stdout
+          )
+        )
+      end
+    end
+  end
+end
+puts "Loading Rails environment"
+
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'dispatcher'
+
+def restart_test_server
+  puts "restarting"
+  config       = ::Config::CONFIG
+  ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+  command_line = [ruby, $0, ARGV].flatten.join(' ')
+  exec(command_line)
+end
+
+def daemonize(pid_file = nil)
+  return yield if $DEBUG
+  pid = Process.fork{
+    Process.setsid
+    Dir.chdir(RAILS_ROOT)
+    trap("SIGINT"){ exit! 0 }
+    trap("SIGTERM"){ exit! 0 }
+    trap("SIGHUP"){ restart_test_server }
+    File.open("/dev/null"){|f|
+      STDERR.reopen f
+      STDIN.reopen  f
+      STDOUT.reopen f
+    }
+    yield
+  }
+  puts "spec_server launched. (PID: %d)" % pid
+  File.open(pid_file,"w"){|f| f.puts pid } if pid_file
+  exit! 0
+end
+
+options = Hash.new
+opts = OptionParser.new
+opts.on("-d", "--daemon"){|v| options[:daemon] = true }
+opts.on("-p", "--pid PIDFILE"){|v| options[:pid] = v }
+opts.parse!(ARGV)
+
+puts "Ready"
+exec_server = lambda {
+  trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2")
+  DRb.start_service("druby://localhost:8989", Spec::Runner::RailsSpecServer.new)
+  DRb.thread.join
+}
+
+if options[:daemon]
+  daemonize(options[:pid], &exec_server)
+else
+  exec_server.call
+end
diff -Nur mephisto-0.7.3/spec/controllers/plugin_routing_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/controllers/plugin_routing_spec.rb
--- mephisto-0.7.3/spec/controllers/plugin_routing_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/controllers/plugin_routing_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+# cant get this working with autotest for some reason
+# invoking the spec manually will work though
+
+# require File.join(File.dirname(__FILE__), '/../../config/boot')
+# 
+# Rails::Configuration.send(:define_method, :plugin_paths) do
+#   ["#{RAILS_ROOT}/vendor/plugins", "#{RAILS_ROOT}/vendor/plugins/engines_config/test/plugins"]
+# end
+# 
+# require File.dirname(__FILE__) + '/../spec_helper'
+# 
+# describe "Mephisto::Plugin routing" do
+#   controller_name 'mephisto'
+# 
+#   it "should work" do
+#     route_for(:controller => "somethings", :action => "index").should == "/something"
+#   end
+# end
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/filters/absolute_url_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/filters/absolute_url_spec.rb
--- mephisto-0.7.3/spec/filters/absolute_url_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/filters/absolute_url_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Mephisto::Liquid::UrlMethods, "#absolute_url" do
+  it "has root absolute url" do
+    absolute_url.should == '/'
+  end
+  
+  it "joins url pieces" do
+    absolute_url(:foo).should                   == '/foo'
+    absolute_url(:foo, :bar).should             == '/foo/bar'
+    absolute_url(:foo, :bar, 'baz.html').should == '/foo/bar/baz.html' 
+  end
+  
+  it "joins relative path" do
+    absolute_url('foo/bar/baz.html').should == '/foo/bar/baz.html'
+  end
+  
+  it "joins absolute path" do
+    absolute_url('/foo/bar/baz.html').should == '/foo/bar/baz.html'
+  end
+  
+  it "joins path ending with a slash" do
+    absolute_url('foo/bar/baz/').should == '/foo/bar/baz'
+  end
+end
+
+describe Mephisto::Liquid::UrlMethods, "#absolute_url (with custom url root)" do
+  class << self
+    attr_accessor :relative_url_root
+  end
+  
+  before do
+    stub!(:relative_url_root).and_return("/blog")
+  end
+
+  it "has root absolute url" do
+    absolute_url.should == '/blog/'
+  end
+  
+  it "joins url pieces" do
+    absolute_url(:foo).should                   == '/blog/foo'
+    absolute_url(:foo, :bar).should             == '/blog/foo/bar'
+    absolute_url(:foo, :bar, 'baz.html').should == '/blog/foo/bar/baz.html' 
+  end
+  
+  it "joins relative path" do
+    absolute_url('foo/bar/baz.html').should == '/blog/foo/bar/baz.html'
+  end
+  
+  it "joins absolute path" do
+    absolute_url('/foo/bar/baz.html').should == '/foo/bar/baz.html'
+  end
+  
+  it "joins path ending with a slash" do
+    absolute_url('foo/bar/baz/').should == '/blog/foo/bar/baz'
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/model_stubs.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/model_stubs.rb
--- mephisto-0.7.3/spec/model_stubs.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/model_stubs.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+ModelStubbing.define_models do
+  # only put minimal, core models in here if specs require interaction
+  # with lots of models
+  
+  time 2007, 6, 15
+  
+  model Site do
+    stub :title => "Mephisto", :host => 'test.host', :filter => 'textile_filter', :approve_comments => false,
+      :comment_age => 30, :timezone => "America/New_York", :articles_per_page => 15, :permalink_style => ":year/:month/:day/:permalink",
+      :tag_path => 'tags', :search_path => 'search', :current_theme_path => 'current'
+  end
+  
+  model User do
+    stub :login => 'quentin', :email => 'quentin@example.com', :filter => 'textile_filter', :token => 'quentintoken', :admin => true,
+      :salt => '7e3041ebc2fc05a40c60028e2c4901a81035d3cd', :crypted_password => '00742970dc9e6319f8019fd54864d3ea740f04b1'
+  end
+  
+  # model Article do
+  #   stub :title => 'foobar'
+  # end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/models/comment_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/comment_spec.rb
--- mephisto-0.7.3/spec/models/comment_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/comment_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+
+describe Comment, "previewing" do
+  define_models do
+    time 2007, 6, 15
+
+    model Site do
+      stub :cupcake, :title => "Cupcake", :host => 'cupcake.com'
+    end
+    model Article do
+      stub :welcome, :title => "Welcome!", :body => "Hi there", :filter => "textile_filter", :site => all_stubs(:site), :created_at => current_time - 3.days, :published_at => current_time - 2.days, :comment_age => 0
+    end
+  end
+    
+  before do
+    @comment = Comment.new :author => "1", :author_ip => "127.0.0.1", :body => "No answer"
+    @comment.article = contents(:welcome)
+  end
+  
+  it "should be valid" do
+    @comment.should be_valid
+  end
+  
+  it "raises Previewing error when preview accessor is set" do
+    @comment.preview = true
+    lambda{
+      @comment.save!
+    }.should raise_error(Comment::Previewing)
+  end
+
+end
+
+describe Comment, "textilizing" do
+  define_models do
+    model Site do
+      stub :cupcake, :title => "Cupcake", :host => 'cupcake.com'
+    end
+    model Article do
+      stub :welcome, :title => "Welcome!", :body => "Hi there", :filter => "textile_filter", :site => all_stubs(:site), :created_at => current_time - 3.days, :published_at => current_time - 2.days, :comment_age => 0
+    end
+  end
+   
+  # Copied from tests, in the hope that more people will PDI and convert the test::unit
+  # tests to RSpec. 
+  it "processes comments with textile, if the article is textile-formatted" do
+    @comment = Comment.new :author => "1", :author_ip => "127.0.0.1", :body => "*test* comment"
+    @comment.article = contents(:welcome)
+    @comment.save
+    @comment.body_html.should == "<p><strong>test</strong> comment</p>"
+  end
+
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/models/membership_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/membership_spec.rb
--- mephisto-0.7.3/spec/models/membership_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/membership_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Membership do
+  define_models do
+    model Site do
+      stub :cupcake, :title => "Cupcake", :host => 'cupcake.com'
+    end
+    
+    model User do
+      stub :non_admin, :login => 'arthur', :admin => false
+      stub :deleted,   :login => "aaron",  :admin => false, :deleted_at => current_time - 5.minutes
+    end
+    
+    model Membership do
+      stub :admin_on_default,   :site => all_stubs(:site),         :user => all_stubs(:user),           :admin => true
+      stub :admin_on_cupcake,   :site => all_stubs(:cupcake_site), :user => all_stubs(:user),           :admin => true
+      stub :user_on_default,    :site => all_stubs(:site),         :user => all_stubs(:non_admin_user), :admin => false
+      stub :deleted_on_default, :site => all_stubs(:site),         :user => all_stubs(:deleted_user),   :admin => false
+    end
+  end
+  
+  it "finds user sites" do
+    users(:default).sites.sort_by { |s| s.title }.should == [sites(:cupcake), sites(:default)]
+  end
+  
+  it "finds site members" do
+    sites(:default).members.sort_by { |u| u.login }.should == [users(:non_admin), users(:default)]
+    User.find_all_by_site(sites(:default)).sort_by { |u| u.login }.should == [users(:non_admin), users(:default)]
+  end
+
+  it "finds site admins" do
+    sites(:default).admins.should == [users(:default)]
+  end
+  
+  it "finds all users with deleted" do
+    sites(:default).users_with_deleted.sort_by { |u| u.login }.should == [users(:deleted), users(:non_admin), users(:default)]
+    User.find_all_by_site_with_deleted(sites(:default)).sort_by { |u| u.login }.should == [users(:deleted), users(:non_admin), users(:default)]
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/models/plugin_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/plugin_spec.rb
--- mephisto-0.7.3/spec/models/plugin_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/plugin_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,41 @@
+# cant get this working with autotest for some reason
+# invoking the spec manually will work though
+
+require File.join(File.dirname(__FILE__), '/../../config/boot')
+
+Rails::Configuration.send(:define_method, :plugin_paths) do
+  ["#{RAILS_ROOT}/vendor/plugins", "#{RAILS_ROOT}/vendor/plugins/engines_config/test/plugins"]
+end
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Mephisto::Plugin do
+  def plugin_alpha
+    Engines.plugins['plugin_alpha']
+  end
+  
+  it "should filter plugin list and return mephisto plugins" do
+    Engines.plugins.size.should > Mephisto.plugins.size
+  end
+  
+  it "should be a mephisto plugin when its name starts with 'mephisto_'" do
+    Mephisto.plugins.each {|p| p.name.should =~ /^mephisto_/ }
+  end
+  
+  it "should be configurable when at least one option is defined" do
+    plugin_alpha.configurable?.should be_true
+    Engines.plugins['engines'].configurable?.should be_false
+  end
+  
+  it "should allow to add tabs" do
+    Mephisto::Plugin.tabs.clear
+    plugin_alpha.add_tab :something
+    Mephisto::Plugin.tabs.first.first.should == :something
+  end
+  
+  it "should allow to add admin tabs" do
+    Mephisto::Plugin.admin_tabs.clear
+    plugin_alpha.add_admin_tab :something
+    Mephisto::Plugin.admin_tabs.first.first.should == :something
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/models/site_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/site_spec.rb
--- mephisto-0.7.3/spec/models/site_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/site_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Site do
+  define_models do
+    
+    model Site do
+      stub :destroy, :host => 'destroy.com'
+    end
+    
+    model User do
+      stub :destroy, :login => 'destroy'
+    end
+    
+    model Membership do
+      stub :destroy, :site => all_stubs(:destroy_site), :user => all_stubs(:destroy_user)
+    end
+  end
+
+  it "should delete memberships on destruction" do
+    sites(:destroy).memberships.should == [memberships(:destroy)] 
+    lambda { sites(:destroy).destroy }.should change(Membership, :count).by(-1)
+  end
+  
+end
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Site do
+  define_models do
+    
+    model Site do
+      stub :destroy, :host => 'destroy.com'
+    end
+    
+    model User do
+      stub :destroy, :login => 'destroy'
+    end
+    
+    model Membership do
+      stub :destroy, :site => all_stubs(:destroy_site), :user => all_stubs(:destroy_user)
+    end
+  end
+
+  it "should delete memberships on destruction" do
+    sites(:destroy).memberships.should == [memberships(:destroy)] 
+    lambda { sites(:destroy).destroy }.should change(Membership, :count).by(-1)
+  end
+  
+end
+require File.dirname(__FILE__) + '/../spec_helper'
+describe Site do
+  define_models do
+    
+    model Site do
+      stub :destroy, :host => 'destroy.com'
+    end
+    
+    model User do
+      stub :destroy, :login => 'destroy'
+    end
+    
+    model Membership do
+      stub :destroy, :site => all_stubs(:destroy_site), :user => all_stubs(:destroy_user)
+    end
+  end
+
+  it "should delete memberships on destruction" do
+    sites(:destroy).memberships.should == [memberships(:destroy)] 
+    lambda { sites(:destroy).destroy }.should change(Membership, :count).by(-1)
+  end
+  
+end
diff -Nur mephisto-0.7.3/spec/models/tag_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/tag_spec.rb
--- mephisto-0.7.3/spec/models/tag_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/models/tag_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+ModelStubbing.define_models :tags, :copy => false do
+  model Tag do
+    [:ruby, :rails, :mongrel, :plugin].each do |t|
+      stub t, :name => t.to_s
+    end
+  end
+end
+
+describe Tag, "#parse" do
+  define_models :tags
+
+  it "parses comma separated tags" do
+    Tag.parse('a,b,c').should  == %w(a b c)
+    Tag.parse('a, b c').should == %w(a b\ c)
+  end
+
+  it "parses simple tags" do
+    Tag.parse('"a" "b" "c"').should == %w(a b c)
+  end
+
+  it "parses space delimited tags" do
+    Tag.parse('a b c').should == %w(a b c)
+  end
+
+  it "parses tags with double quotes" do
+    Tag.parse('tagging, it"s, weirdness').should == %w(tagging it"s weirdness)
+  end
+  
+  it "parses tags with single quotes" do
+    Tag.parse('"tagging" "it\'s" "weirdness"').should == %w(tagging it's weirdness)
+  end
+  
+  it "parses tags with quotes and spaces" do
+    Tag.parse('"tagging" "it\'s weirdness"').should == %w(tagging it's\ weirdness)
+  end
+  
+  it "returns tag array" do
+    Tag.parse(%w(a b c)).should == %w(a b c)
+  end
+  
+  it "returns unique tags" do
+    ["a, b, b", %("a" "b" " b ")].each do |input|
+      Tag.parse(input).should == %w(a b)
+    end
+  end
+end
+
+describe Tag do
+  define_models :tags
+
+  it "finds or creates tags" do
+    lambda { Tag.find_or_create %w(ruby rails foo) }.should change { Tag.count }.by(1)
+  end
+  
+  it "creates tags from comma separated list" do
+    lambda { Tag.parse_to_tags 'ruby, a, b, rails, c' }.should change { Tag.count }.by(3)
+  end
+  
+  it "equals tags of the same name" do
+    tags(:ruby).should == 'ruby'
+    tags(:ruby).should == Tag.new(:name => "ruby")
+  end
+  
+  it "selects tags by name" do
+    Tag[:ruby].should == tags(:ruby)
+  end
+end
diff -Nur mephisto-0.7.3/spec/rcov.opts technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/rcov.opts
--- mephisto-0.7.3/spec/rcov.opts	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/rcov.opts	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+--exclude "spec/*,gems/*" 
+--rails
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/spec.opts technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/spec.opts
--- mephisto-0.7.3/spec/spec.opts	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/spec.opts	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+--colour
+--format
+progress
+--loadby
+mtime
+--reverse
+--backtrace
\ No newline at end of file
diff -Nur mephisto-0.7.3/spec/spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/spec_helper.rb
--- mephisto-0.7.3/spec/spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/spec/spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,15 @@
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'spec'
+require 'spec/rails'
+require 'ruby-debug'
+require 'model_stubbing/spec'
+require File.join(File.dirname(__FILE__), 'model_stubs')
+
+Spec::Runner.configure do |config|
+  config.use_transactional_fixtures = true
+  config.use_instantiated_fixtures  = false
+end
+
+Debugger.start
\ No newline at end of file
diff -Nur mephisto-0.7.3/stories/all.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/stories/all.rb
--- mephisto-0.7.3/stories/all.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/stories/all.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+dir = File.dirname(__FILE__)
+Dir[File.expand_path("#{dir}/**/*.rb")].uniq.each do |file|
+  require file
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/stories/helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/stories/helper.rb
--- mephisto-0.7.3/stories/helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/stories/helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'spec/rails/story_adapter'
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/actor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/actor.rb
--- mephisto-0.7.3/test/actor.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/actor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -51,23 +51,23 @@
       end
 
       def revise(article, contents)
-        post "/admin/articles/update/#{article.id}", to_article_params(article, contents.is_a?(Hash) ? contents : {:body => contents})
-        assert_redirected_to "/admin/articles/edit/#{assigns(:article).id}"
+        put "/admin/articles/#{article.id}", to_article_params(article, contents.is_a?(Hash) ? contents : {:body => contents})
+        assert_redirected_to "/admin/articles/#{assigns(:article).id}/edit"
       end
 
       def remove_article(article)
-        post "/admin/articles/destroy/#{article.id}"
+        delete "/admin/articles/#{article.id}"
         assert_equal 200, status, "Removing article #{article.id}"
       end
 
       def create(params)
-        post '/admin/articles/create', to_article_params(params)
-        assert_redirected_to "/admin/articles/edit/#{assigns(:article).id}"
+        post '/admin/articles', to_article_params(params)
+        assert_redirected_to "/admin/articles/#{assigns(:article).id}/edit"
       end
 
       private
         def manage_comment(action, comment)
-          post "/admin/articles/#{action}/#{comment.article_id}", :comment => comment.id
+          post "/admin/articles/#{comment.article_id}/comments/#{comment.id}/#{action}", :comment => comment.id
         end
 
         def to_article_params(*args)
diff -Nur mephisto-0.7.3/test/fixtures/assigned_assets.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/assigned_assets.yml
--- mephisto-0.7.3/test/fixtures/assigned_assets.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/assigned_assets.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,25 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+welcome_gif:
+  id: 1
+  article_id: 1
+  asset_id: 1
+  position: 1
+  label: welcome image
+  created_at: <%= 2.minutes.ago.to_s :db %>
+  active: true
+welcome_mp3:
+  id: 2
+  article_id: 1
+  asset_id: 3
+  position: 2
+  label: podcast
+  created_at: <%= 1.minute.ago.to_s :db %>
+  active: true
+welcome_png:
+  id: 3
+  article_id: 1
+  asset_id: 2
+  position: 3
+  label: png
+  created_at: <%= 90.seconds.ago.to_s :db %>
+  active: false
diff -Nur mephisto-0.7.3/test/fixtures/assigned_sections.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/assigned_sections.yml
--- mephisto-0.7.3/test/fixtures/assigned_sections.yml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/assigned_sections.yml	2008-03-31 02:18:56.000000000 -0400
@@ -45,4 +45,24 @@
   id: 9
   article_id: 11
   section_id: 1
-  position: 5
\ No newline at end of file
+  position: 5
+draft_about:
+  id: 10
+  article_id: 11
+  section_id: 2
+  position: 4
+future_about:
+  id: 11
+  article_id: 5
+  section_id: 2
+  position: 5
+paged_section_article_1:
+  id: 12
+  article_id: 16
+  section_id: 10
+  position: 1
+paged_section_article_2:
+  id: 13
+  article_id: 17
+  section_id: 10
+  position: 2
diff -Nur mephisto-0.7.3/test/fixtures/contents.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/contents.yml
--- mephisto-0.7.3/test/fixtures/contents.yml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/contents.yml	2008-03-31 02:18:56.000000000 -0400
@@ -43,8 +43,8 @@
   article_id: 1
   title: Welcome to Mephisto
   permalink: welcome-to-mephisto
-  body: "rico's evil <script>hi</script> and <a onclick=\"foo\" href=\"#\">linkage</a>"
-  body_html: "<p>rico&#8217;s evil <script>hi</script> and <a onclick=\"foo\" href=\"#\">linkage</a></p>"
+  body: "rico's evil script <script>hi</script> and <a onclick=\"foo\" href=\"#\">linkage</a> <scrip\nt>alert!"
+  body_html: "<p>rico&#8217;s evil script <script>hi</script> and <a onclick=\"foo\" href=\"#\">linkage</a></p><\nscrip\nt>alert!"
   created_at: <%= (3.days + 55.minutes).ago.utc.to_s(:db) %>
   updated_at: <%= (3.days + 55.minutes).ago.utc.to_s(:db) %>
   published_at: <%= 3.days.ago.utc.to_s(:db) %>
@@ -199,6 +199,32 @@
   permalink: at-beginning-of-next-month
   body: Lalala
   body_html: Lalala
+  created_at: <%= date = Time.now.utc.beginning_of_month.advance(:months => -1, :minutes => 2).to_s(:db) %>
+  updated_at: <%= date %>
+  published_at: <%= date %>
+  comment_age: 30
+  user_id: 1
+  type: Article
+article_1_only_in_page_section:
+  id: 16
+  site_id: 1
+  title: Article 1
+  permalink: article-1
+  body: Lalala
+  body_html: Lalala
+  created_at: <%= date = Time.now.utc.beginning_of_month.advance(:months => -1, :minutes => 1).to_s(:db) %>
+  updated_at: <%= date %>
+  published_at: <%= date %>
+  comment_age: 30
+  user_id: 1
+  type: Article
+article_2_only_in_page_section:
+  id: 17
+  site_id: 1
+  title: Article 2
+  permalink: article-2
+  body: Lalala
+  body_html: Lalala
   created_at: <%= date = Time.now.utc.beginning_of_month.advance(:months => -1).to_s(:db) %>
   updated_at: <%= date %>
   published_at: <%= date %>
diff -Nur mephisto-0.7.3/test/fixtures/mephisto_plugins.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/mephisto_plugins.yml
--- mephisto-0.7.3/test/fixtures/mephisto_plugins.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/mephisto_plugins.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+whammy_jammy:
+  id: 1
+  name: plugin_whammy_jammy
+  type: PluginWhammyJammy
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/fixtures/plugins/lib/test_plugin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/plugins/lib/test_plugin.rb
--- mephisto-0.7.3/test/fixtures/plugins/lib/test_plugin.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/plugins/lib/test_plugin.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,12 @@
+module Mephisto
+  module Plugins
+    class TestPlugin < Mephisto::Plugin
+      homepage 'http://foo.com'
+      author 'Captain Problematic'
+      version 'deathstar'
+    
+      option :config, 'one' => 'test'
+      option :notes, 'notes'
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/fixtures/sections.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/sections.yml
--- mephisto-0.7.3/test/fixtures/sections.yml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/sections.yml	2008-03-31 02:18:56.000000000 -0400
@@ -7,6 +7,7 @@
   articles_count: 3
   template: home.liquid
   archive_path: archives
+  position: 1
 about:
   id: 2
   site_id: 1
@@ -16,6 +17,7 @@
   articles_count: 3
   template: page.liquid
   archive_path: archives
+  position: 2
 cupcake_home:
   id: 3
   site_id: 2
@@ -25,6 +27,7 @@
   template: home.liquid
   articles_count: 1
   archive_path: archives
+  position: 1
 cupcake_about:
   id: 4
   site_id: 2
@@ -34,6 +37,7 @@
   template: page.liquid
   articles_count: 1
   archive_path: archives
+  position: 2
 earth:
   id: 5
   site_id: 1
@@ -42,6 +46,7 @@
   show_paged_articles: false
   articles_count: 0
   archive_path: archives
+  position: 3
 europe:
   id: 6
   site_id: 1
@@ -50,6 +55,7 @@
   show_paged_articles: false
   articles_count: 0
   archive_path: archives
+  position: 4
 africa:
   id: 7
   site_id: 1
@@ -58,6 +64,7 @@
   show_paged_articles: false
   articles_count: 0
   archive_path: archives
+  position: 5
 bucharest:
   id: 8
   site_id: 1
@@ -66,6 +73,7 @@
   show_paged_articles: false
   articles_count: 0
   archive_path: archives
+  position: 6
 links:
   id: 9
   site_id: 1
@@ -75,3 +83,14 @@
   template: page.liquid
   articles_count: 0
   archive_path: archives
+  position: 7
+paged_section:
+  id: 10
+  site_id: 1
+  name: Paged Section
+  path: paged-section
+  show_paged_articles: true
+  template: page.liquid
+  articles_count: 2
+  archive_path: archives
+  position: 8
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/fixtures/sites.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/sites.yml
--- mephisto-0.7.3/test/fixtures/sites.yml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/fixtures/sites.yml	2008-03-31 02:18:56.000000000 -0400
@@ -7,7 +7,7 @@
 first:
   id: 1
   title: Mephisto
-  host: test.com
+  host: test.host
   filter: textile_filter
   approve_comments: false
   comment_age: 30
diff -Nur mephisto-0.7.3/test/functional/admin/admin_nav_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/admin_nav_test.rb
--- mephisto-0.7.3/test/functional/admin/admin_nav_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/admin_nav_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -11,7 +11,7 @@
     @controller = Admin::AssetsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    login_as :quentin
+    login_as :arthur
     get :new
   end
   
@@ -63,3 +63,39 @@
     end
   end
 end
+  
+class Admin::GlobalAdminNavTest < Test::Unit::TestCase
+  fixtures :sites, :users, :memberships
+
+  def setup
+    @old        = Site.multi_sites_enabled
+    @controller = Admin::AssetsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    Site.multi_sites_enabled = true
+    login_as :quentin
+    get :new
+  end
+  
+  def teardown
+    Site.multi_sites_enabled = @old
+  end
+
+  def test_should_show_primary_nav
+    assert_select "#header #nav a" do |anchors|
+      assert_equal %w(Overview Articles Assets), anchors[0..2].collect { |a| a.children.first.content }
+    end
+  end
+
+  def test_should_show_secondary_nav
+    assert_select "#header #nav #nav-r a" do |anchors|
+      assert_equal %w(Sections Design Users), anchors.collect { |a| a.children.first.content }
+    end
+  end
+
+  def test_should_show_user_nav
+    assert_select "#header #sec-nav a" do |anchors|
+      assert_equal %w(Website Settings Sites Account Logout), anchors.collect { |a| a.children.first.content }
+    end
+  end
+end
diff -Nur mephisto-0.7.3/test/functional/admin/articles_controller_assets_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/articles_controller_assets_test.rb
--- mephisto-0.7.3/test/functional/admin/articles_controller_assets_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/articles_controller_assets_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -4,10 +4,10 @@
 # Re-raise errors caught by the controller.
 class Admin::ArticlesController; def rescue_action(e) raise e end; end
 
-class Admin::ArticlesControllerAssetsTest < Test::Unit::TestCase
-  fixtures :contents, :content_versions, :sections, :assigned_sections, :users, :sites, :tags, :taggings, :memberships
+context "Admin Articles Controller Assets" do
+  fixtures :contents, :content_versions, :sections, :assigned_sections, :users, :sites, :tags, :taggings, :memberships, :assigned_assets, :assets
 
-  def setup
+  setup do
     @controller = Admin::ArticlesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
@@ -15,8 +15,8 @@
     FileUtils.mkdir_p ASSET_PATH
   end
 
-  def test_should_upload_asset
-    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+  specify "should upload asset" do
+    asset_count = has_image_processor? ? 3 : 1 # asset + 2 thumbnails
     
     assert_difference Asset, :count, asset_count do
       post :upload, :asset => { :uploaded_data => fixture_file_upload('assets/logo.png', 'image/png') }
@@ -25,8 +25,8 @@
     end
   end
 
-  def test_should_upload_asset_and_redirect_to_article
-    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+  specify "should upload asset and redirect to article" do
+    asset_count = has_image_processor? ? 3 : 1 # asset + 2 thumbnails
     
     assert_difference Asset, :count, asset_count do
       post :upload, :id => contents(:welcome).id, 
@@ -37,8 +37,8 @@
     end
   end
 
-  def test_should_upload_asset_as_member
-    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+  specify "should upload asset as member" do
+    asset_count = has_image_processor? ? 3 : 1 # asset + 2 thumbnails
     
     login_as :ben
     assert_difference Asset, :count, asset_count do
@@ -48,8 +48,8 @@
     end
   end
 
-  def test_should_upload_asset_and_redirect_to_article_as_member
-    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+  specify "should upload asset and redirect to article as member" do
+    asset_count = has_image_processor? ? 3 : 1 # asset + 2 thumbnails
     
     login_as :ben
     assert_difference Asset, :count, asset_count do
@@ -61,7 +61,7 @@
     end
   end
 
-  def test_should_not_error_on_new_article_asset_upload
+  specify "should not error on new article asset upload" do
     assert_no_difference Asset, :count do
       post :upload
       assert_response :success
@@ -69,7 +69,7 @@
     end
   end
 
-  def test_should_not_error_on_article_asset_upload
+  specify "should not error on article asset upload" do
     assert_no_difference Asset, :count do
       post :upload, :id => contents(:welcome).id
       assert_response :success
@@ -78,7 +78,7 @@
     end
   end
 
-  def test_should_not_create_article_when_uploading_asset
+  specify "should not create article when uploading asset" do
     Time.mock! Time.local(2005, 1, 1, 12, 0, 0) do
       assert_no_difference Article, :count do
         post :upload, :asset => { :uploaded_data => fixture_file_upload('assets/logo.png', 'image/png') }, 
@@ -94,7 +94,34 @@
     end
   end
 
-  def teardown
+  # TODO: Fails due to asset test deleting asset fixtures
+  specify "should add asset to article" do
+    return if Asset.count == 1
+    assert_difference AssignedAsset, :count do
+      post :attach, :id => contents(:welcome).id, :version => assets(:mov).id
+    end
+    assert_models_equal [assets(:gif), assets(:mp3), assets(:mov)], contents(:welcome).assets(true)
+  end
+  
+  # TODO: Fails due to asset test deleting asset fixtures
+  specify "should add inactive asset to article" do
+    return if Asset.count == 1
+    assert_no_difference AssignedAsset, :count do
+      post :attach, :id => contents(:welcome).id, :version => assets(:png).id
+    end
+    assert_models_equal [assets(:gif), assets(:mp3), assets(:png)], contents(:welcome).assets(true)
+  end
+
+  # TODO: Fails due to asset test deleting asset fixtures
+  specify "should find deactivate article assets" do
+    return if Asset.count == 1
+    assert_no_difference AssignedAsset, :count do
+      post :detach, :id => contents(:welcome).id, :version => assets(:mp3).id
+    end
+    assert_models_equal [assets(:gif)], contents(:welcome).assets
+  end
+
+  teardown do
     FileUtils.rm_rf ASSET_PATH
   end
 end
diff -Nur mephisto-0.7.3/test/functional/admin/articles_controller_permissions_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/articles_controller_permissions_test.rb
--- mephisto-0.7.3/test/functional/admin/articles_controller_permissions_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/articles_controller_permissions_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -16,7 +16,7 @@
 
   def test_should_show_articles
     get :index
-    assert_equal 10, assigns(:articles).length
+    assert_equal 12, assigns(:articles).length
   end
 
   def test_should_show_new_article_form
diff -Nur mephisto-0.7.3/test/functional/admin/articles_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/articles_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/articles_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/articles_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -28,12 +28,12 @@
   
   def test_should_show_articles
     get :index
-    assert_equal 10, assigns(:articles).length
+    assert_equal 12, assigns(:articles).length
   end
   
   def test_should_show_articles_with_empty_seartest_should_show_checked_sectionsch
     get :index, :q => '', :filter => 'title', :section => '0'
-    assert_equal 10, assigns(:articles).length
+    assert_equal 12, assigns(:articles).length
   end
 
   def test_should_search_article_titles
@@ -57,7 +57,7 @@
   def test_should_search_article_by_section
     get :index, :filter => 'section', :section => '2'
     assert_response :success
-    assert_models_equal [contents(:welcome), contents(:about), contents(:site_map)], assigns(:articles)
+    assert_models_equal [contents(:future), contents(:welcome), contents(:about), contents(:site_map), contents(:draft)], assigns(:articles)
   end
 
   def test_should_search_article_by_section_and_title
@@ -125,7 +125,7 @@
   def test_should_show_default_checked_sections
     get :new
     assert_response :success
-    assert_tag    'form',  :attributes => { :action => '/admin/articles/create' }
+    assert_tag    'form',  :attributes => { :action => '/admin/articles', :method => 'post' }
     assert_tag    'input', :attributes => { :id => "article_section_ids_#{sections(:home).id.to_s}" }
     assert_no_tag 'input', :attributes => { :id => "article_section_ids_#{sections(:about).id.to_s}", :checked => 'checked' }
   end
@@ -162,7 +162,7 @@
   def test_should_show_available_years_for_old_article
     contents(:welcome).update_attribute(:published_at, Time.utc(2003,1,1))
     get :edit, :id => contents(:welcome).id
-    (2003..Time.now.utc.year).to_a.each do |year|
+    (2003..2007).to_a.each do |year|
       assert_select "select[name='article[published_at(1i)]'] option[value='#{year}']"
     end
   end
@@ -182,7 +182,9 @@
   def test_edit_form_should_have_correct_post_action
     get :edit, :id => contents(:welcome).id
     assert_response :success
-    assert_tag :tag => 'form', :attributes => { :action => "/admin/articles/update/#{contents(:welcome).id}" }    
+    assert_tag :tag => 'form', :attributes => { :action => "/admin/articles/#{contents(:welcome).id}" } do
+      assert_tag :tag => 'input', :attributes => { :name => "_method", :value => "put" }
+    end
   end
 
   def test_should_update_article_with_correct_time
diff -Nur mephisto-0.7.3/test/functional/admin/assets_controller_permissions_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/assets_controller_permissions_test.rb
--- mephisto-0.7.3/test/functional/admin/assets_controller_permissions_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/assets_controller_permissions_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -21,7 +21,7 @@
   end
   
   def test_should_upload_and_create_asset_records
-    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+    asset_count = has_image_processor? ? 3 : 1 # asset + 2 thumbnails
     
     assert_difference sites(:first).assets, :count do
       assert_difference Asset, :count, asset_count do
@@ -29,7 +29,7 @@
         assert_equal users(:ben).id, assigns(:assets).first.user_id
         assert_equal 'logo.png', assigns(:assets).first.title
         assert_match /logo\.png/, flash[:notice]
-        assert_redirected_to asset_path
+        assert_redirected_to assets_path
       end
     end
   end
@@ -74,7 +74,7 @@
     assert_response :success
     assert_match /Flash\.notice/, @response.body
     assert_equal 1, session[:bucket].size
-    assert_kind_of Array, session[:bucket][assets(:gif).public_filename]
+    assert_kind_of Array, session[:bucket][assets(:gif).id]
   end
 
   def test_should_clear_bucket
diff -Nur mephisto-0.7.3/test/functional/admin/assets_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/assets_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/assets_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/assets_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -21,14 +21,14 @@
   end
   
   def test_should_upload_and_create_asset_records
-    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+    asset_count = has_image_processor? ? 3 : 1 # asset + 2 thumbnails
     
     assert_difference sites(:first).assets, :count do
       assert_difference Asset, :count, asset_count do
         process_upload ['logo.png']
         assert_equal 'logo.png', assigns(:assets).first.title
         assert_match /logo\.png/, flash[:notice]
-        assert_redirected_to asset_path
+        assert_redirected_to assets_path
       end
     end
   end
@@ -53,12 +53,12 @@
   end
 
   def test_should_upload_multiple_assets_and_ignore_titles
-    asset_count = Object.const_defined?(:Magick) ? 6 : 2 # asset + 2 thumbnails
+    asset_count = has_image_processor? ? 6 : 2 # asset + 2 thumbnails
     assert_difference sites(:first).assets, :count, 2 do
       assert_difference Asset, :count, asset_count do
         process_upload %w(logo.png logo.png)
         assert_match /2 assets/, flash[:notice]
-        assert_redirected_to asset_path
+        assert_redirected_to assets_path
       end
     end
   end
@@ -138,16 +138,16 @@
     assert_response :success
     assert_match /Flash\.notice/, @response.body
     assert_equal 1, session[:bucket].size
-    assert_kind_of Array, session[:bucket][assets(:gif).public_filename]
+    assert_kind_of Array, session[:bucket][assets(:gif).id]
   end
 
   def test_should_not_add_duplicate_asset_to_bucket
-    @request.session[:bucket] = {assets(:gif).public_filename => []}
+    @request.session[:bucket] = {assets(:gif).id => []}
     xhr :post, :add_bucket, :id => assets(:gif).id
     assert_response :success
     assert_equal ' ', @response.body
     assert_equal 1, session[:bucket].size
-    assert_kind_of Array, session[:bucket][assets(:gif).public_filename]
+    assert_kind_of Array, session[:bucket][assets(:gif).id]
   end
 
   def test_should_clear_bucket
diff -Nur mephisto-0.7.3/test/functional/admin/assets_controller_upload_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/assets_controller_upload_test.rb
--- mephisto-0.7.3/test/functional/admin/assets_controller_upload_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/assets_controller_upload_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -16,7 +16,7 @@
     Fixtures.delete_existing_fixtures_for(Asset.connection, :assets)
   end
 
-if Object.const_defined?(:Magick)
+if has_image_processor?
   def test_should_sort_assets
     assert_difference sites(:first).assets, :count, 21 do
       assert_difference Asset, :count, 63 do
diff -Nur mephisto-0.7.3/test/functional/admin/comments_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/comments_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/comments_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/comments_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -10,7 +10,7 @@
     @controller = Admin::CommentsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    login_as :ben
+    login_as :quentin
   end
 
   def test_should_disable_comments_on_article
@@ -18,4 +18,60 @@
     assert_equal -1, contents(:welcome).reload.comment_age
     assert_response :success
   end
+
+  def test_should_destroy_comment
+    comment = contents(:welcome_comment)
+    
+    xhr :delete, :destroy, :id => '3', :article_id => '1'
+    assert_response :success
+    assert_equal [comment], assigns(:comments)
+    assert_raise(ActiveRecord::RecordNotFound) { comment.reload }
+  end
+  
+  def test_should_destroy_comments
+    comment = contents(:welcome_comment)
+    
+    xhr :delete, :destroy, :comment => ['3'], :article_id => '1'
+    assert_response :success
+    assert_equal [comment], assigns(:comments)
+    assert_raise(ActiveRecord::RecordNotFound) { comment.reload }
+  end
+
+  def test_should_list_comments_on_article
+    get :index, :article_id => '1'
+    assert_response :success
+  end
+
+  def test_should_list_approved_comments_on_article
+    get :index, :article_id => '1', :filter => 'approved'
+    assert_response :success
+  end
+
+  def test_should_list_unapproved_comments_on_article
+    get :index, :article_id => '1', :filter => 'unapproved'
+    assert_response :success
+  end
+  
+  def test_should_create_comment
+    post :create, :article_id => '1', :comment => {}
+    assert_response :success
+  end
+  
+  def test_should_edit_comment
+    get :edit, :article_id => '1', :id => '3'
+    assert_response :success
+  end
+  
+  def test_should_approve_comment
+    contents(:welcome_comment).update_attribute(:approved, false)
+    xhr :get, :approve, :article_id => '1', :id => '3'
+    assert_response :success
+  end
+
+  def test_should_unapprove_comment
+    xhr :get, :unapprove, :article_id => '1', :id => '3'
+    assert_response :success
+    assert_template 'approve'
+  end
+
 end
diff -Nur mephisto-0.7.3/test/functional/admin/plugins_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/plugins_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/plugins_controller_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/plugins_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'admin/plugins_controller'
+
+class Admin::PluginsControllerTest < Test::Unit::TestCase
+  fixtures :contents, :content_versions, :sections, :assigned_sections, :users, :sites, :tags, :taggings, :memberships
+  @@test_plugin_dir = RAILS_PATH + 'test/fixtures/plugins/lib'
+  @@plugin_dir      = RAILS_PATH + 'vendor/plugins/mephisto_test_plugin'
+  @@plugin_lib_dir  = @@plugin_dir + 'lib'
+
+  def setup
+    @controller = Admin::PluginsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    login_as :quentin
+    
+    #here we create a temporary and simple plugin 
+    FileUtils.mkdir_p(@@plugin_dir)
+    FileUtils.cp_r @@test_plugin_dir, @@plugin_dir
+    $LOAD_PATH << @@plugin_lib_dir.to_s
+    load @@plugin_lib_dir + 'test_plugin.rb'
+  end
+  
+  def teardown
+    $LOAD_PATH.delete @@plugin_lib_dir.to_s
+    FileUtils.rm_rf(@@plugin_dir)
+  end
+  
+  def test_should_list_plugins
+    get :index
+    assert_response :success
+
+    test_dir_plugin = assigns(:plugins).detect { |p| p.path == 'test_plugin' }
+
+    assert test_dir_plugin.configurable?, "Test Plugin is not configurable!"
+  end
+  
+  def test_should_show_plugin
+    assert_not_nil Mephisto::Plugins::TestPlugin.new
+    get :show, :id => 'test_plugin'
+    assert_response :success
+  end
+  
+  def test_should_update_plugin_options
+    get :update, :id => 'test_plugin', :options => { :notes => 'foo bar' }
+    assert_redirected_to :action => "show"
+    
+    assert_equal "foo bar", assigns(:plugin).notes
+  end
+  
+  def test_should_delete_plugin
+    test_should_update_plugin_options
+    get :destroy, :id => 'test_plugin'
+    assert_redirected_to :action => "show"
+    
+    
+    # weird, in the below the assigns hash holds the plugin object from delete
+    # not the second plugin reloaded from show. So I suppose assigns is built by
+    # the get.
+    # I'd like to work out a way to access the plugin object reloaded in the 302 show.
+    #
+    # TODO: Convert to integration test for this
+    #
+    # plugin = assigns["plugin"]
+    # assert_equal "test", plugin.config["one"]
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/functional/admin/sections_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/sections_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/sections_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/sections_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -18,9 +18,9 @@
     get :index
     assert_equal sites(:first), assigns(:site)
     assert_equal sections(:home), assigns(:home)
-    assert_equal 7, assigns(:sections).length, "Sections: #{assigns(:sections).collect(&:id).to_sentence}"
+    assert_equal 8, assigns(:sections).length, "Sections: #{assigns(:sections).collect(&:id).to_sentence}"
     assert_equal 4, assigns(:article_count)['1']
-    assert_equal 3, assigns(:article_count)['2']
+    assert_equal 5, assigns(:article_count)['2']
   end
 
   def test_should_create_blog_section
@@ -67,8 +67,8 @@
 
   def test_should_reorder_articles
     assert_reorder_articles sections(:about),
-      [contents(:welcome), contents(:about), contents(:site_map)],
-      [contents(:about), contents(:site_map), contents(:welcome)]
+      [contents(:welcome), contents(:about), contents(:site_map), contents(:draft), contents(:future)],
+      [contents(:future), contents(:about), contents(:site_map), contents(:welcome), contents(:draft)]
   end
 
   def test_should_destroy_section
@@ -77,8 +77,8 @@
   end
 
   def test_should_reorder_sections
-    assert_reorder_sections [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links)],
-                            [sections(:home), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:about)]
+    assert_reorder_sections [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:paged_section)],
+                            [sections(:home), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:about), sections(:paged_section)]
   end
 
   protected
diff -Nur mephisto-0.7.3/test/functional/admin/settings_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/settings_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/settings_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/settings_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -27,8 +27,7 @@
 
   def test_should_clear_layouts
     login_as :quentin
-    post :update, :site => { :title => 'foo', :search_layout => '-', :tag_layout => '-' }
-    assert_nil sites(:first).reload.search_layout
+    post :update, :site => { :title => 'foo', :tag_layout => '-' }
     assert_nil sites(:first).tag_layout
   end
 
diff -Nur mephisto-0.7.3/test/functional/admin/sites_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/sites_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/sites_controller_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/sites_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+require 'admin/sites_controller'
+
+# Re-raise errors caught by the controller.
+class Admin::SitesController; def rescue_action(e) raise e end; end
+
+class Admin::SitesControllerTest < Test::Unit::TestCase
+  fixtures :users, :sites
+  def setup
+    @controller = Admin::SitesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_should_allow_admin_of_sites
+    login_as :quentin
+    get :index
+    assert_response :success
+  end
+  
+  def test_should_restrict_admin_of_sites
+    login_as :arthur
+    get :index
+    assert_redirected_to :controller => 'account', :action => 'login'
+  end
+
+  def test_should_allow_admin_to_view_site
+    login_as :quentin
+    get :show, :id => sites(:hostess).id.to_s
+    assert_response :success
+  end
+
+  def test_should_create_site
+    login_as :quentin
+    assert_difference Site, :count do
+      post :create, :site => { :host => 'example.com', :email => 'foo@example.com', :title => 'example', :subtitle => 'example site' }
+      assert_redirected_to :action => 'index'
+      assert flash[:notice]
+    end
+  end
+
+  def test_should_show_error_while_creating_site
+    login_as :quentin
+    assert_no_difference Site, :count do
+      post :create, :site => { :host => 'not a valid host' }
+      assert_response :success
+    end
+  end
+
+  def test_should_destroy_site
+    login_as :quentin
+    assert_difference Site, :count, -1 do
+      post :destroy, :id => sites(:hostess).id.to_s
+      assert_redirected_to :action => 'index'
+    end
+  end
+
+end
diff -Nur mephisto-0.7.3/test/functional/admin/themes_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/themes_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/themes_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/themes_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -4,9 +4,10 @@
 # Re-raise errors caught by the controller.
 class Admin::ThemesController; def rescue_action(e) raise e end; end
 
-class Admin::ThemesControllerTest < Test::Unit::TestCase
+context "Admin Themes Controller" do
   fixtures :users, :sections, :sites, :memberships
-  def setup
+  
+  setup do
     @controller = Admin::ThemesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
diff -Nur mephisto-0.7.3/test/functional/admin/users_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/users_controller_test.rb
--- mephisto-0.7.3/test/functional/admin/users_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/admin/users_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -5,7 +5,7 @@
 class Admin::UsersController; def rescue_action(e) raise e end; end
 
 class Admin::UsersControllerTest < Test::Unit::TestCase
-  fixtures :users, :sites, :memberships
+  fixtures :users, :sites, :memberships, :contents
   def setup
     @controller = Admin::UsersController.new
     @request    = ActionController::TestRequest.new
@@ -40,7 +40,7 @@
     login_as :quentin
     assert_difference User, :count do
       assert_difference Membership, :count do
-        post :create, :user => { :login => 'bob', :email => 'foo@example.com', :password => 'testy', :password_confirmation => 'testy', :admin => true }
+        post :create, :user => { :login => 'bob', :email => 'foo@example.com', :password => 'testy', :password_confirmation => 'testy' }
         assert_models_equal [sites(:first)], assigns(:user).sites
         assert_equal assigns(:user), User.authenticate_for(sites(:first), 'bob', 'testy')
         assert_redirected_to :action => 'index'
@@ -114,6 +114,36 @@
     assert_equal 'markdown_filter', users(:quentin).filter
   end
 
+  def test_should_not_permit_promoting_self_to_admin_in_update
+    login_as :arthur, :hostess
+    assert !users(:arthur).admin, "we mean to test with a non-admin user"
+    post :update, :id => users(:arthur).id, :user => { :admin => 'true' }
+    users(:arthur).reload
+    assert !users(:arthur).admin, "user.admin shouldn't change"
+    assert_response :success
+  end
+
+  def test_should_not_permit_changing_own_created_at_in_update
+    login_as :arthur, :hostess
+    prev_time = users(:arthur).created_at
+    post :update, :id => users(:arthur).id, :user => { :created_at => prev_time - 1.year }
+    users(:arthur).reload
+    assert_equal prev_time, users(:arthur).created_at, "user.created_at shouldn't change"
+    assert_response :success
+  end
+
+  def test_should_not_permit_changing_owned_articles_in_update
+    login_as :quentin
+    user = users(:quentin)
+    prev_article_ids = user.article_ids
+    assert prev_article_ids.size > 2, "Test needs more than 2 articles. Pick another user?"
+    #but now we're going to try to own only the first 2 of them...
+    post :update, :id => user.id, :user => { :article_ids => prev_article_ids[0..1] }
+    user.reload
+    assert_equal prev_article_ids, user.article_ids, "user.article_ids[] shouldn't change"
+    assert_response :success
+  end
+
   def test_should_show_deleted_users
     login_as :quentin
     get :index
@@ -137,11 +167,36 @@
     end
   end
 
-  def test_should_disable_site_admin
+  def test_should_toggle_site_admin_as_admin
     login_as :quentin
     xhr :post, :admin, :id => users(:arthur).id
     assert_response :success
     assert !sites(:first).user(users(:arthur).id).site_admin?
+    assert_match /Flash\.notice/, @response.body
+  end
+
+  def test_should_toggle_site_admin_as_site_admin
+    login_as :arthur
+    assert !sites(:first).user(users(:ben).id).site_admin?
+    xhr :post, :admin, :id => users(:ben).id
+    assert_response :success
+    assert sites(:first).user(users(:ben).id).site_admin?
+    assert_match /Flash\.notice/, @response.body
+  end
+
+  def test_should_not_toggle_site_admin_for_admin
+    login_as :arthur
+    xhr :post, :admin, :id => users(:quentin).id
+    assert_response :success
+    assert_match /Flash\.errors/, @response.body
+  end
+
+  def test_should_not_toggle_site_admin_for_self
+    login_as :arthur
+    xhr :post, :admin, :id => users(:arthur).id
+    assert_response :success
+    assert sites(:first).user(users(:arthur).id).site_admin?
+    assert_match /Flash\.errors/, @response.body
   end
 
   def test_should_enable_site_admin
@@ -156,12 +211,35 @@
     login_as :quentin
     assert_no_difference User, :count_with_deleted do
       assert_difference User, :count, -1 do
-        xhr :post, :destroy, :id => users(:quentin).id
+        xhr :post, :destroy, :id => users(:arthur).id
         assert_response :success
+        assert_match /Flash\.notice/, @response.body
       end
     end
     
-    assert_equal users(:quentin), User.find_with_deleted(users(:quentin).id)
+    assert_equal users(:arthur), User.find_with_deleted(users(:arthur).id)
+  end
+
+  def test_should_not_disable_admin
+    login_as :arthur
+    assert_no_difference User, :count_with_deleted do
+      assert_no_difference User, :count do
+        xhr :post, :destroy, :id => users(:quentin).id
+        assert_response :success
+        assert_match /Flash\.errors/, @response.body
+      end
+    end
+  end
+  
+  def test_should_not_disable_self
+    login_as :arthur
+    assert_no_difference User, :count_with_deleted do
+      assert_no_difference User, :count do
+        xhr :post, :destroy, :id => users(:arthur).id
+        assert_response :success
+        assert_match /Flash\.errors/, @response.body
+      end
+    end
   end
 
   def test_should_enable_user
diff -Nur mephisto-0.7.3/test/functional/application_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/application_controller_test.rb
--- mephisto-0.7.3/test/functional/application_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/application_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -12,33 +12,40 @@
 class ApplicationControllerTest < Test::Unit::TestCase
   fixtures :sites
   def setup
-    @sub   = Site.create!(:title => 'sub', :host => 'sub.test.com')
+    @sub   = Site.create!(:title => 'sub', :host => 'sub.test.host')
     @uk    = Site.create!(:title => 'sub', :host => 'sub.test.co.uk')
     @controller = AccountController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
+  
+  def test_should_raise_404_if_no_site
+    Site.delete_all
+    host! 'test.hosts'
+    get :test_host
+    assert_response :missing
+  end
 
   def test_should_find_site_by_host
-    host! 'test.com'
+    host! 'test.host'
     get :test_host
     assert_equal sites(:first), @controller.site
   end
 
   def test_should_find_site_with_www_prefix
-    host! 'www.test.com'
+    host! 'www.test.host'
     get :test_host
     assert_equal sites(:first), @controller.site
   end
   
   def test_should_find_site_by_subdomain_and_host
-    host! 'sub.test.com'
+    host! 'sub.test.host'
     get :test_host
     assert_equal @sub, @controller.site
   end
   
   def test_should_find_site_by_subdomain_and_host_with_www_prefix
-    host! 'www.sub.test.com'
+    host! 'www.sub.test.host'
     get :test_host
     assert_equal @sub, @controller.site
   end
diff -Nur mephisto-0.7.3/test/functional/application_helper_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/application_helper_test.rb
--- mephisto-0.7.3/test/functional/application_helper_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/application_helper_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -55,14 +55,6 @@
     assert_match assets(:png).public_filename, asset_image_for(assets(:png))
   end
 
-  def test_should_not_sanitize_tables
-    assert_equal "&lt;table&gt;", sanitize_feed_content('<table>')
-  end
-
-  def test_should_sanitize_tables
-    assert_equal "&amp;lt;table&gt;", sanitize_feed_content('<table>', true)
-  end
-
   protected
     def asset_image_args_for(*args)
       controller.send(:asset_image_args_for, *args)
diff -Nur mephisto-0.7.3/test/functional/backend_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/backend_controller_test.rb
--- mephisto-0.7.3/test/functional/backend_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/backend_controller_test.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,303 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'meta_weblog_api'
-require 'movable_type_api'
-require 'backend_controller'
-
-# Re-raise errors caught by the controller.
-class BackendController; def rescue_action(e) raise e end; end
-
-class BackendControllerTest < Test::Unit::TestCase
-  fixtures :users, :sections, :assigned_sections, :contents, :sites
-
-  def setup
-    @controller = BackendController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @protocol   = :xmlrpc
-    FileUtils.mkdir_p ASSET_PATH
-  end
-
-  def teardown
-    FileUtils.rm_rf ASSET_PATH
-  end
-
-  # Movable Type Backend Api Tests
-  def test_movable_type_get_category_list
-    # test test_movable_type_get_category_list
-    args = [ 1, 'quentin', 'test' ]
-
-    result = invoke_layered :mt, :getCategoryList, *args
-    assert_equal 'Home', result.first['categoryName']
-  end
-
-  def test_movable_type_get_post_categories
-    # test test_movable_type_get_post_categories
-    args = [ 1, 'quentin', 'test' ]
-
-    result = invoke_layered :mt, :getPostCategories, *args
-    assert_equal %w(About Home), result.collect { |c| c['categoryName'] }
-  end
-
-  def test_movable_type_set_post_categories
-    # test test_movable_type_set_post_categories
-    # this needs some work!! FIXME FIXME FIXME
-
-    c1 = MovableTypeStructs::PostCategory.new(:categoryId => 1, :categoryName => 'Home', :isPrimary => false)
-    c2 = MovableTypeStructs::PostCategory.new(:categoryId => 2, :categoryName => 'About', :isPrimary => false)
-    c3 = MovableTypeStructs::PostCategory.new(:categoryId => 9, :categoryName => 'Links', :isPrimary => false)
-
-    args = [ 1, 'quentin', 'test', [ c1, c2, c3 ]]
-
-    result = invoke_layered :mt, :setPostCategories, *args
-    assert_equal true, result
-
-    # see if the categories have been set
-    args = [ 1, 'quentin', 'test' ]
-
-    result = invoke_layered :mt, :getPostCategories, *args
-    assert_equal ["1","2","9"], result.collect { |c| c['categoryId'] }.sort
-
-    # set the categories back to the default
-    args = [ 1, 'quentin', 'test', [c1,c2] ]
-
-    result = invoke_layered :mt, :setPostCategories, *args
-    assert_equal true, result
-  end
-
-  def test_movable_type_supported_methods
-    # test test_movable_type_supported_methods
-    result = invoke_layered :mt, :supportedMethods
-
-    assert_instance_of Array, result
-  end
-
-  def test_movable_type_supported_text_filters
-    # test test_movable_type_supported_text_filters
-    result = invoke_layered :mt, :supportedTextFilters
-
-    assert_instance_of Array, result
-  end
-
-
-
-  def test_meta_weblog_get_categories
-    args = [ 1, 'quentin', 'test' ]
-
-    result = invoke_layered :metaWeblog, :getCategories, *args
-    assert_equal 'Home', result.first
-  end
-
-  def test_meta_weblog_get_post
-    args = [ 1, 'quentin', 'test' ]
-
-    result = invoke_layered :metaWeblog, :getPost, *args
-    assert_equal 'Welcome to Mephisto', result['title'], result.inspect
-    assert_equal %w(About Home), result['categories']
-  end
-
-  def test_meta_weblog_get_recent_posts
-    args = [ 1, 'quentin', 'test', 2 ]
-
-    articles = invoke_layered :metaWeblog, :getRecentPosts, *args
-    assert_equal %w(test-draft article-in-the-future), articles.collect { |a| a['permaLink'] }, articles.inspect
-  end
-
-  def test_meta_weblog_delete_post
-    args = [ 1, 1, 'quentin', 'test', 1 ]
-
-    assert_difference Article, :count, -1 do
-      result = invoke_layered :metaWeblog, :deletePost, *args
-    end
-  end
-
-  def test_meta_weblog_edit_post
-    post_time            = Time.now.midnight.utc
-    article              = contents(:welcome)
-    article.title        = "Modified!"
-    article.body         = "this is a *test*"
-    article.excerpt      = "* one\n* two\n"
-    article.published_at = post_time
-
-    struct = MetaWeblogService.new(@controller).article_dto_from(article)
-    invoke_layered :metaWeblog, :editPost, contents(:welcome).id, 'quentin', 'test', struct, true
-
-    assert_equal post_time, struct['dateCreated']
-
-    assert_equal 'Modified!', article.reload.title
-    assert_equal "<p>this is a <strong>test</strong></p>", article.body_html, article.inspect
-    assert_equal "<ul>\n\t<li>one</li>\n\t\t<li>two</li>\n\t</ul>", article.excerpt_html, article.inspect
-    assert_equal post_time, article.published_at
-    assert_equal users(:quentin), article.updater
-  end
-
-  def test_meta_weblog_new_post
-    assert_difference Article, :count do
-      article = Article.new
-      article.title = "Posted via Test"
-      article.body = "body"
-      article.excerpt = "extend me"
-      article.published_at = Time.now.midnight.utc
-
-      args = [ 1, 'quentin', 'test', MetaWeblogService.new(@controller).article_dto_from(article), 1 ]
-
-      result = invoke_layered :metaWeblog, :newPost, *args
-      assert result
-      new_post = Article.find(result)
-
-      assert_equal "Posted via Test", new_post.title
-      assert_equal article.body, new_post.body
-      assert_equal "<p>body</p>", new_post.body_html
-      assert_equal "<p>extend me</p>", new_post.excerpt_html
-    end
-  end
-
-  def test_meta_weblog_new_post_tags
-    # test weather we can create a new post, set tags and get away with it...
-    tags = 'blog, emacs, fun, rails, ruby'
-    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
-
-    args = [ 1, 'quentin', 'test', article, 1 ]
-
-    result = invoke_layered :metaWeblog, :newPost, *args
-    # assert result
-    new_post = Article.find(result)
-    assert_equal Tag.parse_to_tags(tags).collect(&:name).sort, new_post.tags.collect(&:name).sort
-  end
-
-  def test_meta_weblog_edit_post_tags
-    # changing tags
-    tags = 'blog, emacs, fun, rails, ruby'
-    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
-    args = [ 1, 'quentin', 'test', article, 1 ]
-    post_id = invoke_layered :metaWeblog, :newPost, *args
-
-    new_post = Article.find(post_id)
-    assert_equal Tag.parse_to_tags(tags).collect(&:name).sort, new_post.tags.collect(&:name).sort
-
-    tags = 'bar, baz, foo'
-    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
-    args = [ post_id, 'quentin', 'test', article, 1]
-    edit_result = invoke_layered :metaWeblog, :editPost, *args
-    assert_equal true, edit_result
-
-    new_post = Article.find(post_id)
-    assert_equal Tag.parse_to_tags(tags).collect(&:name).sort, new_post.tags.collect(&:name).sort
-  end
-
-  def test_meta_weblog_get_post_with_tags
-    # set tags and see if we recive them!
-    tags = 'blog, emacs, fun, rails, ruby'
-    article = MetaWeblogStructs::Article.new(:title => 'This is a title', :description => 'This is a post', :mt_keywords => tags)
-
-    args = [ 1, 'quentin', 'test', article, 1 ]
-    post_id = invoke_layered :metaWeblog, :newPost, *args
-
-    args = [ post_id, 'quentin', 'test' ]
-    result = invoke_layered :metaWeblog, :getPost, *args
-
-    assert_equal tags, result['mt_keywords']
-  end
-
-
-  def test_meta_weblog_new_post_min
-    # This is going to test weather a post is correctly submited or not without the published_at field!
-    # See http://www.xmlrpc.com/metaWeblogApi#theStruct or
-    # See http://www.sixapart.com/developers/xmlrpc/metaweblog_api/metaweblognewpost.html for more information
-    assert_difference Article, :count do
-      article = Article.new
-      article.title = 'This is a title'
-      article.body = 'This is a post'
-
-      args = [ 1, 'quentin', 'test', MetaWeblogService.new(@controller).article_dto_from(article), 1 ]
-
-      result = invoke_layered :metaWeblog, :newPost, *args
-      assert result
-      new_post = Article.find(result)
-
-      assert_equal 'This is a post', new_post.body
-      assert_equal '<p>This is a post</p>', new_post.body_html
-      assert_equal 'This is a title', new_post.title
-      assert_equal :published, new_post.status
-    end
-  end
-
-  def test_meta_weblog_new_post_publish
-    # Test weather publish is set correctly on 1 and true to :published otherwise :pending
-    [{ :set => 1,     :expect => :published },
-     { :set => 0,     :expect => :pending },
-     { :set => true,  :expect => :published},
-     { :set => false, :expect => :pending }].each do |c|
-      assert_difference Article, :count do
-        article = Article.new
-        article.title = 'This is a title'
-        article.body = 'This is a post'
-
-        args = [ 1, 'quentin', 'test', MetaWeblogService.new(@controller).article_dto_from(article), c[:set] ]
-
-        result = invoke_layered :metaWeblog, :newPost, *args
-        assert result
-        new_post = Article.find(result)
-
-        assert_equal 'This is a post', new_post.body
-        assert_equal '<p>This is a post</p>', new_post.body_html
-        assert_equal 'This is a title', new_post.title
-        assert_equal c[:expect], new_post.status
-      end
-    end
-  end
-
-  def test_should_upload_file_via_meta_weblog_new_media_object
-    now = Time.now.utc
-    media_object = new_media_object
-
-    args = [ 1, 'quentin', 'test', media_object ]
-    result = invoke_layered :metaWeblog, :newMediaObject, *args
-    assert result['url'] =~ /#{media_object['name']}$/
-
-    assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, media_object['name'])
-  end
-
-  def test_should_guess_content_type_for_gif
-    media_object = new_media_object 'type' => nil, :name => 'filename.gif'
-    assert_nil media_object['type']
-
-    args = [ 1, 'quentin', 'test', media_object ]
-    result = invoke_layered :metaWeblog, :newMediaObject, *args
-
-    new_asset = Asset.find :first, :order => 'created_at DESC'
-    assert_equal 'image/gif', new_asset.content_type
-  end
-
-  def test_should_guess_content_type_for_jpg
-    media_object = new_media_object 'type' => nil
-    assert_nil media_object['type']
-
-    args = [ 1, 'quentin', 'test', media_object ]
-    result = invoke_layered :metaWeblog, :newMediaObject, *args
-
-    new_asset = Asset.find :first, :order => 'created_at DESC'
-    assert_equal 'image/jpeg', new_asset.content_type
-  end
-
-  def test_should_show_filters
-    result  = invoke_layered :mt, :supportedTextFilters
-    filters = %w(textile_filter markdown_filter smartypants_filter)
-    result.each { |f| filters.include? f[:key] }
-  end
-
-  def test_meta_weblog_fail_authentication
-    args = [ 1, 'quentin', 'using a wrong password', 2 ]
-    # This will be a little more useful with the upstream changes in [1093]
-    assert_raise(XMLRPC::FaultException) { invoke_layered :metaWeblog, :getRecentPosts, *args }
-  end
-
-  protected
-
-    def new_media_object(options = {})
-      MetaWeblogStructs::MediaObject.new(options.reverse_merge!(
-        'name' => Digest::SHA1.hexdigest("upload-test--#{Time.now}--") + ".jpg",
-        'type' => 'image/jpeg',
-        'bits' => Base64.encode64(File.open(File.expand_path(RAILS_ROOT) + '/public/images/mephisto/shadow.png', 'rb') { |f| f.read })
-      ))
-    end
-end
diff -Nur mephisto-0.7.3/test/functional/feed_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/feed_controller_test.rb
--- mephisto-0.7.3/test/functional/feed_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/feed_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -12,14 +12,6 @@
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
-
-  def test_feed_assigns
-    get :feed, :sections => ['about']
-    assert_equal sections(:about), assigns(:section)
-    assert_equal [contents(:welcome), contents(:about), contents(:site_map)], assigns(:articles)
-    assert_select 'feed>title', 'Mephisto - About'
-    assert_atom_entries_size 3
-  end
   
   def test_feed_comes_from_site
     host! 'cupcake.com'
@@ -35,13 +27,12 @@
     assert_models_equal [sections(:cupcake_home)], [assigns(:section)]
     assert_models_equal [contents(:cupcake_welcome)], assigns(:articles)
     assert_atom_entries_size 1
-    assert_tag 'link', :attributes => {:href => 'http://cupcake.com/'}
+    assert_select 'link[href=?]', 'http://cupcake.com/'
   end
   
   def test_should_return_record_not_found_for_bad_feed_urls
-    assert_raise ActiveRecord::RecordNotFound do
-      get :feed, :sections => %w(beastie boys)
-    end
+    get :feed, :sections => %w(beastie boys)
+    assert_equal '404', @response.code
   end
   
   def test_should_find_comments_by_site
@@ -61,8 +52,44 @@
   end
 end
 
+context "About Section Feed" do
+  fixtures :contents, :sections, :assigned_sections, :sites, :users, :assets, :assigned_assets
+  def setup
+    @controller = FeedController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    get :feed, :sections => ['about']
+  end
+
+  specify "should select correct records" do
+    assert_equal sections(:about), assigns(:section)
+    assert_equal [contents(:welcome), contents(:about), contents(:site_map)], assigns(:articles)
+  end
+  
+  specify "should show correct titles" do
+    assert_select 'feed>title', 'Mephisto - About'
+    assert_select 'feed>entry>title', 3 do |titles|
+      assert_equal 'Welcome to Mephisto', titles[0].children.first.content
+      assert_equal 'About this page',     titles[1].children.first.content
+      assert_equal 'The Site Map',        titles[2].children.first.content
+    end
+  end
+  
+  # TODO: Fails due to asset test deleting asset fixtures
+  specify "should show correct links" do
+    return if Asset.count == 1
+    assert_select 'feed>link[href=?][type=?]', 'http://test.host/about', 'text/html'
+    assert_select 'feed>entry>link[href]', 4 do |hrefs|
+      assert_equal "http://test.host/about",                 hrefs[0]['href']
+      assert_match /asset\.mp3$/,                            hrefs[1]['href']
+      assert_equal "http://test.host/about/about-this-page", hrefs[2]['href']
+      assert_equal "http://test.host/about/the-site-map",    hrefs[3]['href']
+    end
+  end
+end
+
 context "Home Section Feed" do
-  fixtures :contents, :sections, :assigned_sections, :sites
+  fixtures :contents, :sections, :assigned_sections, :sites, :assets, :assigned_assets
   def setup
     @controller = FeedController.new
     @request    = ActionController::TestRequest.new
@@ -72,16 +99,30 @@
   end
   
   specify "should show titles" do
-    assert_xpath '/feed/entry[title="Welcome to Mephisto"]'
-    assert_xpath '/feed/entry[title="Another Welcome to Mephisto"]'
+    assert_select 'feed>title', 'Mephisto - Home'
+    assert_select 'feed>entry>title', 2 do |elements|
+      assert_equal 'Welcome to Mephisto',         elements[0].children.first.content
+      assert_equal 'Another Welcome to Mephisto', elements[1].children.first.content
+    end
   end
   
-  specify "show absolute urls" do
-    assert_select 'feed entry link' do
-      assert_select '[href=?]', /^http\:\/\/test\.host\/\d{4}\/.*$/
+  # TODO: Fails due to asset test deleting asset fixtures
+  specify "should show correct links" do
+    return if Asset.count == 1
+    assert_select 'feed>link[href=?][type=?]', 'http://test.host/', 'text/html'
+    assert_select 'feed>entry>link[href]', 3 do |hrefs|
+      assert_match /\/welcome-to-mephisto$/,         hrefs[0]['href']
+      assert_match /asset\.mp3$/,                    hrefs[1]['href']
+      assert_match /\/another-welcome-to-mephisto$/, hrefs[2]['href']
     end
   end
 
+  # TODO: Fails due to asset test deleting asset fixtures
+  specify "should show podcast" do
+    return if Asset.count == 1
+    assert_select 'feed>entry>link[rel=?][length=?][type=?]', 'enclosure', '252366', 'audio/mpeg'
+  end
+
   specify "show absolute urls with custom relative url root" do
     begin
       old_root = ActionController::AbstractRequest.relative_url_root
@@ -103,7 +144,7 @@
   specify "should sanitize content" do
     text = @contents.first.get_text.to_s.strip
     evil = "<script>hi</script><a onclick=\"foo\" href=\"#\">linkage</a></p>"
-    good = "&lt;script>hi&lt;/script><a href='#'>linkage</a></p>"
+    good = %(<a href="#">linkage</a></p>)
     assert !text.ends_with(CGI::escapeHTML(evil)), "'#{text.inspect}' was not sanitized"
     assert  text.ends_with(CGI::escapeHTML(good)), "'#{text.inspect}' was not sanitized"
   end
diff -Nur mephisto-0.7.3/test/functional/mephisto_controller_redirections_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/mephisto_controller_redirections_test.rb
--- mephisto-0.7.3/test/functional/mephisto_controller_redirections_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/mephisto_controller_redirections_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -11,7 +11,6 @@
     @controller = MephistoController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    host! 'test.com'
   end
 
   specify "should handle denied requests" do
diff -Nur mephisto-0.7.3/test/functional/mephisto_controller_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/mephisto_controller_test.rb
--- mephisto-0.7.3/test/functional/mephisto_controller_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/functional/mephisto_controller_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -12,7 +12,6 @@
     @controller = MephistoController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    host! 'test.com'
   end
 
   def test_should_list_on_home
@@ -108,6 +107,18 @@
     assert_dispatch_action :page
   end
 
+  def test_should_not_show_future_page
+    dispatch 'about/future'
+    assert_dispatch_action :page
+    assert_response :missing
+  end
+
+  def test_should_not_show_draft_page
+    dispatch 'about/draft'
+    assert_dispatch_action :page
+    assert_response :missing
+  end
+
   def test_should_render_liquid_templates_on_home
     dispatch
     assert_tag 'h1', :content => 'This is the layout'
@@ -184,27 +195,45 @@
     assert_tag :tag => 'h1', :content => "#{contents(:welcome).title} in #{sections(:about).name}"
   end
 
-  def test_should_render_with_alternate_search_layout
-    sites(:first).update_attribute :search_layout, 'alt_layout.liquid'
-    dispatch 'search'
-    assert_dispatch_action :search
-    assert_preferred_template :search
-    assert_layout_template    :alt_layout
-    assert_template_type      :search
-  end
-
   def test_should_search_entries
     dispatch 'search', :q => 'another'
     assert_dispatch_action :search
     assert_equal [contents(:another)], assigns(:articles)
     assert_equal sites(:first).articles_per_page, liquid(:site).before_method(:articles_per_page)
     assert_equal 'another', liquid(:search_string)
+    assert_nil liquid(:section)
     assert_equal 1, liquid(:search_count)
     assert_preferred_template :search
     assert_layout_template    :layout
     assert_template_type      :search
   end
 
+  def test_should_search_entries_in_section
+    Section.update_all ['layout = ?', 'alt_layout'], ['id = ?', sections(:about).id]
+    dispatch 'search', :q => 'welcome', :s => 'about'
+    assert_dispatch_action :search
+    assert_equal [contents(:welcome)], assigns(:articles)
+    assert_equal 'welcome', liquid(:search_string)
+    assert_equal 1, liquid(:search_count)
+    assert_equal sections(:about).to_liquid, liquid(:section)
+    assert_preferred_template :search
+    assert_layout_template    :alt_layout
+    assert_template_type      :search
+  end
+
+  def test_should_search_entries_in_home_section
+    Section.update_all ['layout = ?', 'alt_layout'], ['id = ?', sections(:home).id]
+    dispatch 'search', :q => 'about', :s => ''
+    assert_dispatch_action :search
+    assert_equal [], assigns(:articles)
+    assert_equal 'about', liquid(:search_string)
+    assert_equal sections(:home).to_liquid, liquid(:section)
+    assert_equal 0, liquid(:search_count)
+    assert_preferred_template :search
+    assert_layout_template    :alt_layout
+    assert_template_type      :search
+  end
+
   def test_should_search_and_not_find_draft
     dispatch 'search', :q => 'draft'
     assert_dispatch_action :search
@@ -265,7 +294,7 @@
   def test_should_show_navigation_on_paged_sections
     dispatch 'about'
     assert_tag 'ul', :attributes => { :id => 'nav' },
-               :children => { :count => 3, :only => { :tag => 'li' } }
+               :children => { :count => 5, :only => { :tag => 'li' } }
     assert_tag 'ul', :attributes => { :id => 'nav' },
                :descendant => { :tag => 'a', :attributes => { :class => 'selected' } }
     assert_tag 'a',  :attributes => { :class => 'selected' }, :content => 'Welcome to Mephisto'
@@ -273,7 +302,7 @@
 
   def test_should_set_home_page_on_paged_sections
     dispatch 'about'
-    assert_equal 3, liquid(:section).pages.size
+    assert_equal 5, liquid(:section).pages.size
     [true, false, false].each_with_index do |expected, i|
       assert_equal expected, liquid(:section).pages[i][:is_page_home]
     end
@@ -301,13 +330,11 @@
     end
   end
 
-  def test_should_sanitize_comment
+  def test_should_sanitize_comment_not_article
     date = contents(:welcome).published_at
     dispatch "#{date.year}/#{date.month}/#{date.day}/welcome-to-mephisto"
-    evil = %(<p>rico&#8217;s evil <script>hi</script> and <a onclick="foo" href="#">linkage</a></p>)
-    good = %(<p>rico&#8217;s evil &lt;script>hi&lt;/script> and <a href='#'>linkage</a></p>)
-    assert !@response.body.include?(evil), "includes unsanitized code"
-    assert  @response.body.include?(good), "does not include sanitized code"
+    assert_select "body script", true, "Article can have some <script> tags"
+    assert_select ".comments script", false, "Comments block should not have any <script> tags"
   end
 
   def test_should_show_comments_form
diff -Nur mephisto-0.7.3/test/integration/caching_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/integration/caching_test.rb
--- mephisto-0.7.3/test/integration/caching_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/integration/caching_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -81,6 +81,7 @@
   end
 
   def test_should_expire_sections_when_publishing_draft
+    AssignedSection.delete_all 'id > 9'
     visitor = visit
     writer  = login_as :quentin
     
@@ -237,7 +238,7 @@
     end
 
     assert_expires_pages overview_path, contents(:welcome).full_permalink do
-      writer.post "admin/articles/destroy_comment/#{contents(:welcome).id}", :comment => contents(:welcome_comment).id
+      writer.delete "admin/articles/#{contents(:welcome).id}/comments/#{contents(:welcome_comment).id}"
     end
   end
 
@@ -255,7 +256,7 @@
 
     assert_expires_pages overview_path do
       contents(:welcome_comment).update_attribute :approved, false
-      writer.post "admin/articles/destroy_comment/#{contents(:welcome).id}", :comment => contents(:welcome_comment).id
+      writer.delete "admin/articles/#{contents(:welcome).id}/comments/#{contents(:welcome_comment).id}"
     end
 
     assert_cached contents(:welcome).full_permalink
diff -Nur mephisto-0.7.3/test/mocks/test/site.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/mocks/test/site.rb
--- mephisto-0.7.3/test/mocks/test/site.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/mocks/test/site.rb	2008-03-31 02:18:56.000000000 -0400
@@ -4,9 +4,9 @@
   @@theme_path = Pathname.new(RAILS_ROOT) + 'tmp/themes'
   attr_reader :recent_template_type, :recent_preferred_template, :recent_layout_template
   
-  def render_liquid_for_with_testing(section, template_type, assigns = {}, controller = nil)
+  def call_render_with_testing(section, template_type, assigns = {}, controller = nil)
     @recent_template_type = template_type
-    render_liquid_for_without_testing(section, template_type, assigns, controller)
+    call_render_without_testing(section, template_type, assigns, controller)
   end
   
   def set_content_template_with_testing(section, template_type)
@@ -17,7 +17,7 @@
     @recent_layout_template = set_layout_template_without_testing(section, template_type)
   end
   
-  [:render_liquid_for, :set_content_template, :set_layout_template].each do |m|
+  [:call_render, :set_content_template, :set_layout_template].each do |m|
     alias_method_chain m, :testing
   end
-end unless Site.instance_methods.include?('render_liquid_for_with_testing')
\ No newline at end of file
+end unless Site.instance_methods.include?('call_render_with_testing')
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/test_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/test_helper.rb
--- mephisto-0.7.3/test/test_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/test_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,6 +3,7 @@
 
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
+require 'test/spec'
 require File.expand_path(File.dirname(__FILE__) + "/actor")
 ASSET_PATH = File.join(RAILS_ROOT, 'test/fixtures/tmp/assets') unless Object.const_defined?(:ASSET_PATH)
 require File.join(File.dirname(__FILE__), 'referenced_caching_test_helper')
@@ -31,8 +32,8 @@
 # needed for the asset tests
 # may have to rethink this...
 Fixtures.class_eval do
-  case ActiveRecord::Base.connection
-    when ActiveRecord::ConnectionAdapters::MysqlAdapter
+  case ActiveRecord::Base.connection.class.name
+    when /Mysql/
       def delete_existing_fixtures
         self.class.delete_existing_fixtures_for @connection, @table_name
       end
@@ -41,7 +42,7 @@
         connection.delete  "TRUNCATE TABLE #{table_name}", 'Fixture Delete'
         connection.execute "ALTER TABLE #{table_name} AUTO_INCREMENT = 1", 'Renumber Auto Increment'
       end
-    when ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+    when /PostgreSQL/
       def delete_existing_fixtures
         self.class.delete_existing_fixtures_for @connection, @table_name
       end
@@ -91,6 +92,24 @@
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
 
+  def self.has_image_processor?
+    @has_image_processor ||= Object.const_defined?(:ImageScience) || Object.const_defined?(:Magick)
+  end
+  
+  def has_image_processor?
+    self.class.has_image_processor?
+  end
+
+  def use_temp_file(path)
+    temp_path = File.join(ASSET_PATH, File.basename(path))
+    FileUtils.cp path, temp_path
+    yield temp_path
+  end
+
+  def assert_template_result(expected, template, assigns={}, message=nil)
+    assert_equal expected, Liquid::Template.parse(template).render(assigns)
+  end 
+
   def host!(hostname)
     @request.host = hostname
   end
@@ -154,7 +173,7 @@
   end
 
   def assert_atom_entries_size(entries)
-    assert_equal 1, get_xpath(%{/feed[@xmlns="http://www.w3.org/2005/Atom" and count(child::entry)=#{entries}]}).size, "Atom 1.0 feed has wrong number of feed/entry nodes"
+    assert_equal 1, get_xpath(%{/feed[count(child::entry)=#{entries}]}).size, "Atom 1.0 feed has wrong number of feed/entry nodes"
   end
 
   # Sets the current user in the session from the user fixtures.
@@ -209,16 +228,13 @@
       'value'   => users(user).activation_code,
       'expires' => 2.weeks.from_now,
       'path'    => '/',
-      'domain'  => 'example.com'
+      'domain'  => 'test.host'
     ) : nil
   end
   
   # mocks a Liquid::Context
   def mock_context(assigns = {}, registers = {})
-    t = Liquid::Template.new
-    t.assigns.update assigns
-    t.registers.update registers
-    returning Liquid::Context.new(t) do |context|
+    returning Liquid::Context.new(assigns, registers) do |context|
       assigns.keys.each { |k| context[k].context = context }
     end
   end
@@ -277,6 +293,7 @@
   # creates an anonymous session
   def visit
     open_session do |sess|
+      sess.host = 'test.host'
       sess.extend Mephisto::Integration::Actor
       yield sess if block_given?
     end
@@ -293,7 +310,7 @@
 
 class ActionController::Integration::Session
   def login_as(login)
-    post '/account/login', :login => login, :password => 'test'
+    post 'http://test.host/account/login', :login => login, :password => 'test'
     assert request.session[:user]
     assert redirect?
   end
@@ -359,4 +376,27 @@
     def check
       @controller.assert_response 401
     end
+end
+
+
+#module Mephisto
+#  module Plugins
+#    class PluginWhammyJammy < Mephisto::Plugin
+#      option :foo, 'one'
+#      option :bar, 2
+#      option :baz, [3]
+#    end
+#    
+#    class FooBar < Mephisto::Plugin
+#    end
+#    
+#    class NonPlugin
+#    end
+#  end
+#end
+
+begin
+  require 'ruby-debug'
+  Debugger.start
+rescue LoadError
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/unit/absolute_url_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/absolute_url_test.rb
--- mephisto-0.7.3/test/unit/absolute_url_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/absolute_url_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
+# DEPRECATED, see spec/filters/absolute_url_spec.rb
+
 context "Default Url" do
   include Mephisto::Liquid::UrlMethods
   
@@ -22,7 +24,7 @@
   end
   
   specify "should join path ending with a slash" do
-    assert_equal '/foo/bar/baz', absolute_url('/foo/bar/baz/')
+    assert_equal '/foo/bar/baz', absolute_url('foo/bar/baz/')
   end
 end
 
@@ -49,10 +51,10 @@
   end
   
   specify "should join absolute path" do
-    assert_equal '/blog/foo/bar/baz.html', absolute_url('/foo/bar/baz.html')
+    assert_equal '/foo/bar/baz.html', absolute_url('/foo/bar/baz.html')
   end
   
   specify "should join path ending with a slash" do
-    assert_equal '/blog/foo/bar/baz', absolute_url('/foo/bar/baz/')
+    assert_equal '/blog/foo/bar/baz', absolute_url('foo/bar/baz/')
   end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/unit/article_drop_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/article_drop_test.rb
--- mephisto-0.7.3/test/unit/article_drop_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/article_drop_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,11 +1,40 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ArticleDropTest < Test::Unit::TestCase
-  fixtures :sites, :sections, :contents, :assigned_sections, :users, :tags, :taggings
+['', '/blog'].each do |root|
+  context "Article Drop with relative root = #{root.inspect}" do
+    fixtures :sites, :sections, :contents, :assigned_sections, :users, :tags, :taggings, :assigned_assets, :assets
+
+    setup do
+      @context = mock_context('site' => sites(:first).to_liquid)
+      @article = contents(:welcome).to_liquid(:mode => :single)
+      @article.context = @context
+      Mephisto::Liquid::UrlMethods.stubs(:relative_url_root).returns(root)
+    end
+
+    specify "should show article url" do
+      t = Time.now.utc - 3.days
+      assert_equal "#{root}/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto", @article.url
+    end
+
+    specify "should show comments feed url" do
+      t = Time.now.utc - 3.days
+      assert_equal "#{root}/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/comments.xml", @article.comments_feed_url
+    end
+
+    specify "should change feed url" do
+      t = Time.now.utc - 3.days
+      assert_equal "#{root}/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/changes.xml", @article.changes_feed_url
+    end
+  end
+end
+
+context "Article Drop" do
+  fixtures :sites, :sections, :contents, :assigned_sections, :users, :tags, :taggings, :assigned_assets, :assets
   
-  def setup
-    @article = contents(:welcome).to_liquid :mode => :single
-    @article.context = mock_context('site' => sites(:first).to_liquid)
+  setup do
+    @context = mock_context('site' => sites(:first).to_liquid)
+    @article = contents(:welcome).to_liquid(:mode => :single)
+    @article.context = @context
   end
 
   def test_equality
@@ -69,23 +98,12 @@
     assert_equal "<p>body</p>", a.send(:body_for_mode, :single)
     assert_equal '<p>body</p>', a.send(:body_for_mode, :list)
   end
-  
-  def test_article_url
-    t = Time.now.utc - 3.days
-    assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto", @article.url
-  end
-  
-  def test_comments_feed_url
-    t = Time.now.utc - 3.days
-    assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/comments.xml", @article.comments_feed_url
-  end
-  
-  def test_changes_feed_url
-    t = Time.now.utc - 3.days
-    assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto/changes.xml", @article.changes_feed_url
-  end
 
   specify "should show taggable tags" do
     assert_equal %w(rails), contents(:another).to_liquid.tags
   end
+
+  specify "should find article assets" do
+    assert_models_equal [assets(:gif), assets(:mp3)], @article.assets.collect(&:source)
+  end
 end
diff -Nur mephisto-0.7.3/test/unit/article_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/article_test.rb
--- mephisto-0.7.3/test/unit/article_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/article_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,8 +1,31 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ArticleTest < Test::Unit::TestCase
-  fixtures :contents, :users, :sections, :sites
+  fixtures :contents, :users, :sections, :sites, :assigned_sections
 
+  def test_find_next
+    assert_equal contents(:another).next, contents(:welcome)
+    assert_equal contents(:another).next(sections(:home)), contents(:welcome)
+    assert_equal contents(:another).next(sections(:about)), nil
+    assert_equal contents(:welcome).next(sections(:about)), contents(:about)
+    assert_equal contents(:article_1_only_in_page_section).next, contents(:article_2_only_in_page_section)
+    assert_equal contents(:article_1_only_in_page_section).next(sections(:paged_section)), contents(:article_2_only_in_page_section)
+    assert_equal contents(:article_2_only_in_page_section).next, nil
+    assert_equal contents(:article_2_only_in_page_section).next(sections(:paged_section)), nil
+  end
+
+  def test_should_find_previous
+    assert_equal contents(:another).previous, nil
+    assert_equal contents(:another).previous(sections(:home)), nil
+    assert_equal contents(:another).previous(sections(:about)), nil
+    assert_equal contents(:welcome).previous(sections(:home)), contents(:another)
+    assert_not_equal contents(:another).previous(sections(:cupcake_home)), contents(:at_beginning_of_next_month)
+    assert_equal contents(:article_2_only_in_page_section).previous, contents(:article_1_only_in_page_section)
+    assert_equal contents(:article_2_only_in_page_section).previous(sections(:paged_section)), contents(:article_1_only_in_page_section)
+    assert_equal contents(:article_1_only_in_page_section).previous, nil
+    assert_equal contents(:article_1_only_in_page_section).previous(sections(:paged_section)), nil
+  end
+  
   def test_should_create_permalink
     a = create_article :title => 'This IS a Tripped out title!!.!1  (well/ not really)', :body => 'foo'
     assert_equal 'this-is-a-tripped-out-title-1-well-not-really', a.permalink
@@ -17,6 +40,17 @@
     title = '////// meph1sto r0x ! \\\\\\'
     assert_equal 'meph1sto-r0x', Article.permalink_for(title)
   end
+  
+  def test_permalink_with_non_ascii_chars
+    assert_equal 'acegiklnu', Article.permalink_for('āčēģīķļņū')
+  end
+
+  def test_should_pass_changed_attributes_down_to_comments
+    contents(:welcome).update_attributes(:title => 'foo bar', :published_at => Time.utc(2000, 1, 1), :permalink => 'foo-bar')
+    assert_equal 'foo bar', contents(:welcome_comment).title
+    assert_equal Time.utc(2000, 1, 1), contents(:welcome_comment).published_at
+    assert_equal 'foo-bar', contents(:welcome_comment).permalink
+  end
 
   def test_full_permalink
     date = 3.days.ago.utc
@@ -41,8 +75,8 @@
 
   def test_should_cache_redcloth
     a = Article.create :title => 'This IS a Tripped out title!!!1  (well not really)', :user => users(:quentin), :excerpt => '*foo*', :body => '_bar_', :site_id => 1
-    assert_equal '<p><strong>foo</strong></p>',    a.excerpt_html
-    assert_equal '<p><em>bar</em></p>',            a.body_html
+    assert_equal '<p><strong>foo</strong></p>', a.excerpt_html
+    assert_equal '<p><em>bar</em></p>',         a.body_html
   end
 
   def test_should_save_filter_from_user
@@ -72,16 +106,16 @@
   def test_comment_expiration_date_on_draft
     a = create_fake_article
     a.published_at = nil
-    assert_equal 10.days.from_now.utc.to_i, a.comments_expired_at.to_i
+    assert_equal (Time.now.utc+10.days).to_i, a.comments_expired_at.utc.to_i
   end
 
   def test_comment_expiration_date
     a = create_fake_article
-    assert_equal 5.days.from_now.utc.to_i, a.comments_expired_at.to_i
+    assert_equal((a.published_at + 10.days), a.comments_expired_at)
   end
 
   def test_comment_expiry
-    a = create_fake_article(5.days.from_now)
+    a = create_fake_article(5.days.from_now.utc)
     assert !a.accept_comments?
     a.published_at = 5.days.ago.utc
     assert  a.accept_comments?
@@ -140,7 +174,7 @@
       Article.create options.reverse_merge(:user_id => 1, :site_id => 1, :title => 'foo')
     end
     
-    def create_fake_article(time = 5.days.ago)
+    def create_fake_article(time = 5.days.ago.utc)
       returning Article.new(:comment_age => 10, :published_at => time.utc) do |a|
         def a.new_record?() false ; end
       end
diff -Nur mephisto-0.7.3/test/unit/asset_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/asset_test.rb
--- mephisto-0.7.3/test/unit/asset_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/asset_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,28 +2,29 @@
 
 class AssetTest < Test::Unit::TestCase
   fixtures :sites, :assets, :tags, :taggings
-  
+
   def test_should_upload_and_create_asset_records
-    asset_count = Object.const_defined?(:Magick) ? 3 : 1 # asset + 2 thumbnails
+    asset_count = has_image_processor? ? 3 : 1 # asset + 2 thumbnails
     
     assert_difference sites(:first).assets, :count do
       assert_difference Asset, :count, asset_count do 
         process_upload
         
-        if Object.const_defined?(:Magick)
+        if has_image_processor?
           asset = Asset.find(:first, :conditions => 'id > 7', :order => 'created_at')
           assert_equal 2, asset.thumbnails_count
         end
       end
     end
   end
-  
+
   def test_should_upload_file
     process_upload
     assert_assets_exist :logo
   end  
 
   def test_should_rename_non_unique_filename
+    Site.multi_sites_enabled = false
     asset = process_upload
     assert_equal 'logo.png', asset.filename
     asset = process_upload
@@ -32,22 +33,30 @@
   end
 
   def test_should_rename_non_unique_filename_when_renaming
+    Site.multi_sites_enabled = false
     now   = Time.now.utc
     asset = process_upload
     assert_equal 'logo.png', asset.filename
     asset = process_upload(:filename => 'logo_reloaded.png')
     assert_assets_exist :logo_reloaded, now
-    
+
     asset.update_attributes :filename => 'logo.png'
     assert_file_exists File.join(ASSET_PATH, now.year.to_s, now.month.to_s, now.day.to_s, "logo_1.png")
   end
 
+  def test_should_not_rename_file_on_update
+    asset = process_upload
+    old_filename = asset.filename
+    asset.update_attributes({ :filename => 'logo.png' })
+    assert_equal old_filename, asset.filename
+  end
+
   def test_should_upload_file_in_multi_sites_mode
     Site.multi_sites_enabled = true
     process_upload
     now = Time.now.utc
     assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo.png')
-    if Object.const_defined?(:Magick)
+    if has_image_processor?
       assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_thumb.png')
       assert_file_exists File.join(ASSET_PATH, sites(:first).host, now.year.to_s, now.month.to_s, now.day.to_s, 'logo_tiny.png')
     end
@@ -86,7 +95,7 @@
 
   def test_should_report_image_type
     a = Asset.new
-    Technoweenie::ActsAsAttachment.content_types.each do |content_type|
+    Technoweenie::AttachmentFu.content_types.each do |content_type|
       a.content_type = content_type
       assert a.image?, "#{content_type} was not an image"
     end
@@ -167,15 +176,17 @@
   
   protected
     def process_upload(options = {})
-      a = sites(:first).assets.create(options.reverse_merge(:filename => 'logo.png', :content_type => 'image/png', 
-        :attachment_data => IO.read(File.join(RAILS_ROOT, 'public/images/mephisto/logo.png'))))
-      assert_valid a
+      a = nil
+      use_temp_file File.join(RAILS_ROOT, 'public', 'images', 'mephisto', 'logo.png') do |logo|
+        a = sites(:first).assets.create(options.reverse_merge(:filename => 'logo.png', :content_type => 'image/png', :temp_path => logo))
+        assert_valid a
+      end
       a
     end
     
     def assert_assets_exist(filename, created_at = Time.now.utc)
       assert_file_exists File.join(ASSET_PATH, created_at.year.to_s, created_at.month.to_s, created_at.day.to_s, "#{filename}.png")
-      if Object.const_defined?(:Magick)
+      if has_image_processor?
         assert_file_exists File.join(ASSET_PATH, created_at.year.to_s, created_at.month.to_s, created_at.day.to_s, "#{filename}_thumb.png")
         assert_file_exists File.join(ASSET_PATH, created_at.year.to_s, created_at.month.to_s, created_at.day.to_s, "#{filename}_tiny.png")
       end
diff -Nur mephisto-0.7.3/test/unit/assigned_asset_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/assigned_asset_test.rb
--- mephisto-0.7.3/test/unit/assigned_asset_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/assigned_asset_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+context "Assigned Asset" do
+  fixtures :assigned_assets, :contents, :assets
+
+  specify "should find article assets" do
+    assert_equal 3, contents(:welcome).assigned_assets.count
+    assert_models_equal [assets(:gif), assets(:mp3)], contents(:welcome).assets
+  end
+  
+  specify "should add asset to article" do
+    assert_difference AssignedAsset, :count do
+      contents(:welcome).assets.add assets(:mov), 'avatar'
+    end
+    assert_models_equal [assets(:gif), assets(:mp3), assets(:mov)], contents(:welcome).assets(true)
+    assert_equal 'avatar', contents(:welcome).assets[2].label
+  end
+  
+  specify "should add inactive asset to article" do
+    assert_no_difference AssignedAsset, :count do
+      contents(:welcome).assets.add assets(:png), 'avatar'
+    end
+    assert_models_equal [assets(:gif), assets(:mp3), assets(:png)], contents(:welcome).assets(true)
+    assert_equal 'avatar', contents(:welcome).assets[2].label
+  end
+
+  specify "should find deactivate article assets" do
+    assert_no_difference AssignedAsset, :count do
+      contents(:welcome).assets.remove assets(:mp3)
+    end
+    assert_models_equal [assets(:gif)], contents(:welcome).assets
+  end
+end
diff -Nur mephisto-0.7.3/test/unit/comment_drop_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/comment_drop_test.rb
--- mephisto-0.7.3/test/unit/comment_drop_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/comment_drop_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -5,6 +5,7 @@
   
   def setup
     @comment = contents(:welcome_comment).to_liquid
+    @mock_comment = [:published_at, :created_at, :author, :author_email, :author_ip, :title, :approved?].inject({:body_html => 'foo'}) { |h, i| h.update i => true }
   end
   
   def test_should_convert_comment_to_drop
@@ -35,11 +36,12 @@
     assert_equal %Q{<a href="https://abc">rico</a>}, @comment.author_link
     @comment.source.author     = '<strong>rico</strong>'
     @comment.source.author_url = '<strong>https://abc</strong>'
+    @comment.source.send(:sanitize_attributes)
     assert_equal %Q{<a href="http://&lt;strong&gt;https://abc&lt;/strong&gt;">&lt;strong&gt;rico&lt;/strong&gt;</a>}, @comment.author_link
   end
   
   def test_should_show_filtered_text
-    comment  = contents(:welcome).comments.create :body => '*test* comment', :author => 'bob', :author_ip => '127.0.0.1', :filter => 'textile_filter'
+    comment  = contents(:welcome).comments.create :body => '*test* comment', :author => 'bob', :author_ip => '127.0.0.1'
     assert_valid comment
     assert_equal 'textile_filter', comment.filter
     liquid   = comment.to_liquid
@@ -50,4 +52,26 @@
     t = Time.now.utc - 3.days
     assert_equal "/#{t.year}/#{t.month}/#{t.day}/welcome-to-mephisto", @comment.url
   end
+  
+  def test_should_return_correct_presentation_class_for_article_author
+    @comment = CommentDrop.new(create_comment_stub(:user_id => 5, :article => stub(:user_id => 5)))
+    assert_equal 'by-author', @comment.presentation_class
+  end
+  
+  def test_should_return_correct_presentation_class_for_guest
+    @comment = CommentDrop.new(create_comment_stub(:user_id => nil, :article => stub(:user_id => 5)))
+    assert_equal 'by-guest', @comment.presentation_class
+  end
+  
+  def test_should_return_correct_presentation_class_for_user
+    @comment = CommentDrop.new(create_comment_stub(:user_id => 3, :article => stub(:user_id => 5)))
+    assert_equal 'by-user', @comment.presentation_class
+  end
+  
+  private
+    def create_comment_stub(options)
+      returning stub(@mock_comment.merge(options)) do |stub|
+        def stub.id() 55; end
+      end
+    end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/unit/comment_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/comment_test.rb
--- mephisto-0.7.3/test/unit/comment_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/comment_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -10,7 +10,7 @@
 
   def test_should_add_comment_and_retrieve_attributes_from_article
     assert_difference Comment, :count do
-      comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1', :filter => 'textile_filter'
+      comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1'
       assert_equal contents(:welcome).site_id,      comment.site_id
       assert_equal contents(:welcome).title,        comment.title
       assert_equal contents(:welcome).published_at, comment.published_at
@@ -18,14 +18,22 @@
     end
   end
 
-  def test_should_pass_filter_down_from_article
+  def test_should_pass_filter_down_from_article_site
     old_times = contents(:welcome).comments.collect &:updated_at
-    comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1', :filter => 'textile_filter'
+    comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1'
     assert_equal 'textile_filter', comment.filter
     assert_valid comment
     assert_equal old_times, contents(:welcome).comments(true).collect(&:updated_at)
   end
 
+  def test_should_allow_set_filter_on_comment
+    old_times = contents(:welcome).comments.collect &:updated_at
+    comment = contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1'
+    comment.filter = 'markdown_filter'
+    assert_valid comment
+    assert_equal old_times, contents(:welcome).comments(true).collect(&:updated_at)
+  end
+
   def test_should_process_textile_when_adding_comment
     c = contents(:welcome).comments.create :body => '*test* comment', :author => 'bob', :author_ip => '127.0.0.1'
     assert_equal "<p><strong>test</strong> comment</p>", c.body_html
@@ -69,7 +77,7 @@
 
   def test_should_clean_up_email_and_url
     comments = contents(:welcome).comments
-    options = {:body => 'test', :author => 'bob', :author_ip => '127.0.0.1', :filter => 'textile_filter'}
+    options = {:body => 'test', :author => 'bob', :author_ip => '127.0.0.1'}
     comment = comments.build options.merge(:author_email => '   bob@example.com   ')
     assert_valid comment
     assert_equal 'bob@example.com', comment.author_email
@@ -89,7 +97,7 @@
 
   def test_should_validate_emails
     comments = contents(:welcome).comments
-    options = {:body => 'test', :author => 'bob', :author_ip => '127.0.0.1', :filter => 'textile_filter'}
+    options = {:body => 'test', :author => 'bob', :author_ip => '127.0.0.1'}
     comment = comments.build options.merge(:author_email => 'bob@example.com')
     assert_valid comment
     comment = comments.build options.merge(:author_email => 'bobexample.com')
diff -Nur mephisto-0.7.3/test/unit/drop_filters_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/drop_filters_test.rb
--- mephisto-0.7.3/test/unit/drop_filters_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/drop_filters_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,9 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 context "Drop Filters" do
-  fixtures :sites, :sections, :contents, :assigned_sections, :assets
+  fixtures :sites, :sections, :contents, :assigned_sections, :assigned_assets, :assets
   include DropFilters, CoreFilters
 
-  def setup
+  setup do
     @site    = sites(:first).to_liquid
     @context = mock_context 'site' => @site, 'section' => sections(:about).to_liquid
   end
@@ -32,7 +32,7 @@
   end
 
   specify "should find latest articles by site" do
-    assert_models_equal [contents(:welcome), contents(:about), contents(:site_map), contents(:another), contents(:at_beginning_of_next_month), contents(:at_end_of_month), contents(:at_middle_of_month), contents(:at_beginning_of_month)], 
+    assert_models_equal [contents(:welcome), contents(:about), contents(:site_map), contents(:another), contents(:at_beginning_of_next_month), contents(:article_1_only_in_page_section), contents(:article_2_only_in_page_section), contents(:at_end_of_month), contents(:at_middle_of_month), contents(:at_beginning_of_month)], 
       latest_articles(@site).collect(&:source)
     assert_models_equal [contents(:welcome), contents(:about)], latest_articles(@site, 2).collect(&:source)
   end
@@ -43,7 +43,7 @@
   end
 
   specify "should find child sections" do
-    assert_models_equal [sections(:about), sections(:earth), sections(:links)], child_sections('').collect(&:source)
+    assert_models_equal [sections(:about), sections(:earth), sections(:links), sections(:paged_section)], child_sections('').collect(&:source)
     assert_models_equal [sections(:europe), sections(:africa)], child_sections('earth').collect(&:source)
   end
 
@@ -56,6 +56,35 @@
     assert_models_equal sections(:home).articles.find_all_in_month(Time.now.year, Time.now.month), monthly_articles(liquify(sections(:home)).first).collect(&:source)
   end
 
+  specify "should find article assets" do
+    article = contents(:welcome).to_liquid(:mode => :single)
+    article.context = @context
+    assert_equal assets(:mp3), find_asset(article, 'podcast').source
+  end
+
+  def test_find_next
+    another = contents(:another).to_liquid
+    another.context = @context
+    cupcake_welcome = contents(:cupcake_welcome).to_liquid
+    cupcake_welcome.context = @context
+
+    assert_equal next_article(another), contents(:welcome).to_liquid
+    assert_equal next_article(another, sections(:home).to_liquid), contents(:welcome).to_liquid
+    assert_equal next_article(cupcake_welcome, sections(:cupcake_home).to_liquid), nil
+  end
+
+  def test_should_find_previous
+    another = contents(:another).to_liquid
+    another.context = @context
+    welcome = contents(:welcome).to_liquid
+    welcome.context = @context
+
+    assert_equal previous_article(another), nil
+    assert_equal previous_article(another, sections(:home).to_liquid), nil
+    assert_equal previous_article(welcome, sections(:home).to_liquid), another
+    assert_not_equal previous_article(another, sections(:cupcake_home).to_liquid), contents(:at_beginning_of_next_month).to_liquid
+  end
+
   specify "should find movies" do
     assert_models_equal [assets(:swf), assets(:mov)], assets_by_type('movie').collect(&:source)
   end
@@ -72,8 +101,8 @@
     assert_models_equal [assets(:word), assets(:pdf)], assets_by_type('other').collect(&:source)
   end
 
-  specify "should find assets by tag" do
-    assert_models_equal [contents(:welcome)], tagged_articles("rails").collect(&:source)
+  specify "should find articles by tag" do
+    assert_models_equal [contents(:future), contents(:another)], tagged_articles("rails").collect(&:source)
   end
 
   specify "should find assets by tag" do
diff -Nur mephisto-0.7.3/test/unit/event_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/event_test.rb
--- mephisto-0.7.3/test/unit/event_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/event_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -28,6 +28,14 @@
     end
   end
 
+  def test_should_not_create_article_event_for_save_without_revision
+    assert_no_event_created do
+      article = contents(:welcome)
+      article.body = 'bar.'
+      article.save_without_revision!
+    end
+  end
+
   def test_should_not_create_comment_article_event_for_unnaproved
     assert_no_event_created do
       contents(:welcome).comments.create :body => 'test comment', :author => 'bob', :author_ip => '127.0.0.1'
diff -Nur mephisto-0.7.3/test/unit/liquid_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/liquid_test.rb
--- mephisto-0.7.3/test/unit/liquid_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/liquid_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+context "Liquid" do
+  specify "should allow sorting in for block" do
+    assert_template_result('123','{% for item in array sort_by: num %}{{item.num}}{% endfor %}',
+      'array' => [ {'num' => 3}, {'num' => 1}, {'num' => 2} ])
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/unit/membership_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/membership_test.rb
--- mephisto-0.7.3/test/unit/membership_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/membership_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
+# DEPRECATED, see spec/models/membership_spec.rb
+
 class MembershipTest < Test::Unit::TestCase
   fixtures :memberships, :users, :sites
 
diff -Nur mephisto-0.7.3/test/unit/plugin_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/plugin_test.rb
--- mephisto-0.7.3/test/unit/plugin_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/plugin_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,101 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class PluginTest < Test::Unit::TestCase
+  fixtures :mephisto_plugins
+
+  def test_should_create_plugin_name
+    assert_equal 'plugin_whammy_jammy', Mephisto::Plugins::PluginWhammyJammy.plugin_name
+  end
+  
+  def test_should_find_plugin_class_by_name
+    assert_equal Mephisto::Plugins::PluginWhammyJammy, Mephisto::Plugin.find_class(:plugin_whammy_jammy)
+  end
+  
+  def test_should_not_find_missing_class
+    assert_raises NameError do
+      Mephisto::Plugin[:blah]
+    end
+  end
+  
+  def test_should_not_find_a_non_model
+    assert Mephisto::Plugins.const_defined?(:NonPlugin)
+    assert_raises NameError do
+      Mephisto::Plugin[:non_plugin]
+    end
+  end
+  
+  def test_plugin_option_defaults
+    plugin = Mephisto::Plugins::PluginWhammyJammy.new
+    assert_equal 'one', plugin.foo
+    assert_equal 2,     plugin.bar
+    assert_equal [3],   plugin.baz
+  end
+  
+  def test_should_set_plugin_options
+    plugin = Mephisto::Plugins::PluginWhammyJammy.new
+    
+    plugin.foo = 'two'
+    plugin.bar = 3
+    plugin.baz = [4]
+    assert_equal 'two', plugin.foo
+    assert_equal 3,     plugin.bar
+    assert_equal [4],   plugin.baz
+    
+    plugin.foo = ''
+    assert_equal 'one', plugin.foo
+    
+    plugin.bar = nil
+    assert_equal 2,     plugin.bar
+  end
+  
+  def test_should_get_and_set_plugin_properties
+    properties = %w(notes author version homepage)
+    properties.each do |property|
+      assert_nil Mephisto::Plugins::PluginWhammyJammy.send(property)
+      Mephisto::Plugins::PluginWhammyJammy.send(property, 'foo')
+      assert_equal 'foo', Mephisto::Plugins::PluginWhammyJammy.send(property)
+      assert_equal 'foo', Mephisto::Plugins::PluginWhammyJammy.new.send(property)
+    end
+  end
+  
+  def test_should_find_plugin
+    assert_equal Mephisto::Plugins::PluginWhammyJammy.find(1), Mephisto::Plugin[:plugin_whammy_jammy]
+  end
+  
+  def test_should_persist_options
+    plugin = Mephisto::Plugin[:plugin_whammy_jammy]
+    assert_equal 'one', plugin.foo
+    plugin.foo = 'two'
+    plugin.save!
+    assert_equal 'two', plugin.reload.foo
+  end
+  
+  def test_should_persist_options_on_new_plugin_record
+    Mephisto::Plugins::PluginWhammyJammy.delete_all
+    plugin = Mephisto::Plugin[:plugin_whammy_jammy]
+    klass1 = plugin.class.name
+    
+    assert plugin.new_record?
+    assert_equal 'one', plugin.foo
+    plugin.save!
+    assert plugin.reload.options.empty?
+
+    plugin2 = Mephisto::Plugin[:plugin_whammy_jammy]
+    assert_equal 'one', plugin2.foo   
+    reloaded_klass = plugin2.class.name
+    
+    assert_equal klass1, reloaded_klass
+    plugin.foo = 'two'
+    plugin.save
+    
+    plugin2.reload
+
+    assert_equal 'two', plugin2.foo
+  end
+  
+  # def test_should_load_or_initialize_plugin_list
+ #    plugins = Mephisto::Plugin.load(%w(plugin_whammy_jammy foo_bar baz))
+ #    assert_equal 2, plugins.size
+ #    assert plugins['foo_bar'].new_record?
+ #  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/test/unit/section_drop_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/section_drop_test.rb
--- mephisto-0.7.3/test/unit/section_drop_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/section_drop_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SectionDropTest < Test::Unit::TestCase
-  fixtures :sites, :sections, :contents
+  fixtures :sites, :sections, :contents, :assigned_sections
 
   def test_equality
     section = sections(:home).to_liquid
@@ -36,7 +36,8 @@
   end
   
   def test_should_get_month_array
-    months = sections(:home).articles.collect { |a| a.published? ? a.published_at.beginning_of_month.to_date.to_s(:db) : nil }.compact.uniq.sort.reverse
+    this_month = Time.now.utc.beginning_of_month.to_date
+    months = sections(:home).articles.collect { |a| (a.published? && ( a.published_at.beginning_of_month.to_date <= this_month)) ? a.published_at.beginning_of_month.to_date.to_s(:db) : nil }.compact.uniq.sort.reverse
     assert_equal months, sections(:home).to_liquid['months'].collect { |d| d.to_s(:db) }
   end
 end
diff -Nur mephisto-0.7.3/test/unit/section_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/section_test.rb
--- mephisto-0.7.3/test/unit/section_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/section_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class SectionTest < Test::Unit::TestCase
+context "Section" do
   fixtures :sections, :contents, :assigned_sections, :sites, :users
 
   def test_find_or_create_sanity_check
@@ -103,14 +103,14 @@
   end
 
   specify "should return correct sections" do
-    assert_models_equal [sections(:about), sections(:africa), sections(:bucharest), sections(:earth), sections(:europe), sections(:home), sections(:links)], sites(:first).sections.find(:all, :order => 'name')
-    assert_models_equal [sections(:about), sections(:links)], sites(:first).sections.find_paged
+    assert_models_equal [sections(:about), sections(:africa), sections(:bucharest), sections(:earth), sections(:europe), sections(:home), sections(:links), sections(:paged_section)], sites(:first).sections.find(:all, :order => 'name')
+    assert_models_equal [sections(:about), sections(:links), sections(:paged_section)], sites(:first).sections.find_paged
   end
 
   specify "should order articles in sections" do
     assert_reorder_articles sections(:about),
-      [contents(:welcome), contents(:about), contents(:site_map)],
-      [contents(:about), contents(:site_map), contents(:welcome)]
+      [contents(:welcome), contents(:about), contents(:site_map), contents(:draft), contents(:future)],
+      [contents(:about), contents(:site_map), contents(:welcome), contents(:future), contents(:draft)]
   end
 
   protected
diff -Nur mephisto-0.7.3/test/unit/site_drop_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/site_drop_test.rb
--- mephisto-0.7.3/test/unit/site_drop_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/site_drop_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -18,8 +18,8 @@
   end
 
   def test_should_list_all_sections
-    assert_models_equal [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links)], @site.sections.collect(&:source)
-    assert_equal [false, false, false, false, false, false, false], @site.sections.collect(&:current)
+    assert_models_equal [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:paged_section)], @site.sections.collect(&:source)
+    assert_equal [false, false, false, false, false, false, false, false], @site.sections.collect(&:current)
   end
   
   def test_should_default_to_no_current_section
@@ -30,7 +30,7 @@
     @site = SiteDrop.new(sites(:first), sections(:about))
     @site.context = mock_context
     assert_equal sections(:about), @site.current_section.source
-    assert_equal [false, true, false, false, false, false, false], @site.sections.collect(&:current)
+    assert_equal [false, true, false, false, false, false, false, false], @site.sections.collect(&:current)
   end
   
   def test_should_list_only_blog_sections
@@ -38,7 +38,7 @@
   end
   
   def test_should_list_only_paged_sections
-    assert_models_equal [sections(:about), sections(:links)], @site.page_sections.collect(&:source)
+    assert_models_equal [sections(:about), sections(:links), sections(:paged_section)], @site.page_sections.collect(&:source)
   end
 
   def test_should_list_tags
@@ -54,7 +54,7 @@
   end
 
   def test_should_find_latest_articles
-    assert_models_equal [contents(:welcome), contents(:about), contents(:site_map), contents(:another), contents(:at_beginning_of_next_month), contents(:at_end_of_month), contents(:at_middle_of_month), contents(:at_beginning_of_month)], 
+    assert_models_equal [contents(:welcome), contents(:about), contents(:site_map), contents(:another), contents(:at_beginning_of_next_month), contents(:article_1_only_in_page_section), contents(:article_2_only_in_page_section), contents(:at_end_of_month), contents(:at_middle_of_month), contents(:at_beginning_of_month)], 
       @site.latest_articles.collect(&:source)
     assert_models_equal [contents(:welcome), contents(:about)], @site.latest_articles(2).collect(&:source)
   end
diff -Nur mephisto-0.7.3/test/unit/site_permalink_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/site_permalink_test.rb
--- mephisto-0.7.3/test/unit/site_permalink_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/site_permalink_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -42,6 +42,11 @@
     assert !@site.valid?
     assert_equal "cannot contain ':foo' variable", @site.errors.on(:permalink_style)
   end
+
+  specify "should not recongize hyphens as token separators" do
+    @site.permalink_style = ':id-:permalink'
+    assert !@site.valid?
+  end
 end
 
 context "Site Permalink Generation" do
@@ -77,4 +82,4 @@
     assert_valid @site
     assert_equal "/posts/#{@article.year}/#{@article.id}", @site.permalink_for(contents(:welcome_comment))
   end
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/test/unit/site_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/site_test.rb
--- mephisto-0.7.3/test/unit/site_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/site_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -22,7 +22,7 @@
   end
   
   specify "should find by host" do
-    assert_equal sites(:first), Site.find_by_host('test.com')
+    assert_equal sites(:first), Site.find_by_host('test.host')
     assert_equal sites(:hostess), Site.find_by_host('cupcake.com')
   end
 
@@ -45,19 +45,25 @@
   end
 
   specify "should generate search url" do
-    assert_equal '/search?q=abc',        sites(:first).search_url('abc')
-    assert_equal '/search?q=abc&page=2', sites(:first).search_url('abc', 2)
+    assert_equal '/search?q=abc',            sites(:first).search_url('abc')
+    assert_equal '/search?q=abc&amp;page=2', sites(:first).search_url('abc', 2)
   end
   
   specify "should generate tag url" do
-    assert_equal '/tags',         sites(:first).tag_url
-    assert_equal '/tags/foo',     sites(:first).tag_url('foo')
-    assert_equal '/tags/foo/bar', sites(:first).tag_url('foo', 'bar')
+    assert_equal '/tags',           sites(:first).tag_url
+    assert_equal '/tags/foo',       sites(:first).tag_url('foo')
+    assert_equal '/tags/foo/bar',   sites(:first).tag_url('foo', 'bar')
+    assert_equal '/tags/foo%20bar', sites(:first).tag_url('foo bar')
   end
 
   specify "should order sections in site" do
-    assert_reorder_sections [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links)],
-                            [sections(:home), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:about)]
+    assert_reorder_sections [sections(:home), sections(:about), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:paged_section)],
+                            [sections(:home), sections(:earth), sections(:europe), sections(:africa), sections(:bucharest), sections(:links), sections(:about), sections(:paged_section)]
+  end
+
+  specify "should find at least one extension (.liquid)" do
+    assert !Site.extensions.empty?
+    assert Site.extensions.include?(".liquid")
   end
 
   protected
@@ -175,4 +181,4 @@
     assert_valid @site
     assert_equal 'article/:id', @site.permalink_style
   end
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/test/unit/tag_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/tag_test.rb
--- mephisto-0.7.3/test/unit/tag_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/tag_test.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,57 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TagTest < Test::Unit::TestCase
-  fixtures :tags
-
-  def test_should_parse_comma_separated_tags
-    assert_equal %w(a b c), Tag.parse('a, b, c')
-    assert_equal %w(a b\ c), Tag.parse('a, b c')
-  end
-
-  def test_should_parse_simple_tags
-    assert_equal %w(a b c), Tag.parse("'a' 'b' 'c'")
-    assert_equal %w(a b c), Tag.parse('"a" "b" "c"')
-  end
-
-  def test_should_parse_more_complicated_tags
-    # with quotation marks _in_ the string.
-    assert_equal %w(tagging it's weirdness), Tag.parse('tagging, it\'s, weirdness')
-    assert_equal %w(tagging it"s weirdness), Tag.parse('tagging, it"s, weirdness')
-    assert_equal %w(tagging it's weirdness), Tag.parse('"tagging" "it\'s" "weirdness"')
-    assert_equal %w(tagging it's weirdness), Tag.parse("'tagging' 'it's' 'weirdness'")
-    # with spaces...
-    assert_equal %w(tagging it's\ weirdness), Tag.parse("'tagging' 'it's weirdness'")
-    assert_equal %w(tagging it's\ weirdness), Tag.parse('"tagging" "it\'s weirdness"')
-  end
-
-  def test_should_return_tag_array
-    assert_equal %w(a b c), Tag.parse(%w(a b c))
-  end
-  
-  def test_should_return_unique_tags
-    ["a, b, b", %('a' 'b' 'b'), %("a" "b" " b ")].each do |input|
-      assert_equal %w(a b), Tag.parse(input), "Failed for: #{input.inspect}"
-    end
-  end
-
-  def test_should_find_or_create_tags
-    assert_difference Tag, :count do
-      Tag.find_or_create %w(ruby rails foo)
-    end
-  end
-
-  def test_should_create_tags_from_comma_separated_list
-    assert_difference Tag, :count, 3 do
-      Tag.parse_to_tags 'ruby, a, b, rails, c'
-    end
-  end
-
-  def test_tag_equality
-    assert_equal tags(:ruby), 'ruby'
-    assert_equal Tag.find_by_name('ruby'), tags(:ruby)
-  end
-
-  def test_should_select_tags_by_name
-    assert_equal tags(:ruby), Tag[:ruby]
-  end
-end
diff -Nur mephisto-0.7.3/test/unit/template_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/template_test.rb
--- mephisto-0.7.3/test/unit/template_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/template_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -34,5 +34,17 @@
 
   def test_should_find_custom
     assert_equal ['alt_layout.liquid', 'author.liquid', 'home.liquid', 'index.liquid', 'page.liquid'], sites(:first).templates.custom.sort
+    assert_equal ['alt_layout.liquid', 'author.liquid', 'home.liquid', 'index.liquid', 'page.liquid'], sites(:first).templates.custom(".liquid").sort
   end
+
+  def test_template_types_should_use_extension
+    assert_equal ["archive.liquid", "error.liquid", "layout.liquid", "search.liquid", "section.liquid", "single.liquid", "tag.liquid"], sites(:first).templates.template_types
+    assert_equal ["archive.test", "error.test", "layout.test", "search.test", "section.test", "single.test", "tag.test"], sites(:first).templates.template_types(".test")
+  end
+  
+  def test_collect_templates_find_correct_template
+    assert sites(:first).templates.collect_templates(:section, nil).include?(sites(:first).theme.path+"templates/section.liquid") 
+    assert sites(:first).templates.collect_templates(:section, "home.liquid").include?(sites(:first).theme.path+"templates/home.liquid") 
+  end
+
 end
diff -Nur mephisto-0.7.3/test/unit/theme_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/theme_test.rb
--- mephisto-0.7.3/test/unit/theme_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/theme_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -52,4 +52,21 @@
     end
     assert !dest.exist?
   end
+  
+  specify "should raise MissingThemesError on missing themes" do
+    site = Site.new
+    site.stubs(:themes).returns([])
+    site.stubs(:current_theme_path).returns(0)
+    assert_raises(MissingThemesError) { site.theme }
+  end
+  
+  specify "should retrieve extension" do
+    assert_equal ".liquid", @theme.extension
+  end
+  
+  specify "should find templates" do
+    assert_equal 15, @theme.attachments.size
+    assert_equal 12, @theme.templates.size
+    assert_equal 3, @theme.resources.size
+  end
 end
diff -Nur mephisto-0.7.3/test/unit/url_filters_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/url_filters_test.rb
--- mephisto-0.7.3/test/unit/url_filters_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/url_filters_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -28,7 +28,7 @@
   end
 
   specify "should generate monthly link" do
-    assert_equal "<a href=\"/archives/2006/1\">January 2006</a>", link_to_month(sections(:home).to_liquid, '2006-1')
+    assert_equal "<a href=\"/archives/2006/1\" title=\"January 2006\">January 2006</a>", link_to_month(sections(:home).to_liquid, '2006-1')
   end
 
   specify "should generate paged url" do
@@ -43,6 +43,28 @@
     assert_equal "/welcome-to-cupcake", page_url(contents(:cupcake_welcome).to_liquid)
   end
 
+  specify "should generate paged url for home section" do
+    assert_equal "/",                    page_url(contents(:welcome).to_liquid(:page => true), sections(:home).to_liquid)
+    assert_equal "/welcome-to-mephisto", page_url(contents(:welcome).to_liquid, sections(:home).to_liquid)
+  end
+  
+  specify "should generate section links" do
+    other_section = link_to_section(sections(:home).to_liquid)
+    home_section  = link_to_section(sections(:about).to_liquid)
+    
+    assert_match    %r(href="/"),                         other_section
+    assert_match    %r(href="/about"),                    home_section
+    assert_match    %r(class="selected"),                 home_section
+    assert_no_match %r(class="selected"),                 other_section
+    assert_match    %r(title="#{sections(:home).name}"),  other_section
+    assert_match    %r(title="#{sections(:about).name}"), home_section
+  end
+
+  specify "should generate paged url for home section" do
+    assert_equal "/",                    page_url(contents(:welcome).to_liquid(:page => true), sections(:home).to_liquid)
+    assert_equal "/welcome-to-mephisto", page_url(contents(:welcome).to_liquid, sections(:home).to_liquid)
+  end
+
   specify "should generate asset urls" do
     assert_equal "/javascripts/foo.js",  javascript_url('foo.js')
     assert_equal "/stylesheets/foo.css", stylesheet_url('foo.css')
@@ -69,18 +91,19 @@
   end
 
   specify "should generate tag urls" do
-    assert_equal "/tags",         tag_url
-    assert_equal "/tags/foo",     tag_url('foo')
-    assert_equal "/tags/foo/bar", tag_url('foo', 'bar')
+    assert_equal "/tags",           tag_url
+    assert_equal "/tags/foo",       tag_url('foo')
+    assert_equal "/tags/foo/bar",   tag_url('foo', 'bar')
+    assert_equal '/tags/foo%20bar', tag_url('foo bar')
   end
   
   specify "should generate tag links" do
-    assert_equal "<a href=\"/tags/foo\">foo</a>", link_to_tag('foo')
+    assert_equal "<a href=\"/tags/foo\" rel=\"tag\" title=\"foo\">foo</a>", link_to_tag('foo')
   end
   
   specify "should generate search urls" do
-    assert_equal '/search?q=abc',        search_url('abc')
-    assert_equal '/search?q=abc&page=2', search_url('abc', 2)
+    assert_equal '/search?q=abc',            search_url('abc')
+    assert_equal '/search?q=abc&amp;page=2', search_url('abc', 2)
   end
   
   specify "should generate atom auto discovery tag" do
@@ -131,8 +154,8 @@
     assert_match /href="\/feed\/about\/atom.xml"/, content
     assert_match /title="About Articles"/, content
   end
-  
-  specify "should html encoding of anchor text" do
+	  
+  specify "should html encode anchor text" do
     unencoded = 'Tom & Jerry'
     contents(:welcome).title = unencoded
     @article = contents(:welcome).to_liquid
@@ -143,6 +166,140 @@
     assert_match %r{>Tom &amp; Jerry<\/a>}, link_to_section(@context['section'])
     assert_match %r{>Tom &amp; Jerry<\/a>}, link_to_tag(unencoded)
   end
+  
+  specify "should link to search result with article link" do
+    @article = contents(:welcome).to_liquid
+    @article.context = @context
+    @context['section'] = nil
+    assert_match /href="\/\d{4}\/\d+\/\d+\/welcome-to-mephisto"/, link_to_search_result(@article)
+  end
+  
+  specify "should link to search result with page link" do
+    @article = contents(:welcome).to_liquid(:page => true)
+    @article.context = @context
+    @article2 = contents(:another).to_liquid
+    @article2.context = @context
+    assert_match /href="\/about"/, link_to_search_result(@article)
+    assert_match /href="\/about\/another-welcome-to-mephisto"/, link_to_search_result(@article2)
+  end
+end
+
+context "Link_to Url Filters" do
+  fixtures :sites, :sections, :contents
+  include CoreFilters, UrlFilters
+
+  def setup
+    @context = mock_context 'site' => sites(:first).to_liquid
+    @section = sections(:about).to_liquid
+    @article = contents(:welcome).to_liquid
+    @paged_article = contents(:about).to_liquid
+    @article.context = @paged_article.context = @context
+  end
+
+  specify "should generate links with custom text" do
+    pattern = %r(^<a href="[^"]+" (?:rel="tag" )?title="Custom text">Custom text</a>$)
+    args = 'Custom text'
+    assert_match pattern, link_to_article(@article, args)
+    assert_match pattern, link_to_page(@article, @section, args)
+    assert_match pattern, link_to_section(@section, args)
+    assert_match pattern, link_to_comments(@article, args)
+    assert_match pattern, link_to_tag('foo', args)
+    assert_match pattern, link_to_month(@section, '2006-1', 'my', args)
+    assert_match pattern, link_to_search_result(@article, args)
+    @context['section'] = @section
+    assert_match pattern, link_to_search_result(@paged_article, args)
+  end
+
+  specify "should generate links with custom title attribute" do
+    pattern = %r(^<a href="[^"]+" (?:rel="tag" )?title="Custom title">)
+    args = [nil, 'Custom title']
+    assert_match pattern, link_to_article(@article, *args)
+    assert_match pattern, link_to_page(@article, @section, *args)
+    assert_match pattern, link_to_section(@section, *args)
+    assert_match pattern, link_to_comments(@article, *args)
+    assert_match pattern, link_to_tag('foo', *args)
+    assert_match pattern, link_to_month(@section, '2006-1', 'my', *args)
+    assert_match pattern, link_to_search_result(@article, *args)
+    @context['section'] = @section
+    assert_match pattern, link_to_search_result(@paged_article, *args)
+  end
+
+  specify "should generate links with custom id attribute" do
+    pattern = %r(^<a href="[^"]+" id="custom-id" (?:rel="tag" )?title="[^"]+">)
+    args = [nil, nil, 'custom-id']
+    assert_match pattern, link_to_article(@article, *args)
+    assert_match pattern, link_to_page(@article, @section, *args)
+    assert_match pattern, link_to_section(@section, *args)
+    assert_match pattern, link_to_comments(@article, *args)
+    assert_match pattern, link_to_tag('foo', *args)
+    assert_match pattern, link_to_month(@section, '2006-1', 'my', *args)
+    assert_match pattern, link_to_search_result(@article, *args)
+    @context['section'] = @section
+    assert_match pattern, link_to_search_result(@paged_article, *args)
+  end
+
+  specify "should generate links with custom class attribute" do
+    pattern = %r(^<a class="custom-class" href="[^"]+" (?:rel="tag" )?title="[^"]+">)
+    args = [nil, nil, nil, 'custom-class']
+    assert_match pattern, link_to_article(@article, *args)
+    assert_match pattern, link_to_page(@article, @section, *args)
+    assert_match pattern, link_to_section(@section, *args)
+    assert_match pattern, link_to_comments(@article, *args)
+    assert_match pattern, link_to_tag('foo', *args)
+    assert_match pattern, link_to_month(@section, '2006-1', 'my', *args)
+    assert_match pattern, link_to_search_result(@article, *args)
+    @context['section'] = @section
+    assert_match pattern, link_to_search_result(@paged_article, *args)
+  end
+
+  specify "should generate links with custom rel attribute" do
+    pattern = %r(^<a href="[^"]+" rel="custom-rel" title="[^"]+">)
+    args = [nil, nil, nil, nil, 'custom-rel']
+    assert_match pattern, link_to_article(@article, *args)
+    assert_match pattern, link_to_page(@article, @section, *args)
+    assert_match pattern, link_to_section(@section, *args)
+    assert_match pattern, link_to_comments(@article, *args)
+    assert_match pattern, link_to_tag('foo', *args)
+    assert_match pattern, link_to_month(@section, '2006-1', 'my', *args)
+    assert_match pattern, link_to_search_result(@article, *args)
+    @context['section'] = @section
+    assert_match pattern, link_to_search_result(@paged_article, *args)
+  end
+  
+  specify "should html encode custom attributes" do
+    pattern = %r(^<a class="custom&amp;class" href="[^"]+" id="custom&amp;id" rel="custom&amp;rel" title="Custom &amp; title">Custom &amp; text</a>$)
+    args = ['Custom & text', 'Custom & title', 'custom&id', 'custom&class', 'custom&rel']
+    assert_match pattern, link_to_article(@article, *args)
+    assert_match pattern, link_to_page(@article, @section, *args)
+    assert_match pattern, link_to_section(@section, *args)
+    assert_match pattern, link_to_comments(@article, *args)
+    assert_match pattern, link_to_tag('foo', *args)
+    assert_match pattern, link_to_month(@section, '2006-1', 'my', *args)
+    assert_match pattern, link_to_search_result(@article, *args)
+    @context['section'] = @section
+    assert_match pattern, link_to_search_result(@paged_article, *args)
+  end
+
+  specify "should generate page links with selected class appended to custom class attribute" do
+    pattern = %r(class="custom-class selected")
+    args    = [nil, nil, nil, 'custom-class']
+
+    @context['section'] = @section
+    @context['article'] = @paged_article
+
+    assert_match    pattern, link_to_page(@paged_article, @section, *args)
+    assert_no_match pattern, link_to_page(@article, @section, *args)
+   end
+
+  specify "should generate section links with selected class appended to custom class attribute" do
+    pattern = %r(class="custom-class selected")
+    args    = [nil, nil, nil, 'custom-class']
+
+    @context['section'] = @section
+
+    assert_match    pattern, link_to_section(@section, *args)
+    assert_no_match pattern, link_to_section(sections(:home).to_liquid, *args)
+  end
 end
 
 context "Article Url Filters" do
@@ -177,4 +334,4 @@
     content = changes_feed(@article, "Welcome Changes")
     assert_match /title="Welcome Changes"/, content
   end
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/test/unit/user_mailer_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/user_mailer_test.rb
--- mephisto-0.7.3/test/unit/user_mailer_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/test/unit/user_mailer_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -23,7 +23,7 @@
     user = users(:quentin)
     response = UserMailer.deliver_forgot_password(user)
     assert_equal user.email, response.to[0]
-    assert_match /#{url_for :controller => :account, :action => :activate, :id => user.token}/, response.body
+    assert_match /#{url_for :controller => 'account', :action => 'activate', :id => user.token}/, response.body
   end
 
   private
diff -Nur mephisto-0.7.3/themes/default/layouts/layout.liquid technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/themes/default/layouts/layout.liquid
--- mephisto-0.7.3/themes/default/layouts/layout.liquid	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/themes/default/layouts/layout.liquid	2008-03-31 02:18:56.000000000 -0400
@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{% head %}
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-  <title>{{ site.title }} {% if article %} {{ article.title }} {% else %} {{ site.subtitle }}  {% endif %}</title>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <title>{{ site.title }} {% if article %} {{ article.title }} {% else %} {{ site.subtitle }} {% endif %}</title>
   <meta name="generator" content="Mephisto" />
   {{ 'main' | stylesheet }}
-  {{ head.feed }}
-{% endhead %}
+  {{ site.home_section | articles_feed }}
+</head>
 <body>
 
   <div id="wrap">
@@ -23,7 +23,7 @@
         <label for="q">Search:</label>
 				<input type="text" id="q" value="" name="q" size="15" />
 			</form>
-      {% if site.page_sections  %}
+      {% if site.page_sections %}
         <h2>Pages</h2>
         <ul>
           {% for page in site.page_sections %}<li>{{ page | link_to_section }}</li>{% endfor %}
diff -Nur mephisto-0.7.3/themes/default/templates/search.liquid technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/themes/default/templates/search.liquid
--- mephisto-0.7.3/themes/default/templates/search.liquid	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/themes/default/templates/search.liquid	2008-03-31 02:18:56.000000000 -0400
@@ -6,7 +6,7 @@
           {% for article in articles %}
             <li>
               <span class="date">{{article.published_at | date: '%d.%m.%y' }}</span>  
-              {{ article | link_to_article }} posted in 
+              {{ article | link_to_search_result }} posted in 
               {% for section in article.sections %}
                 {{section | link_to_section }}
               {% endfor %}
@@ -19,7 +19,7 @@
 		  	<div class="secondary">
       		<h2>Your search results</h2>
       		<div class="featured">
-      			<p>We hope you found the results your looking for.</p>
+      			<p>We hope you found the results you were looking for.</p>
       	</div>
       </div>
       
diff -Nur mephisto-0.7.3/vendor/plugins/aaa/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/aaa/init.rb
--- mephisto-0.7.3/vendor/plugins/aaa/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/aaa/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,69 @@
+# temporarily load this before all other plugins
+::Object::RAILS_PATH = Pathname.new(File.expand_path(RAILS_ROOT))
+
+Module.class_eval do
+  # A hash that maps Class names to an array of Modules to mix in when the class is instantiated.
+  @@class_mixins = {} unless defined?(@@class_mixins)
+  mattr_reader :class_mixins
+
+  # Specifies that this module should be included into the given classes when they are instantiated.
+  #
+  #   module FooMethods
+  #     include_into "Foo", "Bar"
+  #   end
+  #
+  # You can also specify a hash to have your module's methods alias_method_chained to the target 
+  # class' methods.
+  #
+  #   module FooMethods
+  #      include_into "Foo", :method => :feature
+  #   end
+  #
+  # This will alias Foo#method to the newly included FooMethods#method_with_feature. The former
+  # method Foo#method will continue to be available as Foo#method_without_feature.
+  #
+  def include_into(*klasses)
+    klasses.flatten!
+    aliases = klasses.last.is_a?(Hash) ? klasses.pop : {}
+    klasses.each do |klass|
+      (@@class_mixins[klass] ||= []) << [name.to_s, aliases]
+      @@class_mixins[klass].uniq!
+    end
+  end
+
+  # add any class mixins that have been registered for this class
+  def auto_include!
+    if mixins = @@class_mixins[name]
+      mixins.each do |name, aliases| 
+        include name.constantize
+        aliases.each { |args| alias_chain *args }
+      end
+    end
+  end
+  
+  def alias_chain(target, feature)
+    (class << self; self end).class_eval <<-EOC, __FILE__, __LINE__      
+      def method_added_with_#{target}_#{feature}(method)
+        if method == :#{target} && !method_defined?(:#{target}_without_#{feature})
+          alias_method_chain :#{target}, :#{feature}
+        end
+        method_added_without_#{target}_#{feature}(method)
+      end
+      alias_method_chain :method_added, :#{target}_#{feature}
+    EOC
+  end
+end
+
+Class.class_eval do
+  # Instantiates a class and adds in any class_mixins that have been registered for it.
+  def inherited_with_mixins(klass)
+    returning inherited_without_mixins(klass) do |value|
+      klass.auto_include!
+    end
+  end
+  
+  alias_method_chain :inherited, :mixins
+end
+
+require 'mephisto/plugin'
+
diff -Nur mephisto-0.7.3/vendor/plugins/aaa/test/include_into_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/aaa/test/include_into_test.rb
--- mephisto-0.7.3/vendor/plugins/aaa/test/include_into_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/aaa/test/include_into_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,45 @@
+ENV['RAILS_ENV'] = 'test'
+RAILS_ROOT = File.join(File.dirname(__FILE__), '../../../../')
+
+require 'rubygems'
+require 'active_support'
+require 'test/unit' 
+
+require File.join(File.dirname(__FILE__), '..', 'init.rb')
+
+module Chocolate
+  include_into 'Cookie', 'Coffee', :taste => :chocolate
+  def taste_with_chocolate; "#{self.class.name} with chocolate!" end
+end
+
+module Latte
+  include_into 'Coffee', 'Chai'
+end
+
+class Cookie
+  def taste; "just a #{self.class.name}" end
+end
+
+class Coffee
+  def taste; "just a #{self.class.name}" end
+end
+
+class Chai
+end
+
+class IncludeIntoTest < Test::Unit::TestCase
+  def test_module_should_be_included_to_given_classes
+    assert Cookie.included_modules.include?(Chocolate)
+    assert Coffee.included_modules.include?(Chocolate)
+  end
+  
+  def test_methods_should_be_alias_chained_in_given_classes
+    assert_equal 'Cookie with chocolate!', Cookie.new.taste
+    assert_equal 'Coffee with chocolate!', Coffee.new.taste
+  end
+  
+  def test_should_work_without_alias_option
+    assert Coffee.included_modules.include?(Latte)
+    assert Chai.included_modules.include?(Latte)
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/README
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/README	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/README	1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
-Acts as Attachment
-=====================
-
-Acts as Attachment allows you to specify that a model accepts file uploads and stores the necessary meta info (filename, size, etc).
-
-See http://technoweenie.stikipad.com/plugins/show/Acts+as+Attachment for some documentation.
-
-Now, with simple generator!
-
-  script/generate attachment_model photo
-
-This is still under heavy development, so look at test/fixtures/attachment.rb for example usage
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/Rakefile
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/Rakefile	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/Rakefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the acts_as_attachment plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the acts_as_attachment plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActsAsAttachment'
-  rdoc.options << '--line-numbers --inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/USAGE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/USAGE
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/USAGE	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/USAGE	1969-12-31 19:00:00.000000000 -0500
@@ -1,19 +0,0 @@
-Description:
-    The model generator creates stubs for a new model with acts_as_attachment.
-
-    The generator takes a model name as its argument.  The model name may be
-    given in CamelCase or under_score and should not be suffixed with 'Model'.
-
-    The generator creates a model class in app/models, a test suite in
-    test/unit, test fixtures in test/fixtures/singular_name.yml, and a migration
-    in db/migrate.
-
-Example:
-    ./script/generate attachment_model Photo
-
-    This will create an Photo model:
-        Model:      app/models/photo.rb
-        Test:       test/unit/photo_test.rb
-        Fixtures:   test/fixtures/photos.yml
-        Migration:  db/migrate/XXX_add_photos.rb (sorry, adults only)
-
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/attachment_model_generator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/attachment_model_generator.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/attachment_model_generator.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/attachment_model_generator.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,34 +0,0 @@
-class AttachmentModelGenerator < Rails::Generator::NamedBase
-  default_options :skip_migration => false
-
-  def manifest
-    record do |m|
-      # Check for class naming collisions.
-      m.class_collisions class_path, class_name, "#{class_name}Test"
-
-      # Model, test, and fixture directories.
-      m.directory File.join('app/models', class_path)
-      m.directory File.join('test/unit', class_path)
-      m.directory File.join('test/fixtures', class_path)
-
-      # Model class, unit test, and fixtures.
-      m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
-      m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
-      m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{table_name}.yml")
-
-      unless options[:skip_migration]
-        m.migration_template 'migration.rb', 'db/migrate', :assigns => {
-          :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
-        }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
-      end
-    end
-  end
-
-  protected
-    def add_options!(opt)
-      opt.separator ''
-      opt.separator 'Options:'
-      opt.on("--skip-migration", 
-             "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
-    end
-end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/fixtures.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/fixtures.yml
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/fixtures.yml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/fixtures.yml	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-first:
-  id: 1
-another:
-  id: 2
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/migration.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/migration.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/migration.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/migration.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,29 +0,0 @@
-class <%= migration_name %> < ActiveRecord::Migration
-  def self.up
-    create_table :<%= table_name %> do |t|
-      t.column "content_type", :string
-      t.column "filename", :string     
-      t.column "size", :integer
-      
-      # used with thumbnails, always required
-      t.column "parent_id",  :integer 
-      t.column "thumbnail", :string
-      
-      # required for images only
-      t.column "width", :integer  
-      t.column "height", :integer
-    end
-
-    # only for db-based files
-    # create_table :db_files, :force => true do |t|
-    #      t.column :data, :binary
-    # end
-  end
-
-  def self.down
-    drop_table :<%= table_name %>
-    
-    # only for db-based files
-    # drop_table :db_files
-  end
-end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/model.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/model.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/model.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/model.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,3 +0,0 @@
-class <%= class_name %> < ActiveRecord::Base
-  acts_as_attachment
-end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/unit_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/unit_test.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/unit_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/generators/attachment_model/templates/unit_test.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
-
-class <%= class_name %>Test < Test::Unit::TestCase
-  fixtures :<%= table_name %>
-
-  # Replace this with your real tests.
-  def test_truth
-    assert true
-  end
-end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/init.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/init.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/init.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-begin
-  require 'RMagick'
-rescue LoadError
-  # boo hoo no rmagick
-end
-ActiveRecord::Base.send(:include, Technoweenie::ActsAsAttachment)
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/install.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/install.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/install.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/install.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-puts IO.read(File.join(File.dirname(__FILE__), 'README'))
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/lib/db_file.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/lib/db_file.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/lib/db_file.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/lib/db_file.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-class DbFile < ActiveRecord::Base
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/lib/technoweenie/acts_as_attachment.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/lib/technoweenie/acts_as_attachment.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/lib/technoweenie/acts_as_attachment.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/lib/technoweenie/acts_as_attachment.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,407 +0,0 @@
-module Technoweenie # :nodoc:
-  module ActsAsAttachment # :nodoc:
-    @@content_types = ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png']
-    mattr_reader :content_types
-
-    def self.included(base) # :nodoc:
-      base.extend ActMethods
-    end
-    
-    module ActMethods
-      # Options: 
-      #   <tt>:content_type</tt> - Allowed content types.  Allows all by default.  Use :image to allow all standard image types.
-      #   <tt>:min_size</tt> - Minimum size allowed.  1 byte is the default.
-      #   <tt>:max_size</tt> - Maximum size allowed.  1.megabyte is the default.
-      #   <tt>:size</tt> - Range of sizes allowed.  (1..1.megabyte) is the default.  This overrides the :min_size and :max_size options.
-      #   <tt>:resize_to</tt> - Used by RMagick to resize images.  Pass either an array of width/height, or a geometry string.
-      #   <tt>:thumbnails</tt> - Specifies a set of thumbnails to generate.  This accepts a hash of filename suffixes and RMagick resizing options.
-      #   <tt>:thumbnail_class</tt> - Set what class to use for thumbnails.  This attachment class is used by default.
-      #   <tt>:file_system_path</tt> - path to store the uploaded files.  Uses public/#{table_name} by default.  
-      #                                Setting this sets the :storage to :file_system.
-      #   <tt>:storage</tt> - Use :file_system to specify the attachment data is stored with the file system.  Defaults to :db_system.
-      #
-      # Examples:
-      #   acts_as_attachment :max_size => 1.kilobyte
-      #   acts_as_attachment :size => 1.megabyte..2.megabytes
-      #   acts_as_attachment :content_type => 'application/pdf'
-      #   acts_as_attachment :content_type => ['application/pdf', 'application/msword', 'text/plain']
-      #   acts_as_attachment :content_type => :image, :resize_to => [50,50]
-      #   acts_as_attachment :content_type => ['application/pdf', :image], :resize_to => 'x50'
-      #   acts_as_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
-      #   acts_as_attachment :storage => :file_system, :file_system_path => 'public/files'
-      #   acts_as_attachment :storage => :file_system, :file_system_path => 'public/files', 
-      #     :content_type => :image, :resize_to => [50,50]
-      #   acts_as_attachment :storage => :file_system, :file_system_path => 'public/files',
-      #     :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
-      def acts_as_attachment(options = {})
-        # this allows you to redefine the acts' options for each subclass, however
-        set_fs_path = options.keys.include? :file_system_path
-        options[:thumbnails]       ||= {}
-        options[:thumbnail_class]  ||= self
-        options[:min_size]         ||= 1
-        options[:max_size]         ||= 1.megabyte
-        options[:size]             ||= (options[:min_size]..options[:max_size])
-        options[:file_system_path] ||= File.join("public", table_name)
-        options[:file_system_path]   = options[:file_system_path][1..-1] if options[:file_system_path].first == '/'
-
-        # only need to define these once on a class
-        unless included_modules.include? InstanceMethods
-          class_inheritable_accessor :attachment_options
-
-          after_destroy :destroy_file
-
-          before_validation     :sanitize_filename
-          with_options :foreign_key => 'parent_id' do |m|
-            m.has_many   :thumbnails, :dependent => :destroy, :class_name => options[:thumbnail_class].to_s
-            m.belongs_to :parent, :class_name => self.base_class.to_s
-          end
-
-          include set_fs_path || options[:storage] == :file_system ? FileSystemMethods : DbFileMethods
-          after_save :create_attachment_thumbnails # allows thumbnails with parent_id to be created
-
-          extend  ClassMethods
-          include InstanceMethods
-        end
-        
-        options[:content_type] = [options[:content_type]].flatten.collect { |t| t == :image ? Technoweenie::ActsAsAttachment.content_types : t }.flatten unless options[:content_type].nil?
-        self.attachment_options = options
-      end
-    end
-
-    module ClassMethods
-      delegate :content_types, :to => Technoweenie::ActsAsAttachment
-
-      # Performs common validations for attachment models.
-      def validates_as_attachment
-        validates_presence_of :size, :content_type, :filename
-        validate              :attachment_attributes_valid?
-      end
-
-      # Returns true or false if the given content type is recognized as an image.
-      def image?(content_type)
-        content_types.include?(content_type)
-      end
-
-      # Yields a block containing an RMagick Image for the given binary data.
-      def with_image(binary_data, &block)
-        binary_data = Magick::Image::from_blob(binary_data).first unless !Object.const_defined?(:Magick) || binary_data.is_a?(Magick::Image)
-        block.call binary_data if block && binary_data
-      rescue 
-        # Log the failure to load the image.  This should match ::Magick::ImageMagickError
-        # but that would cause acts_as_attachment to require rmagick.
-        logger.debug("Exception working with image: #{$!}")
-        binary_data = nil
-      ensure
-        !binary_data.nil?
-      end
-
-      # Callback after an image has been resized.
-      #
-      #   class Foo < ActiveRecord::Base
-      #     acts_as_attachment
-      #     after_resize do |record, img| 
-      #       record.aspect_ratio = img.columns.to_f / img.rows.to_f
-      #     end
-      #   end
-      def after_resize(&block)
-        write_inheritable_array(:after_resize, [block])
-      end
-
-      # Callback after an attachment has been saved either to the file system or the DB.
-      # Only called if the file has been changed, not necessarily if the record is updated.
-      #
-      #   class Foo < ActiveRecord::Base
-      #     acts_as_attachment
-      #     after_attachment_saved do |record|
-      #       ...
-      #     end
-      #   end
-      def after_attachment_saved(&block)
-        write_inheritable_array(:after_attachment_saved, [block])
-      end
-
-      # Callback before a thumbnail is saved.  Use this to pass any necessary extra attributes that may be required.
-      #
-      #   class Foo < ActiveRecord::Base
-      #     acts_as_attachment
-      #     before_thumbnail_saved do |record, thumbnail|
-      #       ...
-      #     end
-      #   end
-      def before_thumbnail_saved(&block)
-        write_inheritable_array(:before_thumbnail_saved, [block])
-      end
-
-      # Get the thumbnail class, which is the current attachment class by default.
-      # Configure this with the :thumbnail_class option.
-      def thumbnail_class
-        attachment_options[:thumbnail_class] = attachment_options[:thumbnail_class].constantize unless attachment_options[:thumbnail_class].is_a?(Class)
-        attachment_options[:thumbnail_class]
-      end
-    end
-
-    module InstanceMethods
-      # Checks whether the attachment's content type is an image content type
-      def image?
-        self.class.image?(content_type.to_s.strip)
-      end
-
-      def thumbnail_class
-        self.class.thumbnail_class
-      end
-
-      # Gets the thumbnail name for a filename.  'foo.jpg' becomes 'foo_thumbnail.jpg'
-      def thumbnail_name_for(thumbnail = nil)
-        return filename unless thumbnail
-        basename, ext = filename.split '.'
-        "#{basename}_#{thumbnail}.#{ext}"
-      end
-
-      # Creates or updates the thumbnail for the current attachment.
-      def create_or_update_thumbnail(file_name_suffix, *size)
-        returning thumbnail_class.find_or_initialize_by_thumbnail_and_parent_id(file_name_suffix.to_s, id) do |thumb|
-          resized_image = resize_image_to(size)
-          return if resized_image.nil?
-          thumb.attributes = {
-            :content_type    => content_type, 
-            :filename        => thumbnail_name_for(file_name_suffix), 
-            :attachment_data => resized_image
-          }
-          callback_with_args :before_thumbnail_saved, thumb
-          thumb.save!
-        end
-      end
-
-      # This method handles the uploaded file object.  If you set the field name to uploaded_data, you don't need
-      # any special code in your controller.
-      #
-      #   <% form_for :attachment, :html => { :multipart => true } do |f| -%>
-      #     <p><%= f.file_field :uploaded_data %></p>
-      #     <p><%= submit_tag :Save %>
-      #   <% end -%>
-      #
-      #   @attachment = Attachment.create! params[:attachment]
-      def uploaded_data=(file_data)
-        return nil if file_data.nil? || file_data.size == 0 
-        self.content_type    = file_data.content_type.strip
-        self.filename        = file_data.original_filename.strip
-        self.attachment_data = file_data.read
-      end
-
-      # Sets the actual binary data.  This is typically called by uploaded_data=, but you can call this
-      # manually if you're creating from the console.  This is also where the resizing occurs.
-      def attachment_data=(data)
-        if data.nil?
-          @attachment_data = nil
-          @save_attachment = false
-          return nil
-        end
-        with_image data do |img|
-          resized_img       = (attachment_options[:resize_to] && parent_id.nil?) ? 
-            thumbnail_for_image(img, attachment_options[:resize_to]) : img
-          data              = resized_img.to_blob
-          self.width        = resized_img.columns if respond_to?(:width)
-          self.height       = resized_img.rows    if respond_to?(:height)
-          callback_with_args :after_resize, resized_img
-        end if image?
-        self.size = data.length
-        @attachment_data = data
-        @save_attachment = true
-      end
-
-      # Resizes a thumbnail.
-      def resize_image_to(size)
-        thumb = nil
-        with_image do |img|
-          thumb = thumbnail_for_image(img, size)
-        end
-        thumb
-      end
-
-      # Returns the width/height in a suitable format for the image_tag helper: (100x100)
-      def image_size
-        [width.to_s, height.to_s] * 'x'
-      end
-
-      # Allows you to work with an RMagick representation of the attachment in a block.  
-      #
-      #   @attachment.with_image do |img|
-      #     self.data = img.thumbnail(100, 100).to_blob
-      #   end
-      #
-      def with_image(data = self.attachment_data, &block)
-        self.class.with_image(data, &block)
-      end
-
-      def thumbnail_class
-        self.class.thumbnail_class
-      end
-
-      protected
-       # Performs the actual resizing operation for a thumbnail
-        def thumbnail_for_image(img, size)
-          size = size.first if size.is_a?(Array) && size.length == 1 && !size.first.is_a?(Fixnum)
-          if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum))
-            size = [size, size] if size.is_a?(Fixnum)
-            img.thumbnail(size.first, size[1])
-          else
-            img.change_geometry(size.to_s) { |cols, rows, image| image.resize(cols, rows) }
-          end
-        end
-        
-        def sanitize_filename
-          return unless filename
-          # NOTE: File.basename doesn't work right with Windows paths on Unix
-          # get only the filename, not the whole path
-          filename.gsub!(/^.*(\\|\/)/, '')
-        
-          # Finally, replace all non alphanumeric, underscore or periods with underscore
-          filename.gsub!(/[^\w\.\-]/, '_')
-        end
-        
-        # creates default thumbnails for parent attachments
-        def create_attachment_thumbnails
-          if image? && @save_attachment && !attachment_options[:thumbnails].blank? && parent_id.nil?
-            attachment_options[:thumbnails].each { |suffix, size| create_or_update_thumbnail(suffix, size) }
-          end
-          if @save_attachment
-            @save_attachment = nil
-            callback :after_attachment_saved
-          end
-        end
-        
-        # validates the size and content_type attributes according to the current model's options
-        def attachment_attributes_valid?
-          [:size, :content_type].each do |attr_name|
-            enum = attachment_options[attr_name]
-            errors.add attr_name, ActiveRecord::Errors.default_error_messages[:inclusion] unless enum.nil? || enum.include?(send(attr_name))
-          end
-        end
-        
-        # Yanked from ActiveRecord::Callbacks, modified so I can pass args to the callbacks besides self.
-        # Only accept blocks, however
-        def callback_with_args(method, arg = self)
-          notify(method)
-
-          result = nil
-          callbacks_for(method).each do |callback|
-            result = callback.call(self, arg)
-            return false if result == false
-          end
-
-          return result
-        end
-    end
-    
-    # Methods for DB backed attachments
-    module DbFileMethods
-      def self.included(base) #:nodoc:
-        base.belongs_to  :db_file
-        base.before_save :save_to_storage # so the db_file_id can be set
-      end
-
-      # Gets the attachment data
-      def attachment_data
-        @attachment_data ||= db_file.data
-      end
-
-      protected          
-        # Destroys the file.  Called in the after_destroy callback
-        def destroy_file
-          db_file.destroy if db_file
-        end
-        
-        # Saves the data to the DbFile model
-        def save_to_storage
-          if @save_attachment
-            (db_file || build_db_file).data = attachment_data
-            db_file.save!
-            self.db_file_id = db_file.id # needed for my own sanity, k thx
-          end
-          true
-        end
-    end
-    
-    # Methods for file system backed attachments
-    module FileSystemMethods
-      def self.included(base) #:nodoc:
-        base.before_update :rename_file
-        base.after_save    :save_to_storage # so the id can be part of the url
-      end
-
-      # Gets the attachment data
-      def attachment_data
-        return @attachment_data if @attachment_data
-        
-        filename = full_filename
-        File.open(filename, 'rb') do |file|
-          @attachment_data = file.read
-        end if File.file?(filename)
-        @attachment_data
-      end
-
-      # Gets the full path to the filename in this format:
-      #
-      #   # This assumes a model name like MyModel
-      #   # public/#{table_name} is the default filesystem path 
-      #   RAILS_ROOT/public/my_models/5/blah.jpg
-      #
-      # Overwrite this method in your model to customize the filename.
-      # The optional thumbnail argument will output the thumbnail's filename.
-      def full_filename(thumbnail = nil)
-        file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:file_system_path]
-        File.join(RAILS_ROOT, file_system_path, (parent_id || id).to_s, thumbnail_name_for(thumbnail))
-      end
-
-      # Used as the base path that #public_filename strips off full_filename to create the public path
-      def base_path
-        @base_path ||= File.join(RAILS_ROOT, 'public')
-      end
-
-      # Gets the public path to the file
-      # The optional thumbnail argument will output the thumbnail's filename.
-      def public_filename(thumbnail = nil)
-        full_filename(thumbnail).gsub %r(^#{Regexp.escape(base_path)}), ''
-      end
-
-      def filename=(value)
-        @old_filename = full_filename unless filename.nil? || @old_filename
-        write_attribute :filename, value
-      end
-
-      protected
-        # Destroys the file.  Called in the after_destroy callback
-        def destroy_file
-          FileUtils.rm full_filename rescue nil
-        end
-        
-        def rename_file
-          return unless @old_filename && @old_filename != full_filename
-          if @save_attachment && File.exists?(@old_filename)
-            FileUtils.rm @old_filename
-          elsif File.exists?(@old_filename)
-            FileUtils.mv @old_filename, full_filename
-          end
-          @old_filename =  nil
-          true
-        end
-        
-        # Saves the file to the file system
-        def save_to_storage
-          if @save_attachment
-            # TODO: This overwrites the file if it exists, maybe have an allow_overwrite option?
-            FileUtils.mkdir_p(File.dirname(full_filename))
-            
-            # TODO Convert to streaming storage to prevent excessive memory usage
-            # FileUtils.copy_stream is very efficient in regards to copies
-            # OR - get the tmp filename for large files and do FileUtils.cp ? *agile*
-            File.open(full_filename, "wb") do |file|
-              file.write(attachment_data)
-            end
-          end
-          @old_filename = nil
-          true
-        end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/meta.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/meta.yml
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/meta.yml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/meta.yml	1969-12-31 19:00:00.000000000 -0500
@@ -1,7 +0,0 @@
-author: 
-    name: technoweenie
-    homepage: http://techno-weenie.net
-summary: File upload handling plugin.
-homepage: http://technoweenie.stikipad.com
-plugin: http://svn.techno-weenie.net/projects/plugins/acts_as_attachment
-license: MIT
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/abstract_unit.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/abstract_unit.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/abstract_unit.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/abstract_unit.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,55 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
-require 'breakpoint'
-require 'active_record/fixtures'
-require 'action_controller/test_process'
-
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
-
-load(File.dirname(__FILE__) + "/schema.rb")
-
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
-
-class Test::Unit::TestCase #:nodoc:
-  include ActionController::TestProcess
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-
-  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
-  self.use_transactional_fixtures = true
-  
-  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
-  self.use_instantiated_fixtures  = false
-
-  # http://project.ioni.st/post/217#post-217
-  #
-  #  def test_new_publication
-  #    assert_difference(Publication, :count) do
-  #      post :create, :publication => {...}
-  #      # ...
-  #    end
-  #  end
-  # 
-  def assert_difference(object, method = nil, difference = 1)
-    initial_value = object.send(method)
-    yield
-    assert_equal initial_value + difference,
-      object.send(method)
-  end
-
-  def assert_no_difference(object, method, &block)
-    assert_difference object, method, 0, &block
-  end
-end
-
-require File.join(File.dirname(__FILE__), 'fixtures/attachment')
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/attachment_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/attachment_test.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/attachment_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/attachment_test.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,495 +0,0 @@
-require File.join(File.dirname(__FILE__), 'abstract_unit')
-
-# All sizes are commented out because they vary wildly among platforms
-class AttachmentTest < Test::Unit::TestCase
-  def setup
-    FileUtils.rm_rf File.join(File.dirname(__FILE__), 'files')
-  end
-
-  def test_should_create_image_from_uploaded_file
-    assert_created Attachment do
-      attachment = upload_file :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
-      assert  attachment.image?
-      assert !attachment.size.zero?
-      #assert_equal 1784, attachment.size
-      assert_equal 50,   attachment.width
-      assert_equal 64,   attachment.height
-      assert_equal '50x64', attachment.image_size
-    end
-  end
-
-  def test_should_create_file_from_uploaded_file
-    assert_created Attachment do
-      attachment = upload_file :filename => '/files/foo.txt'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
-      assert  attachment.image?
-      assert !attachment.size.zero?
-      #assert_equal 3, attachment.size
-      assert_nil      attachment.width
-      assert_nil      attachment.height
-    end
-  end
-
-  def test_should_create_image_from_uploaded_file_with_custom_content_type
-    assert_created Attachment do
-      attachment = upload_file :content_type => 'foo/bar', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert !attachment.image?
-      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
-      assert !attachment.size.zero?
-      #assert_equal 1784, attachment.size
-      assert_nil attachment.width
-      assert_nil attachment.height
-      assert_equal [],   attachment.thumbnails
-    end
-  end
-
-  def test_should_create_thumbnail
-    attachment = nil
-    assert_created Attachment do
-      attachment = upload_file :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    end
-    assert_equal 50, attachment.width
-    assert_equal 64, attachment.height
-    
-    assert_created Attachment do
-      basename, ext = attachment.filename.split '.'
-      thumbnail = attachment.create_or_update_thumbnail('thumb', 50, 50)
-      assert !thumbnail.new_record?, thumbnail.errors.full_messages.join("\n")
-      assert !thumbnail.size.zero?
-      #assert_in_delta 4673, thumbnail.size, 2
-      assert_equal 50,   thumbnail.width
-      assert_equal 50,   thumbnail.height
-      assert_equal [thumbnail], attachment.thumbnails
-      assert_equal attachment,  thumbnail.parent
-      assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
-    end
-  end
-
-  def test_should_create_thumbnail_with_geometry_string
-    attachment = nil
-    assert_created Attachment do
-      attachment = upload_file :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    end
-    assert_equal 50, attachment.width
-    assert_equal 64, attachment.height
-    
-    assert_created Attachment do
-      basename, ext = attachment.filename.split '.'
-      thumbnail = attachment.create_or_update_thumbnail('thumb', 'x50')
-      assert !thumbnail.new_record?, thumbnail.errors.full_messages.join("\n")
-      assert !thumbnail.size.zero?
-      #assert_equal 3915, thumbnail.size
-      assert_equal 39,   thumbnail.width
-      assert_equal 50,   thumbnail.height
-      assert_equal [thumbnail], attachment.thumbnails
-      assert_equal attachment,  thumbnail.parent
-      assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
-    end
-  end
-
-  def test_should_resize_image(klass = ImageAttachment)
-    assert_equal [50, 50], klass.attachment_options[:resize_to]
-    attachment = upload_file :class => klass, :filename => '/files/rails.png'
-    assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
-    assert  attachment.image?
-    assert !attachment.size.zero?
-    #assert_in_delta 4673, attachment.size, 2
-    assert_equal 50,   attachment.width
-    assert_equal 50,   attachment.height
-  end
-
-  def test_should_resize_image_with_geometry(klass = ImageOrPdfAttachment)
-    assert_equal 'x50', klass.attachment_options[:resize_to]
-    attachment = upload_file :class => klass, :filename => '/files/rails.png'
-    assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
-    assert  attachment.image?
-    assert !attachment.size.zero?
-    #assert_equal 3915, attachment.size
-    assert_equal 39,   attachment.width
-    assert_equal 50,   attachment.height
-  end
-
-  def test_should_automatically_create_thumbnails(klass = ImageWithThumbsAttachment)
-    assert_created klass, 3 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert !attachment.size.zero?
-      #assert_equal 1784, attachment.size
-      assert_equal 55,   attachment.width
-      assert_equal 55,   attachment.height
-      assert_equal 2,    attachment.thumbnails.length
-      assert_equal 1.0,  attachment.aspect_ratio
-      
-      thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
-      assert !thumb.new_record?, thumb.errors.full_messages.join("\n")
-      assert !thumb.size.zero?
-      #assert_in_delta 4673, thumb.size, 2
-      assert_equal 50,   thumb.width
-      assert_equal 50,   thumb.height
-      assert_equal 1.0,  thumb.aspect_ratio
-      
-      geo   = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-      assert !geo.new_record?, geo.errors.full_messages.join("\n")
-      assert !geo.size.zero?
-      #assert_equal 3915, geo.size
-      assert_equal 50,   geo.width
-      assert_equal 50,   geo.height
-      assert_equal 1.0,  geo.aspect_ratio
-    end
-  end
-
-  def test_should_give_correct_thumbnail_filenames
-    assert_created ImageWithThumbsFileAttachment, 3 do
-      attachment = upload_file :class => ImageWithThumbsFileAttachment, :filename => '/files/rails.png'
-      thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
-      geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-
-      assert_match /rails\.png$/,          attachment.full_filename
-      assert_match /rails_geometry\.png$/, attachment.full_filename(:geometry)
-      assert_match /rails_thumb\.png$/,    attachment.full_filename(:thumb)
-    end
-  end
-
-  #TODO: This is just a copy of the test above, need to find a way of making
-  # assert_created Attachment, only check for a DbFile record if the attachment
-  # is stored in the database
-  def test_should_automatically_create_thumbnails_for_file_attachment(klass = ImageWithThumbsFileAttachment)
-    assert_created klass, 3 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert !attachment.size.zero?
-      #assert_equal 1784, attachment.size
-      
-      assert_equal 55,   attachment.width
-      assert_equal 55,   attachment.height
-      assert_equal 2,    attachment.thumbnails.length
-      assert_equal 1.0,  attachment.aspect_ratio
-      
-      thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
-      assert !thumb.new_record?, thumb.errors.full_messages.join("\n")
-      assert !thumb.size.zero?
-      #assert_in_delta 4673, thumb.size, 2
-      assert_equal 50,   thumb.width
-      assert_equal 50,   thumb.height
-      assert_equal 1.0,  thumb.aspect_ratio
-      
-      geo   = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
-      assert !geo.new_record?, geo.errors.full_messages.join("\n")
-      assert !geo.size.zero?
-      #assert_equal 3915, geo.size
-      assert_equal 50,   geo.width
-      assert_equal 50,   geo.height
-      assert_equal 1.0,  geo.aspect_ratio
-    end
-  end
-  
-  def test_filesystem_size_for_file_attachment(klass = FileAttachment)
-    assert_created klass, 1 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert_equal attachment.size, File.open(attachment.full_filename).stat.size
-    end
-  end
-  
-  def test_should_not_overwrite_file_attachment(klass = FileAttachment)
-    assert_created klass, 2 do
-      real = upload_file :class => klass, :filename => '/files/rails.png'
-      assert !real.new_record?, real.errors.full_messages.join("\n")
-      assert !real.size.zero?
-      #assert_equal 1784,  real.size
-      
-      fake = upload_file :class => klass, :filename => '/files/fake/rails.png'
-      assert !fake.new_record?, fake.errors.full_messages.join("\n")
-      assert !fake.size.zero?
-      #assert_equal 4473,  fake.size
-      
-      real.reload && fake.reload
-      assert_not_equal real.attachment_data, fake.attachment_data
-      assert_not_equal File.open(real.full_filename).stat.size, File.open(fake.full_filename).stat.size
-    end
-  end
-
-  def test_should_reject_big_file
-    should_reject_by_size_with BigAttachment
-  end
-
-  def test_should_reject_small_file
-    should_reject_by_size_with SmallAttachment
-  end
-
-  def test_should_reject_invalid_content_type(klass = PdfAttachment)
-    assert_not_created do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert attachment.new_record?
-      assert attachment.errors.on(:content_type)
-    end
-  end
-
-  def test_should_allow_single_content_type(klass = PdfAttachment)
-    assert_created Attachment do
-      attachment = upload_file :class => klass, :content_type => 'pdf', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    end
-  end
-
-  def test_should_allow_single_image_content_type(klass = ImageAttachment)
-    assert_created klass do
-      attachment = upload_file :class => klass, :content_type => 'image/png', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    end
-  end
-
-  def test_should_allow_multiple_content_types(klass = DocAttachment)
-    assert_created klass, 3 do
-      attachment = upload_file :class => klass, :content_type => 'pdf', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      attachment = upload_file :class => klass, :content_type => 'doc', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      attachment = upload_file :class => klass, :content_type => 'txt', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    end
-  end
-
-  def test_should_allow_multiple_content_types_with_images(klass = ImageOrPdfAttachment)
-    assert_created klass, 2 do
-      attachment = upload_file :class => klass, :content_type => 'pdf', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      attachment = upload_file :class => klass, :content_type => 'image/png', :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-    end
-  end
-  
-  def test_should_require_size
-    assert_not_created do
-      att = Attachment.new :attachment_data => 'foo', :content_type => 'text/plain', :filename => 'foo.txt'
-      att.size = nil
-      assert !att.save
-      assert att.errors.on(:size)
-    end
-  end
-
-  def test_should_require_filename
-    assert_not_created do
-      att = Attachment.new :attachment_data => 'foo', :content_type => 'text/plain'
-      assert !att.save
-      assert att.errors.on(:filename)
-    end
-  end
-
-  def test_should_require_content_type
-    assert_not_created do
-      att = Attachment.new :attachment_data => 'foo', :filename => 'foo.txt'
-      assert !att.save
-      assert att.errors.on(:content_type)
-    end
-  end
-  
-  def test_reassign_attribute_data(klass = Attachment)
-    assert_created klass, 1 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert attachment.attachment_data.size > 0, "no data was set"
-      
-      attachment.attachment_data = 'wtf'
-      attachment.save
-      
-      assert_equal 'wtf', klass.find(attachment.id).attachment_data
-    end
-  end
-  
-  def test_no_reassign_attribute_data_on_nil(klass = Attachment)
-    assert_created klass, 1 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert attachment.attachment_data.size > 0, "no data was set"
-      
-      original = attachment.attachment_data.clone.freeze
-      attachment.attachment_data = nil
-      attachment.save
-      
-      assert_equal original, klass.find(attachment.id).attachment_data
-    end
-  end
-  
-  def test_should_store_file_attachment_in_filesystem(klass = FileAttachment)
-    attachment = nil
-    assert_created klass do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert !attachment.new_record?, attachment.errors.full_messages.join("\n")
-      assert File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
-    end
-    attachment
-  end
-
-  def test_should_overwrite_old_contents_when_updating(klass = Attachment)
-    attachment   = upload_file :class => klass, :filename => '/files/rails.png'
-    assert_not_created do # no new db_file records
-      attachment.filename        = 'rails2.png'
-      attachment.attachment_data = IO.read(File.join(File.dirname(__FILE__), 'fixtures/files/rails.png'))
-      attachment.save
-    end
-  end
-
-  def test_should_overwrite_old_thumbnail_records_when_updating(klass = ImageWithThumbsAttachment)
-    attachment = nil
-    assert_created klass, 3 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-    end
-    assert_not_created do # no new db_file records
-      attachment.filename        = 'rails2.png'
-      attachment.attachment_data = IO.read(File.join(File.dirname(__FILE__), 'fixtures/files/rails.png'))
-      attachment.save
-    end
-  end
-
-  def test_should_delete_old_file_when_updating(klass = FileAttachment)
-    attachment   = upload_file :class => klass, :filename => '/files/rails.png'
-    old_filename = attachment.full_filename
-    assert_not_created do
-      attachment.filename        = 'rails2.png'
-      attachment.attachment_data = IO.read(File.join(File.dirname(__FILE__), 'fixtures/files/rails.png'))
-      attachment.save
-      assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
-      assert !File.exists?(old_filename),             "#{old_filename} still exists"
-    end
-  end
-
-  def test_should_overwrite_old_thumbnail_records_when_renaming(klass = ImageWithThumbsAttachment)
-    attachment = nil
-    assert_created klass, 3 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-    end
-    assert_not_created do # no new db_file records
-      attachment.filename = 'rails2.png'
-      attachment.save
-      assert !attachment.reload.size.zero?
-      assert_equal 'rails2.png', attachment.filename
-    end
-  end
-
-  def test_should_delete_old_file_when_renaming(klass = FileAttachment)
-    attachment   = upload_file :class => klass, :filename => '/files/rails.png'
-    old_filename = attachment.full_filename
-    assert_not_created do
-      attachment.filename        = 'rails2.png'
-      attachment.save
-      assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
-      assert !File.exists?(old_filename),             "#{old_filename} still exists"
-      assert !attachment.reload.size.zero?
-      assert_equal 'rails2.png', attachment.filename
-    end
-  end
-
-  def test_should_remove_old_thumbnail_files_when_updating(klass = ImageWithThumbsFileAttachment)
-    attachment = nil
-    assert_created klass, 3 do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-    end
-    old_filenames = [attachment.full_filename] + attachment.thumbnails.collect(&:full_filename)
-    assert_not_created do
-      attachment.filename        = 'rails2.png'
-      attachment.attachment_data = IO.read(File.join(File.dirname(__FILE__), 'fixtures/files/rails.png'))
-      attachment.save
-      new_filenames = [attachment.reload.full_filename] + attachment.thumbnails.collect { |t| t.reload.full_filename }
-      new_filenames.each { |f| assert  File.exists?(f), "#{f} does not exist" }
-      old_filenames.each { |f| assert !File.exists?(f), "#{f} still exists" }
-    end
-  end
-
-  def test_should_delete_file_when_in_file_system_when_attachment_record_destroyed(klass = ImageWithThumbsFileAttachment)
-    attachment = upload_file :class => klass, :filename => '/files/rails.png'
-    filenames = [attachment.full_filename] + attachment.thumbnails.collect(&:full_filename)
-    filenames.each { |f| assert  File.exists?(f),  "#{f} never existed to delete on destroy" }
-    attachment.destroy
-    filenames.each { |f| assert !File.exists?(f),  "#{f} still exists" }
-  end
-  
-  def test_should_use_thumbnail_subclass(klass = ImageWithThumbsClassFileAttachment)
-    assert_difference ImageThumbnail, :count do
-      attachment = upload_file :class => klass, :filename => '/files/rails.png'
-      assert_kind_of ImageThumbnail,  attachment.thumbnails.first
-      assert_equal attachment.id,     attachment.thumbnails.first.parent.id
-      assert_kind_of FileAttachment,  attachment.thumbnails.first.parent
-      assert_equal 'rails_thumb.png', attachment.thumbnails.first.filename
-      assert_equal attachment.thumbnails.first.full_filename, attachment.full_filename(attachment.thumbnails.first.thumbnail),
-        "#full_filename does not use thumbnail class' path."
-    end
-  end
-
-  def test_should_verify_image_content_types
-    ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png'].each do |content_type|
-      assert Attachment.image?(content_type)
-    end
-    ['text/plain', 'application/x-xls', 'application/xml'].each do |content_type|
-      assert !Attachment.image?(content_type)
-    end
-  end
-
-  def test_should_call_after_attachment_saved(klass = Attachment)
-    klass.saves = 0
-    assert_created klass do
-      upload_file :class => klass, :filename => '/files/rails.png'
-    end
-    assert_equal 1, klass.saves
-  end
-
-  # test that simple subclasses still work
-  {
-    :test_should_resize_image                             => ImageAttachment,
-    :test_should_resize_image_with_geometry               => ImageOrPdfAttachment,
-    :test_should_automatically_create_thumbnails          => ImageWithThumbsAttachment,
-    :test_should_reject_invalid_content_type              => PdfAttachment,
-    :test_should_allow_single_content_type                => PdfAttachment,
-    :test_should_allow_single_image_content_type          => ImageAttachment,
-    :test_should_allow_multiple_content_types             => DocAttachment,
-    :test_should_allow_multiple_content_types_with_images => ImageOrPdfAttachment,
-    :test_should_resize_image                             => ImageFileAttachment,
-    :test_reassign_attribute_data                         => FileAttachment,
-    :test_no_reassign_attribute_data_on_nil               => FileAttachment,
-    :test_should_use_thumbnail_subclass                   => ImageWithThumbsClassFileAttachment,
-    :test_should_call_after_attachment_saved              => Attachment
- }.each do |test_method, klass|
-    define_method("#{test_method}_on_subclass") { send test_method, Class.new(klass) }
-  end
-
-  protected
-    def upload_file(options = {})
-      att = (options[:class] || Attachment).create :uploaded_data => fixture_file_upload(options[:filename], options[:content_type] || 'image/png')
-      att.reload unless att.new_record?
-      att
-    end
-    
-    def assert_created(klass = Attachment, num = 1)
-      assert_difference klass, :count, num do
-        if klass.included_modules.include? DbFile
-          assert_difference DbFile, :count, num do
-            yield
-          end
-        else
-          yield
-        end
-      end
-    end
-    
-    def assert_not_created
-      assert_created Attachment, 0 do
-        yield
-      end
-    end
-    
-    def should_reject_by_size_with(klass)
-      assert_not_created do
-        attachment = upload_file :class => klass, :filename => '/files/rails.png'
-        assert attachment.new_record?
-        assert attachment.errors.on(:size)
-        assert_nil attachment.db_file if attachment.respond_to?(:db_file)
-      end
-    end
-end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/database.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/database.yml
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/database.yml	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/database.yml	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-sqlite:
-  :adapter: sqlite
-  :dbfile: acts_as_attachment_plugin.sqlite.db
-sqlite3:
-  :adapter: sqlite3
-  :dbfile: acts_as_attachment_plugin.sqlite3.db
-postgresql:
-  :adapter: postgresql
-  :username: postgres
-  :password: postgres
-  :database: acts_as_attachment_plugin_test
-  :min_messages: ERROR
-mysql:
-  :adapter: mysql
-  :host: localhost
-  :username: rails
-  :password:
-  :database: acts_as_attachment_plugin_test
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/fixtures/attachment.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/fixtures/attachment.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/fixtures/attachment.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/fixtures/attachment.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,73 +0,0 @@
-class Attachment < ActiveRecord::Base
-  @@saves = 0
-  cattr_accessor :saves
-  acts_as_attachment
-  validates_as_attachment
-  after_attachment_saved do |record|
-    self.saves += 1
-  end
-end
-
-class SmallAttachment < Attachment
-  acts_as_attachment :max_size => 1.kilobyte
-end
-
-class BigAttachment < Attachment
-  acts_as_attachment :size => 1.megabyte..2.megabytes
-end
-
-class PdfAttachment < Attachment
-  acts_as_attachment :content_type => 'pdf'
-end
-
-class DocAttachment < Attachment
-  acts_as_attachment :content_type => %w(pdf doc txt)
-end
-
-class ImageAttachment < Attachment
-  acts_as_attachment :content_type => :image, :resize_to => [50,50]
-end
-
-class ImageOrPdfAttachment < Attachment
-  acts_as_attachment :content_type => ['pdf', :image], :resize_to => 'x50'
-end
-
-class ImageWithThumbsAttachment < Attachment
-  acts_as_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
-  after_resize do |record, img|
-    record.aspect_ratio = img.columns.to_f / img.rows.to_f
-  end
-end
-
-class FileAttachment < ActiveRecord::Base
-  acts_as_attachment :file_system_path => 'vendor/plugins/acts_as_attachment/test/files'
-  validates_as_attachment
-end
-
-class ImageFileAttachment < FileAttachment
-  acts_as_attachment :file_system_path => 'vendor/plugins/acts_as_attachment/test/files', 
-    :content_type => :image, :resize_to => [50,50]
-end
-
-class ImageWithThumbsFileAttachment < FileAttachment
-  acts_as_attachment :file_system_path => 'vendor/plugins/acts_as_attachment/test/files',
-    :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
-  after_resize do |record, img|
-    record.aspect_ratio = img.columns.to_f / img.rows.to_f
-  end
-end
-
-class ImageWithThumbsClassFileAttachment < FileAttachment
-  acts_as_attachment :file_system_path => 'vendor/plugins/acts_as_attachment/test/files',
-    :thumbnails => { :thumb => [50, 50] }, :resize_to => [55,55],
-    :thumbnail_class => 'ImageThumbnail'
-end
-
-class ImageThumbnail < FileAttachment
-  acts_as_attachment :file_system_path => 'vendor/plugins/acts_as_attachment/test/files/thumbnails'
-end
-
-class SimpleAttachment < ActiveRecord::Base
-  acts_as_attachment
-  validates_as_attachment
-end
\ No newline at end of file
Files mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/fixtures/files/fake/rails.png and technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/fixtures/files/fake/rails.png differ
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/fixtures/files/foo.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/fixtures/files/foo.txt
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/fixtures/files/foo.txt	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/fixtures/files/foo.txt	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-foo
\ No newline at end of file
Files mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/fixtures/files/rails.png and technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/fixtures/files/rails.png differ
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/schema.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/schema.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_attachment/test/schema.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_attachment/test/schema.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,36 +0,0 @@
-ActiveRecord::Schema.define(:version => 0) do
-  create_table :attachments, :force => true do |t|
-    t.column :db_file_id,      :integer
-    t.column :parent_id,       :integer
-    t.column :thumbnail,       :string
-    t.column :filename,        :string, :limit => 255
-    t.column :content_type,    :string, :limit => 255
-    t.column :size,            :integer
-    t.column :width,           :integer
-    t.column :height,          :integer
-    t.column :aspect_ratio,    :float
-  end
-
-  create_table :file_attachments, :force => true do |t|
-    t.column :parent_id,       :integer
-    t.column :thumbnail,       :string 
-    t.column :filename,        :string, :limit => 255
-    t.column :content_type,    :string, :limit => 255
-    t.column :size,            :integer
-    t.column :width,           :integer
-    t.column :height,          :integer
-    t.column :type,            :string
-    t.column :aspect_ratio,    :float
-  end
-
-  create_table :simple_attachments, :force => true do |t|
-    t.column :filename,        :string, :limit => 255
-    t.column :content_type,    :string, :limit => 255
-    t.column :size,            :integer
-    t.column :type,            :string
-  end
-
-  create_table :db_files, :force => true do |t|
-    t.column :data, :binary
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_list/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/README
--- mephisto-0.7.3/vendor/plugins/acts_as_list/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,23 @@
+ActsAsList
+==========
+
+This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a +position+ column defined as an integer on the mapped database table.
+
+
+Example
+=======
+
+  class TodoList < ActiveRecord::Base
+    has_many :todo_items, :order => "position"
+  end
+
+  class TodoItem < ActiveRecord::Base
+    belongs_to :todo_list
+    acts_as_list :scope => :todo_list
+  end
+
+  todo_list.first.move_to_bottom
+  todo_list.last.move_higher
+
+
+Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_list/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/init.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_list/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+ActiveRecord::Base.send :include, ActiveRecord::Acts::List
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,253 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module List #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      # This +acts_as+ extension provides the capabilities for sorting and reordering a number of objects in a list.
+      # The class that has this specified needs to have a +position+ column defined as an integer on
+      # the mapped database table.
+      #
+      # Todo list example:
+      #
+      #   class TodoList < ActiveRecord::Base
+      #     has_many :todo_items, :order => "position"
+      #   end
+      #
+      #   class TodoItem < ActiveRecord::Base
+      #     belongs_to :todo_list
+      #     acts_as_list :scope => :todo_list
+      #   end
+      #
+      #   todo_list.first.move_to_bottom
+      #   todo_list.last.move_higher
+      module ClassMethods
+        # Configuration options are:
+        #
+        # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
+        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt> 
+        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible 
+        #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
+        #   Example: <tt>acts_as_list :scope => 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
+        def acts_as_list(options = {})
+          configuration = { :column => "position", :scope => "1 = 1" }
+          configuration.update(options) if options.is_a?(Hash)
+
+          configuration[:scope] = "#{configuration[:scope]}_id".intern if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
+
+          if configuration[:scope].is_a?(Symbol)
+            scope_condition_method = %(
+              def scope_condition
+                if #{configuration[:scope].to_s}.nil?
+                  "#{configuration[:scope].to_s} IS NULL"
+                else
+                  "#{configuration[:scope].to_s} = \#{#{configuration[:scope].to_s}}"
+                end
+              end
+            )
+          else
+            scope_condition_method = "def scope_condition() \"#{configuration[:scope]}\" end"
+          end
+
+          class_eval <<-EOV
+            include ActiveRecord::Acts::List::InstanceMethods
+
+            def acts_as_list_class
+              ::#{self.name}
+            end
+
+            def position_column
+              '#{configuration[:column]}'
+            end
+
+            #{scope_condition_method}
+
+            after_destroy  :remove_from_list
+            before_create  :add_to_list_bottom
+          EOV
+        end
+      end
+
+      # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
+      # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
+      # lower in the list of all chapters. Likewise, <tt>chapter.first?</tt> would return +true+ if that chapter is
+      # the first in the list of all chapters.
+      module InstanceMethods
+        # Insert the item at the given position (defaults to the top position of 1).
+        def insert_at(position = 1)
+          insert_at_position(position)
+        end
+
+        # Swap positions with the next lower item, if one exists.
+        def move_lower
+          return unless lower_item
+
+          acts_as_list_class.transaction do
+            lower_item.decrement_position
+            increment_position
+          end
+        end
+
+        # Swap positions with the next higher item, if one exists.
+        def move_higher
+          return unless higher_item
+
+          acts_as_list_class.transaction do
+            higher_item.increment_position
+            decrement_position
+          end
+        end
+
+        # Move to the bottom of the list. If the item is already in the list, the items below it have their
+        # position adjusted accordingly.
+        def move_to_bottom
+          return unless in_list?
+          acts_as_list_class.transaction do
+            decrement_positions_on_lower_items
+            assume_bottom_position
+          end
+        end
+
+        # Move to the top of the list. If the item is already in the list, the items above it have their
+        # position adjusted accordingly.
+        def move_to_top
+          return unless in_list?
+          acts_as_list_class.transaction do
+            increment_positions_on_higher_items
+            assume_top_position
+          end
+        end
+
+        # Removes the item from the list.
+        def remove_from_list
+          decrement_positions_on_lower_items if in_list?
+        end
+
+        # Increase the position of this item without adjusting the rest of the list.
+        def increment_position
+          return unless in_list?
+          update_attribute position_column, self.send(position_column).to_i + 1
+        end
+
+        # Decrease the position of this item without adjusting the rest of the list.
+        def decrement_position
+          return unless in_list?
+          update_attribute position_column, self.send(position_column).to_i - 1
+        end
+
+        # Return +true+ if this object is the first in the list.
+        def first?
+          return false unless in_list?
+          self.send(position_column) == 1
+        end
+
+        # Return +true+ if this object is the last in the list.
+        def last?
+          return false unless in_list?
+          self.send(position_column) == bottom_position_in_list
+        end
+
+        # Return the next higher item in the list.
+        def higher_item
+          return nil unless in_list?
+          acts_as_list_class.find(:first, :conditions =>
+            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}"
+          )
+        end
+
+        # Return the next lower item in the list.
+        def lower_item
+          return nil unless in_list?
+          acts_as_list_class.find(:first, :conditions =>
+            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}"
+          )
+        end
+
+        # Test if this record is in a list
+        def in_list?
+          !send(position_column).nil?
+        end
+
+        private
+          def add_to_list_top
+            increment_positions_on_all_items
+          end
+
+          def add_to_list_bottom
+            self[position_column] = bottom_position_in_list.to_i + 1
+          end
+
+          # Overwrite this method to define the scope of the list changes
+          def scope_condition() "1" end
+
+          # Returns the bottom position number in the list.
+          #   bottom_position_in_list    # => 2
+          def bottom_position_in_list(except = nil)
+            item = bottom_item(except)
+            item ? item.send(position_column) : 0
+          end
+
+          # Returns the bottom item
+          def bottom_item(except = nil)
+            conditions = scope_condition
+            conditions = "#{conditions} AND #{self.class.primary_key} != #{except.id}" if except
+            acts_as_list_class.find(:first, :conditions => conditions, :order => "#{position_column} DESC")
+          end
+
+          # Forces item to assume the bottom position in the list.
+          def assume_bottom_position
+            update_attribute(position_column, bottom_position_in_list(self).to_i + 1)
+          end
+
+          # Forces item to assume the top position in the list.
+          def assume_top_position
+            update_attribute(position_column, 1)
+          end
+
+          # This has the effect of moving all the higher items up one.
+          def decrement_positions_on_higher_items(position)
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} <= #{position}"
+            )
+          end
+
+          # This has the effect of moving all the lower items up one.
+          def decrement_positions_on_lower_items
+            return unless in_list?
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} > #{send(position_column).to_i}"
+            )
+          end
+
+          # This has the effect of moving all the higher items down one.
+          def increment_positions_on_higher_items
+            return unless in_list?
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} < #{send(position_column).to_i}"
+            )
+          end
+
+          # This has the effect of moving all the lower items down one.
+          def increment_positions_on_lower_items(position)
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} >= #{position}"
+           )
+          end
+
+          # Increments position (<tt>position_column</tt>) of all items in the list.
+          def increment_positions_on_all_items
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} + 1)",  "#{scope_condition}"
+            )
+          end
+
+          def insert_at_position(position)
+            remove_from_list
+            increment_positions_on_lower_items(position)
+            self.update_attribute(position_column, position)
+          end
+      end 
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_list/test/list_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/test/list_test.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_list/test/list_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_list/test/list_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,299 @@
+require 'test/unit'
+
+require 'rubygems'
+require 'active_record'
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require File.dirname(__FILE__) + '/../init'
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+
+def setup_db
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :mixins do |t|
+      t.column :pos, :integer
+      t.column :parent_id, :integer
+      t.column :created_at, :datetime      
+      t.column :updated_at, :datetime
+    end
+  end
+end
+
+def teardown_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+class Mixin < ActiveRecord::Base
+end
+
+class ListMixin < Mixin
+  acts_as_list :column => "pos", :scope => :parent
+
+  def self.table_name() "mixins" end
+end
+
+class ListMixinSub1 < ListMixin
+end
+
+class ListMixinSub2 < ListMixin
+end
+
+class ListWithStringScopeMixin < ActiveRecord::Base
+  acts_as_list :column => "pos", :scope => 'parent_id = #{parent_id}'
+
+  def self.table_name() "mixins" end
+end
+
+
+class ListTest < Test::Unit::TestCase
+
+  def setup
+    setup_db
+    (1..4).each { |counter| ListMixin.create! :pos => counter, :parent_id => 5 }
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_reordering
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_lower
+    assert_equal [1, 3, 2, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_higher
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_bottom
+    assert_equal [2, 3, 4, 1], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_top
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_to_bottom
+    assert_equal [1, 3, 4, 2], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(4).move_to_top
+    assert_equal [4, 1, 3, 2], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  end
+
+  def test_move_to_bottom_with_next_to_last_item
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+    ListMixin.find(3).move_to_bottom
+    assert_equal [1, 2, 4, 3], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  end
+
+  def test_next_prev
+    assert_equal ListMixin.find(2), ListMixin.find(1).lower_item
+    assert_nil ListMixin.find(1).higher_item
+    assert_equal ListMixin.find(3), ListMixin.find(4).higher_item
+    assert_nil ListMixin.find(4).lower_item
+  end
+
+  def test_injection
+    item = ListMixin.new(:parent_id => 1)
+    assert_equal "parent_id = 1", item.scope_condition
+    assert_equal "pos", item.position_column
+  end
+
+  def test_insert
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 2, new.pos
+    assert !new.first?
+    assert new.last?
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 3, new.pos
+    assert !new.first?
+    assert new.last?
+
+    new = ListMixin.create(:parent_id => 0)
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+  end
+
+  def test_insert_at
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 1, new.pos
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 2, new.pos
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 3, new.pos
+
+    new4 = ListMixin.create(:parent_id => 20)
+    assert_equal 4, new4.pos
+
+    new4.insert_at(3)
+    assert_equal 3, new4.pos
+
+    new.reload
+    assert_equal 4, new.pos
+
+    new.insert_at(2)
+    assert_equal 2, new.pos
+
+    new4.reload
+    assert_equal 4, new4.pos
+
+    new5 = ListMixin.create(:parent_id => 20)
+    assert_equal 5, new5.pos
+
+    new5.insert_at(1)
+    assert_equal 1, new5.pos
+
+    new4.reload
+    assert_equal 5, new4.pos
+  end
+
+  def test_delete_middle
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).destroy
+
+    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(1).pos
+    assert_equal 2, ListMixin.find(3).pos
+    assert_equal 3, ListMixin.find(4).pos
+
+    ListMixin.find(1).destroy
+
+    assert_equal [3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(3).pos
+    assert_equal 2, ListMixin.find(4).pos
+  end
+
+  def test_with_string_based_scope
+    new = ListWithStringScopeMixin.create(:parent_id => 500)
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+  end
+
+  def test_nil_scope
+    new1, new2, new3 = ListMixin.create, ListMixin.create, ListMixin.create
+    new2.move_higher
+    assert_equal [new2, new1, new3], ListMixin.find(:all, :conditions => 'parent_id IS NULL', :order => 'pos')
+  end
+
+end
+
+class ListSubTest < Test::Unit::TestCase
+
+  def setup
+    setup_db
+    (1..4).each { |i| ((i % 2 == 1) ? ListMixinSub1 : ListMixinSub2).create! :pos => i, :parent_id => 5000 }
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_reordering
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_lower
+    assert_equal [1, 3, 2, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_higher
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_bottom
+    assert_equal [2, 3, 4, 1], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_top
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_to_bottom
+    assert_equal [1, 3, 4, 2], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(4).move_to_top
+    assert_equal [4, 1, 3, 2], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+  end
+
+  def test_move_to_bottom_with_next_to_last_item
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+    ListMixin.find(3).move_to_bottom
+    assert_equal [1, 2, 4, 3], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+  end
+
+  def test_next_prev
+    assert_equal ListMixin.find(2), ListMixin.find(1).lower_item
+    assert_nil ListMixin.find(1).higher_item
+    assert_equal ListMixin.find(3), ListMixin.find(4).higher_item
+    assert_nil ListMixin.find(4).lower_item
+  end
+
+  def test_injection
+    item = ListMixin.new("parent_id"=>1)
+    assert_equal "parent_id = 1", item.scope_condition
+    assert_equal "pos", item.position_column
+  end
+
+  def test_insert_at
+    new = ListMixin.create("parent_id" => 20)
+    assert_equal 1, new.pos
+
+    new = ListMixinSub1.create("parent_id" => 20)
+    assert_equal 2, new.pos
+
+    new = ListMixinSub2.create("parent_id" => 20)
+    assert_equal 3, new.pos
+
+    new4 = ListMixin.create("parent_id" => 20)
+    assert_equal 4, new4.pos
+
+    new4.insert_at(3)
+    assert_equal 3, new4.pos
+
+    new.reload
+    assert_equal 4, new.pos
+
+    new.insert_at(2)
+    assert_equal 2, new.pos
+
+    new4.reload
+    assert_equal 4, new4.pos
+
+    new5 = ListMixinSub1.create("parent_id" => 20)
+    assert_equal 5, new5.pos
+
+    new5.insert_at(1)
+    assert_equal 1, new5.pos
+
+    new4.reload
+    assert_equal 5, new4.pos
+  end
+
+  def test_delete_middle
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).destroy
+
+    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(1).pos
+    assert_equal 2, ListMixin.find(3).pos
+    assert_equal 3, ListMixin.find(4).pos
+
+    ListMixin.find(1).destroy
+
+    assert_equal [3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(3).pos
+    assert_equal 2, ListMixin.find(4).pos
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_paranoid/CHANGELOG technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_paranoid/CHANGELOG
--- mephisto-0.7.3/vendor/plugins/acts_as_paranoid/CHANGELOG	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_paranoid/CHANGELOG	2008-03-31 02:18:56.000000000 -0400
@@ -1,3 +1,11 @@
+* (4 Oct 2007)
+
+Update for Edge rails: remove support for legacy #count args 
+
+* (2 Feb 2007)
+
+Add support for custom primary keys [Jeff Dean]
+
 * (2 July 2006)
 
 Add paranoid delete_all implementation [Marshall Roch]
@@ -63,4 +71,4 @@
 
 *0.1* (17 Sep 2005)
 
-* Initial gem
\ No newline at end of file
+* Initial gem
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_paranoid/lib/caboose/acts/paranoid.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_paranoid/lib/caboose/acts/paranoid.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_paranoid/lib/caboose/acts/paranoid.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_paranoid/lib/caboose/acts/paranoid.rb	2008-03-31 02:18:56.000000000 -0400
@@ -72,7 +72,7 @@
 
         module ClassMethods
           def find_with_deleted(*args)
-            options = extract_options_from_args!(args)
+            options = args.extract_options!
             validate_find_options(options)
             set_readonly_option!(options)
             options[:with_deleted] = true # yuck!
@@ -85,7 +85,7 @@
           end
 
           def count_with_deleted(*args)
-            calculate_with_deleted(:count, *construct_count_options_from_legacy_args(*args))
+            calculate_with_deleted(:count, *construct_count_options_from_args(*args))
           end
 
           def count(*args)
@@ -120,7 +120,7 @@
 
         def destroy_without_callbacks
           unless new_record?
-            self.class.update_all self.class.send(:sanitize_sql, ["#{self.class.deleted_attribute} = ?", self.class.send(:current_time)]), ["id = ?", id]
+            self.class.update_all self.class.send(:sanitize_sql, ["#{self.class.deleted_attribute} = ?", self.class.send(:current_time)]), ["#{self.class.primary_key} = ?", id]
           end
           freeze
         end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_paranoid/test/paranoid_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_paranoid/test/paranoid_test.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_paranoid/test/paranoid_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_paranoid/test/paranoid_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -92,7 +92,7 @@
   
   def test_should_not_count_deleted
     assert_equal 1, Widget.count
-    assert_equal 1, Widget.count(['title=?', 'widget 1'])
+    assert_equal 1, Widget.count(:all, :conditions => ['title=?', 'widget 1'])
     assert_equal 2, Widget.calculate_with_deleted(:count, :all)
   end
   
@@ -142,19 +142,19 @@
   end
 
   def test_should_not_override_scopes_when_counting
-    assert_equal 1, Widget.with_scope(:find => { :conditions => "title = 'widget 1'" }) { Widget.count }
-    assert_equal 0, Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.count }
-    assert_equal 1, Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.calculate_with_deleted(:count, :all) }
+    assert_equal 1, Widget.send(:with_scope, :find => { :conditions => "title = 'widget 1'" }) { Widget.count }
+    assert_equal 0, Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.count }
+    assert_equal 1, Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.calculate_with_deleted(:count, :all) }
   end
 
   def test_should_not_override_scopes_when_finding
-    assert_equal [1], Widget.with_scope(:find => { :conditions => "title = 'widget 1'" }) { Widget.find(:all) }.ids
-    assert_equal [],  Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find(:all) }.ids
-    assert_equal [2], Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find_with_deleted(:all) }.ids
+    assert_equal [1], Widget.send(:with_scope, :find => { :conditions => "title = 'widget 1'" }) { Widget.find(:all) }.ids
+    assert_equal [],  Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find(:all) }.ids
+    assert_equal [2], Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) { Widget.find_with_deleted(:all) }.ids
   end
 
   def test_should_allow_multiple_scoped_calls_when_finding
-    Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) do
+    Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) do
       assert_equal [2], Widget.find_with_deleted(:all).ids
       assert_equal [2], Widget.find_with_deleted(:all).ids, "clobbers the constrain on the unmodified find"
       assert_equal [], Widget.find(:all).ids
@@ -163,7 +163,7 @@
   end
 
   def test_should_allow_multiple_scoped_calls_when_counting
-    Widget.with_scope(:find => { :conditions => "title = 'deleted widget 2'" }) do
+    Widget.send(:with_scope, :find => { :conditions => "title = 'deleted widget 2'" }) do
       assert_equal 1, Widget.calculate_with_deleted(:count, :all)
       assert_equal 1, Widget.calculate_with_deleted(:count, :all), "clobbers the constrain on the unmodified find"
       assert_equal 0, Widget.count
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb	2008-03-31 02:18:56.000000000 -0400
@@ -51,7 +51,7 @@
     #
     # See ActiveRecord::Acts::Versioned::ClassMethods#acts_as_versioned for configuration options
     module Versioned
-      CALLBACKS = [:set_new_version, :save_version_on_create, :save_version, :clear_changed_attributes]
+      CALLBACKS = [:set_new_version, :save_version_on_create, :save_version?, :clear_changed_attributes]
       def self.included(base) # :nodoc:
         base.extend ClassMethods
       end
@@ -376,6 +376,8 @@
           self.class.without_locking(&block)
         end
 
+        def empty_callback() end #:nodoc:
+
         protected          
           # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
           def set_new_version
@@ -392,18 +394,18 @@
           def clear_changed_attributes
             self.changed_attributes = []
           end
-          
+
           def write_changed_attribute(attr_name, attr_value)
-            (self.changed_attributes ||= []) << attr_name.to_s unless self.changed?(attr_name) or self.send(attr_name) == attr_value
-            write_attribute(attr_name.to_s, attr_value)
+            # Convert to db type for comparison. Avoids failing Float<=>String comparisons.
+            attr_value_for_db = self.class.columns_hash[attr_name.to_s].type_cast(attr_value)
+            (self.changed_attributes ||= []) << attr_name.to_s unless self.changed?(attr_name) || self.send(attr_name) == attr_value_for_db
+            write_attribute(attr_name, attr_value_for_db)
           end
 
         private
           CALLBACKS.each do |attr_name| 
             alias_method "orig_#{attr_name}".to_sym, attr_name
           end
-          
-          def empty_callback() end #:nodoc:
 
         module ClassMethods
           # Finds a specific version of a specific row of this model
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/fixtures/landmark.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/fixtures/landmark.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/fixtures/landmark.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/fixtures/landmark.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+class Landmark < ActiveRecord::Base
+  acts_as_versioned :if_changed => [ :name, :longitude, :latitude ]
+end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/fixtures/landmark_versions.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/fixtures/landmark_versions.yml
--- mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/fixtures/landmark_versions.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/fixtures/landmark_versions.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+washington:
+    id: 1
+    landmark_id: 1
+    version: 1
+    name: Washington, D.C.
+    latitude: 38.895
+    longitude: -77.036667
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/fixtures/landmarks.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/fixtures/landmarks.yml
--- mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/fixtures/landmarks.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/fixtures/landmarks.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+washington:
+    id: 1
+    name: Washington, D.C.
+    latitude: 38.895
+    longitude: -77.036667
+    version: 1
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/schema.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/schema.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/schema.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/schema.rb	2008-03-31 02:18:56.000000000 -0400
@@ -50,4 +50,19 @@
     t.column :version, :integer
     t.column :updated_at, :datetime
   end
-end
\ No newline at end of file
+  
+  create_table :landmarks, :force => true do |t|
+    t.column :name, :string
+    t.column :latitude, :float
+    t.column :longitude, :float
+    t.column :version, :integer
+  end
+
+  create_table :landmark_versions, :force => true do |t|
+    t.column :landmark_id, :integer
+    t.column :name, :string
+    t.column :latitude, :float
+    t.column :longitude, :float
+    t.column :version, :integer
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/versioned_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/versioned_test.rb
--- mephisto-0.7.3/vendor/plugins/acts_as_versioned/test/versioned_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/acts_as_versioned/test/versioned_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,7 @@
 require File.join(File.dirname(__FILE__), 'fixtures/widget')
 
 class VersionedTest < Test::Unit::TestCase
-  fixtures :pages, :page_versions, :locked_pages, :locked_pages_revisions, :authors
+  fixtures :pages, :page_versions, :locked_pages, :locked_pages_revisions, :authors, :landmarks, :landmark_versions
 
   def test_saves_versioned_copy
     p = Page.create :title => 'first title', :body => 'first body'
@@ -300,4 +300,14 @@
     page_version = page.versions.last
     assert_equal page, page_version.page
   end
+  
+  def test_unchanged_attributes
+    landmarks(:washington).attributes = landmarks(:washington).attributes
+    assert !landmarks(:washington).changed?
+  end
+  
+  def test_unchanged_string_attributes
+    landmarks(:washington).attributes = landmarks(:washington).attributes.inject({}) { |params, (key, value)| params.update key => value.to_s }
+    assert !landmarks(:washington).changed?
+  end
 end
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/CHANGELOG technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/CHANGELOG
--- mephisto-0.7.3/vendor/plugins/attachment_fu/CHANGELOG	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/CHANGELOG	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,19 @@
+* April 2, 2007 *
+
+* don't copy the #full_filename to the default #temp_paths array if it doesn't exist
+* add default ID partitioning for attachments
+* add #binmode call to Tempfile (note: ruby should be doing this!) [Eric Beland]
+* Check for current type of :thumbnails option.
+* allow customization of the S3 configuration file path with the :s3_config_path option.
+* Don't try to remove thumbnails if there aren't any.  Closes #3 [ben stiglitz]
+
+* BC * (before changelog)
+
+* add default #temp_paths entry [mattly]
+* add MiniMagick support to attachment_fu [Isacc]
+* update #destroy_file to clear out any empty directories too [carlivar]
+* fix references to S3Backend module [Hunter Hillegas]
+* make #current_data public with db_file and s3 backends [ebryn]
+* oops, actually svn add the files for s3 backend. [Jeffrey Hardy]
+* experimental s3 support, egad, no tests.... [Jeffrey Hardy]
+* doh, fix a few bad references to ActsAsAttachment [sixty4bit]
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/README
--- mephisto-0.7.3/vendor/plugins/attachment_fu/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,162 @@
+attachment-fu
+=====================
+
+attachment_fu is a plugin by Rick Olson (aka technoweenie <http://techno-weenie.net>) and is the successor to acts_as_attachment.  To get a basic run-through of its capabilities, check out Mike Clark's tutorial <http://clarkware.com/cgi/blosxom/2007/02/24#FileUploadFu>.
+
+
+attachment_fu functionality
+===========================
+
+attachment_fu facilitates file uploads in Ruby on Rails.  There are a few storage options for the actual file data, but the plugin always at a minimum stores metadata for each file in the database.
+
+There are three storage options for files uploaded through attachment_fu:
+  File system
+  Database file
+  Amazon S3
+
+Each method of storage many options associated with it that will be covered in the following section.  Something to note, however, is that the Amazon S3 storage requires you to modify config/amazon_s3.yml and the Database file storage requires an extra table.
+
+
+attachment_fu models
+====================
+
+For all three of these storage options a table of metadata is required.  This table will contain information about the file (hence the 'meta') and its location.  This table has no restrictions on naming, unlike the extra table required for database storage, which must have a table name of db_files (and by convention a model of DbFile).
+  
+In the model there are two methods made available by this plugins: has_attachment and validates_as_attachment.
+
+has_attachment(options = {})
+  This method accepts the options in a hash:
+    :content_type     # Allowed content types.
+                      # Allows all by default.  Use :image to allow all standard image types.
+    :min_size         # Minimum size allowed.
+                      # 1 byte is the default.
+    :max_size         # Maximum size allowed.
+                      # 1.megabyte is the default.
+    :size             # Range of sizes allowed.
+                      # (1..1.megabyte) is the default.  This overrides the :min_size and :max_size options.
+    :resize_to        # Used by RMagick to resize images.
+                      # Pass either an array of width/height, or a geometry string.
+    :thumbnails       # Specifies a set of thumbnails to generate.
+                      # This accepts a hash of filename suffixes and RMagick resizing options.
+                      # This option need only be included if you want thumbnailing.
+    :thumbnail_class  # Set which model class to use for thumbnails.
+                      # This current attachment class is used by default.
+    :path_prefix      # path to store the uploaded files.
+                      # Uses public/#{table_name} by default for the filesystem, and just #{table_name} for the S3 backend.  
+                      # Setting this sets the :storage to :file_system.
+    :storage          # Specifies the storage system to use..
+                      # Defaults to :db_file.  Options are :file_system, :db_file, and :s3.
+    :processor        # Sets the image processor to use for resizing of the attached image.
+                      # Options include ImageScience, Rmagick, and MiniMagick.  Default is whatever is installed.
+    
+
+  Examples:
+    has_attachment :max_size => 1.kilobyte
+    has_attachment :size => 1.megabyte..2.megabytes
+    has_attachment :content_type => 'application/pdf'
+    has_attachment :content_type => ['application/pdf', 'application/msword', 'text/plain']
+    has_attachment :content_type => :image, :resize_to => [50,50]
+    has_attachment :content_type => ['application/pdf', :image], :resize_to => 'x50'
+    has_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
+    has_attachment :storage => :file_system, :path_prefix => 'public/files'
+    has_attachment :storage => :file_system, :path_prefix => 'public/files', 
+                   :content_type => :image, :resize_to => [50,50]
+    has_attachment :storage => :file_system, :path_prefix => 'public/files',
+                   :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
+    has_attachment :storage => :s3
+
+validates_as_attachment
+  This method prevents files outside of the valid range (:min_size to :max_size, or the :size range) from being saved.  It does not however, halt the upload of such files.  They will be uploaded into memory regardless of size before validation.
+  
+  Example:
+    validates_as_attachment
+
+
+attachment_fu migrations
+========================
+
+Fields for attachment_fu metadata tables...
+  in general:
+    size,         :integer  # file size in bytes
+    content_type, :string   # mime type, ex: application/mp3
+    filename,     :string   # sanitized filename
+  that reference images:
+    height,       :integer  # in pixels
+    width,        :integer  # in pixels
+  that reference images that will be thumbnailed:
+    parent_id,    :integer  # id of parent image (on the same table, a self-referencing foreign-key).
+                            # Only populated if the current object is a thumbnail.
+    thumbnail,    :string   # the 'type' of thumbnail this attachment record describes.  
+                            # Only populated if the current object is a thumbnail.
+                            # Usage:
+                            # [ In Model 'Avatar' ]
+                            #   has_attachment :content_type => :image, 
+                            #                  :storage => :file_system, 
+                            #                  :max_size => 500.kilobytes,
+                            #                  :resize_to => '320x200>',
+                            #                  :thumbnails => { :small => '10x10>',
+                            #                                   :thumb => '100x100>' }
+                            # [ Elsewhere ]
+                            # @user.avatar.thumbnails.first.thumbnail #=> 'small'
+  that reference files stored in the database (:db_file):
+    db_file_id,   :integer  # id of the file in the database (foreign key)
+    
+Field for attachment_fu db_files table:
+  data, :binary # binary file data, for use in database file storage
+
+
+attachment_fu views
+===================
+
+There are two main views tasks that will be directly affected by attachment_fu: upload forms and displaying uploaded images.
+
+There are two parts of the upload form that differ from typical usage.
+  1. Include ':multipart => true' in the html options of the form_for tag.
+    Example:
+      <% form_for(:attachment_metadata, :url => { :action => "create" }, :html => { :multipart => true }) do |form| %>
+      
+  2. Use the file_field helper with :uploaded_data as the field name.
+    Example:
+      <%= form.file_field :uploaded_data %>
+
+Displaying uploaded images is made easy by the public_filename method of the ActiveRecord attachment objects using file system and s3 storage.
+
+public_filename(thumbnail = nil)
+  Returns the public path to the file.  If a thumbnail prefix is specified it will return the public file path to the corresponding thumbnail.
+  Examples:
+    attachment_obj.public_filename          #=> /attachments/2/file.jpg
+    attachment_obj.public_filename(:thumb)  #=> /attachments/2/file_thumb.jpg
+    attachment_obj.public_filename(:small)  #=> /attachments/2/file_small.jpg
+
+When serving files from database storage, doing more than simply downloading the file is beyond the scope of this document.
+
+
+attachment_fu controllers
+=========================
+
+There are two considerations to take into account when using attachment_fu in controllers.
+
+The first is when the files have no publicly accessible path and need to be downloaded through an action.
+
+Example:
+  def readme
+    send_file '/path/to/readme.txt', :type => 'plain/text', :disposition => 'inline'
+  end
+  
+See the possible values for send_file for reference.
+
+
+The second is when saving the file when submitted from a form.
+Example in view:
+ <%= form.file_field :attachable, :uploaded_data %>
+
+Example in controller:
+  def create
+    @attachable_file = AttachmentMetadataModel.new(params[:attachable])
+    if @attachable_file.save
+      flash[:notice] = 'Attachment was successfully created.'
+      redirect_to attachable_url(@attachable_file)     
+    else
+      render :action => :new
+    end
+  end
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/Rakefile
--- mephisto-0.7.3/vendor/plugins/attachment_fu/Rakefile	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the attachment_fu plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the attachment_fu plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ActsAsAttachment'
+  rdoc.options << '--line-numbers --inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/amazon_s3.yml.tpl technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/amazon_s3.yml.tpl
--- mephisto-0.7.3/vendor/plugins/attachment_fu/amazon_s3.yml.tpl	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/amazon_s3.yml.tpl	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+development:
+  bucket_name: appname_development
+  access_key_id: 
+  secret_access_key: 
+
+test:
+  bucket_name: appname_test
+  access_key_id: 
+  secret_access_key: 
+
+production:
+  bucket_name: appname
+  access_key_id: 
+  secret_access_key: 
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/init.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+require 'tempfile'
+
+Tempfile.class_eval do
+  # overwrite so tempfiles use the extension of the basename.  important for rmagick and image science
+  def make_tmpname(basename, n)
+    ext = nil
+    sprintf("%s%d-%d%s", basename.to_s.gsub(/\.\w+$/) { |s| ext = s; '' }, $$, n, ext)
+  end
+end
+
+require 'geometry'
+ActiveRecord::Base.send(:extend, Technoweenie::AttachmentFu::ActMethods)
+Technoweenie::AttachmentFu.tempfile_path = ATTACHMENT_FU_TEMPFILE_PATH if Object.const_defined?(:ATTACHMENT_FU_TEMPFILE_PATH)
+FileUtils.mkdir_p Technoweenie::AttachmentFu.tempfile_path
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/install.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/install.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/install.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/install.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+require 'fileutils'
+
+s3_config = File.dirname(__FILE__) + '/../../../config/amazon_s3.yml'
+FileUtils.cp File.dirname(__FILE__) + '/amazon_s3.yml.tpl', s3_config unless File.exist?(s3_config)
+puts IO.read(File.join(File.dirname(__FILE__), 'README'))
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/geometry.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/geometry.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/geometry.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/geometry.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,93 @@
+# This Geometry class was yanked from RMagick.  However, it lets ImageMagick handle the actual change_geometry.
+# Use #new_dimensions_for to get new dimensons
+# Used so I can use spiffy RMagick geometry strings with ImageScience
+class Geometry
+  # ! and @ are removed until support for them is added
+  FLAGS = ['', '%', '<', '>']#, '!', '@']
+  RFLAGS = { '%' => :percent,
+             '!' => :aspect,
+             '<' => :>,
+             '>' => :<,
+             '@' => :area }
+
+  attr_accessor :width, :height, :x, :y, :flag
+
+  def initialize(width=nil, height=nil, x=nil, y=nil, flag=nil)
+    # Support floating-point width and height arguments so Geometry
+    # objects can be used to specify Image#density= arguments.
+    raise ArgumentError, "width must be >= 0: #{width}"   if width < 0
+    raise ArgumentError, "height must be >= 0: #{height}" if height < 0
+    @width  = width.to_f
+    @height = height.to_f
+    @x      = x.to_i
+    @y      = y.to_i
+    @flag   = flag
+  end
+
+  # Construct an object from a geometry string
+  RE = /\A(\d*)(?:x(\d+))?([-+]\d+)?([-+]\d+)?([%!<>@]?)\Z/
+
+  def self.from_s(str)
+    raise(ArgumentError, "no geometry string specified") unless str
+  
+    if m = RE.match(str)
+      new(m[1].to_i, m[2].to_i, m[3].to_i, m[4].to_i, RFLAGS[m[5]])
+    else
+      raise ArgumentError, "invalid geometry format"
+    end
+  end
+
+  # Convert object to a geometry string
+  def to_s
+    str = ''
+    str << "%g" % @width if @width > 0
+    str << 'x' if (@width > 0 || @height > 0)
+    str << "%g" % @height if @height > 0
+    str << "%+d%+d" % [@x, @y] if (@x != 0 || @y != 0)
+    str << FLAGS[@flag.to_i]
+  end
+  
+  # attempts to get new dimensions for the current geometry string given these old dimensions.
+  # This doesn't implement the aspect flag (!) or the area flag (@).  PDI
+  def new_dimensions_for(orig_width, orig_height)
+    new_width  = orig_width
+    new_height = orig_height
+
+    case @flag
+      when :percent
+        scale_x = @width.zero?  ? 100 : @width
+        scale_y = @height.zero? ? @width : @height
+        new_width    = scale_x.to_f * (orig_width.to_f  / 100.0)
+        new_height   = scale_y.to_f * (orig_height.to_f / 100.0)
+      when :<, :>, nil
+        scale_factor =
+          if new_width.zero? || new_height.zero?
+            1.0
+          else
+            if @width.nonzero? && @height.nonzero?
+              [@width.to_f / new_width.to_f, @height.to_f / new_height.to_f].min
+            else
+              @width.nonzero? ? (@width.to_f / new_width.to_f) : (@height.to_f / new_height.to_f)
+            end
+          end
+        new_width  = scale_factor * new_width.to_f
+        new_height = scale_factor * new_height.to_f
+        new_width  = orig_width  if @flag && orig_width.send(@flag,  new_width)
+        new_height = orig_height if @flag && orig_height.send(@flag, new_height)
+    end
+
+    [new_width, new_height].collect! { |v| v.round }
+  end
+end
+
+class Array
+  # allows you to get new dimensions for the current array of dimensions with a given geometry string
+  #
+  #   [50, 64] / '40>' # => [40, 51]
+  def /(geometry)
+    raise ArgumentError, "Only works with a [width, height] pair" if size != 2
+    raise ArgumentError, "Must pass a valid geometry string or object" unless geometry.is_a?(String) || geometry.is_a?(Geometry)
+    geometry = Geometry.from_s(geometry) if geometry.is_a?(String)
+    geometry.new_dimensions_for first, last
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,39 @@
+module Technoweenie # :nodoc:
+  module AttachmentFu # :nodoc:
+    module Backends
+      # Methods for DB backed attachments
+      module DbFileBackend
+        def self.included(base) #:nodoc:
+          Object.const_set(:DbFile, Class.new(ActiveRecord::Base)) unless Object.const_defined?(:DbFile)
+          base.belongs_to  :db_file, :class_name => '::DbFile', :foreign_key => 'db_file_id'
+        end
+
+        # Creates a temp file with the current db data.
+        def create_temp_file
+          write_to_temp_file current_data
+        end
+        
+        # Gets the current data from the database
+        def current_data
+          db_file.data
+        end
+        
+        protected
+          # Destroys the file.  Called in the after_destroy callback
+          def destroy_file
+            db_file.destroy if db_file
+          end
+          
+          # Saves the data to the DbFile model
+          def save_to_storage
+            if save_attachment?
+              (db_file || build_db_file).data = temp_data
+              db_file.save!
+              self.class.update_all ['db_file_id = ?', self.db_file_id = db_file.id], ['id = ?', id]
+            end
+            true
+          end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,97 @@
+require 'ftools'
+module Technoweenie # :nodoc:
+  module AttachmentFu # :nodoc:
+    module Backends
+      # Methods for file system backed attachments
+      module FileSystemBackend
+        def self.included(base) #:nodoc:
+          base.before_update :rename_file
+        end
+      
+        # Gets the full path to the filename in this format:
+        #
+        #   # This assumes a model name like MyModel
+        #   # public/#{table_name} is the default filesystem path 
+        #   RAILS_ROOT/public/my_models/5/blah.jpg
+        #
+        # Overwrite this method in your model to customize the filename.
+        # The optional thumbnail argument will output the thumbnail's filename.
+        def full_filename(thumbnail = nil)
+          file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:path_prefix].to_s
+          File.join(RAILS_ROOT, file_system_path, *partitioned_path(thumbnail_name_for(thumbnail)))
+        end
+      
+        # Used as the base path that #public_filename strips off full_filename to create the public path
+        def base_path
+          @base_path ||= File.join(RAILS_ROOT, 'public')
+        end
+      
+        # The attachment ID used in the full path of a file
+        def attachment_path_id
+          ((respond_to?(:parent_id) && parent_id) || id).to_i
+        end
+      
+        # overrwrite this to do your own app-specific partitioning. 
+        # you can thank Jamis Buck for this: http://www.37signals.com/svn/archives2/id_partitioning.php
+        def partitioned_path(*args)
+          ("%08d" % attachment_path_id).scan(/..../) + args
+        end
+      
+        # Gets the public path to the file
+        # The optional thumbnail argument will output the thumbnail's filename.
+        def public_filename(thumbnail = nil)
+          full_filename(thumbnail).gsub %r(^#{Regexp.escape(base_path)}), ''
+        end
+      
+        def filename=(value)
+          @old_filename = full_filename unless filename.nil? || @old_filename
+          write_attribute :filename, sanitize_filename(value)
+        end
+
+        # Creates a temp file from the currently saved file.
+        def create_temp_file
+          copy_to_temp_file full_filename
+        end
+
+        protected
+          # Destroys the file.  Called in the after_destroy callback
+          def destroy_file
+            FileUtils.rm full_filename
+            # remove directory also if it is now empty
+            Dir.rmdir(File.dirname(full_filename)) if (Dir.entries(File.dirname(full_filename))-['.','..']).empty?
+          rescue
+            logger.info "Exception destroying  #{full_filename.inspect}: [#{$!.class.name}] #{$1.to_s}"
+            logger.warn $!.backtrace.collect { |b| " > #{b}" }.join("\n")
+          end
+
+          # Renames the given file before saving
+          def rename_file
+            return unless @old_filename && @old_filename != full_filename
+            if save_attachment? && File.exists?(@old_filename)
+              FileUtils.rm @old_filename
+            elsif File.exists?(@old_filename)
+              FileUtils.mv @old_filename, full_filename
+            end
+            @old_filename =  nil
+            true
+          end
+          
+          # Saves the file to the file system
+          def save_to_storage
+            if save_attachment?
+              # TODO: This overwrites the file if it exists, maybe have an allow_overwrite option?
+              FileUtils.mkdir_p(File.dirname(full_filename))
+              File.cp(temp_path, full_filename)
+              File.chmod(attachment_options[:chmod] || 0644, full_filename)
+            end
+            @old_filename = nil
+            true
+          end
+          
+          def current_data
+            File.file?(full_filename) ? File.read(full_filename) : nil
+          end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/s3_backend.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,309 @@
+module Technoweenie # :nodoc:
+  module AttachmentFu # :nodoc:
+    module Backends
+      # = AWS::S3 Storage Backend
+      #
+      # Enables use of {Amazon's Simple Storage Service}[http://aws.amazon.com/s3] as a storage mechanism
+      #
+      # == Requirements
+      #
+      # Requires the {AWS::S3 Library}[http://amazon.rubyforge.org] for S3 by Marcel Molina Jr. installed either
+      # as a gem or a as a Rails plugin.
+      #
+      # == Configuration
+      #
+      # Configuration is done via <tt>RAILS_ROOT/config/amazon_s3.yml</tt> and is loaded according to the <tt>RAILS_ENV</tt>.
+      # The minimum connection options that you must specify are a bucket name, your access key id and your secret access key.
+      # If you don't already have your access keys, all you need to sign up for the S3 service is an account at Amazon.
+      # You can sign up for S3 and get access keys by visiting http://aws.amazon.com/s3.
+      #
+      # Example configuration (RAILS_ROOT/config/amazon_s3.yml)
+      # 
+      #   development:
+      #     bucket_name: appname_development
+      #     access_key_id: <your key>
+      #     secret_access_key: <your key>
+      #   
+      #   test:
+      #     bucket_name: appname_test
+      #     access_key_id: <your key>
+      #     secret_access_key: <your key>
+      #   
+      #   production:
+      #     bucket_name: appname
+      #     access_key_id: <your key>
+      #     secret_access_key: <your key>
+      #
+      # You can change the location of the config path by passing a full path to the :s3_config_path option.
+      #
+      #   has_attachment :storage => :s3, :s3_config_path => (RAILS_ROOT + '/config/s3.yml')
+      #
+      # === Required configuration parameters
+      #
+      # * <tt>:access_key_id</tt> - The access key id for your S3 account. Provided by Amazon.
+      # * <tt>:secret_access_key</tt> - The secret access key for your S3 account. Provided by Amazon.
+      # * <tt>:bucket_name</tt> - A unique bucket name (think of the bucket_name as being like a database name).
+      #
+      # If any of these required arguments is missing, a MissingAccessKey exception will be raised from AWS::S3.
+      #
+      # == About bucket names
+      #
+      # Bucket names have to be globaly unique across the S3 system. And you can only have up to 100 of them,
+      # so it's a good idea to think of a bucket as being like a database, hence the correspondance in this
+      # implementation to the development, test, and production environments.
+      #
+      # The number of objects you can store in a bucket is, for all intents and purposes, unlimited.
+      #
+      # === Optional configuration parameters
+      #
+      # * <tt>:server</tt> - The server to make requests to. Defaults to <tt>s3.amazonaws.com</tt>.
+      # * <tt>:port</tt> - The port to the requests should be made on. Defaults to 80 or 443 if <tt>:use_ssl</tt> is set.
+      # * <tt>:use_ssl</tt> - If set to true, <tt>:port</tt> will be implicitly set to 443, unless specified otherwise. Defaults to false.
+      #
+      # == Usage
+      #
+      # To specify S3 as the storage mechanism for a model, set the acts_as_attachment <tt>:storage</tt> option to <tt>:s3</tt>.
+      #
+      #   class Photo < ActiveRecord::Base
+      #     has_attachment :storage => :s3
+      #   end
+      #
+      # === Customizing the path
+      #
+      # By default, files are prefixed using a pseudo hierarchy in the form of <tt>:table_name/:id</tt>, which results
+      # in S3 urls that look like: http(s)://:server/:bucket_name/:table_name/:id/:filename with :table_name
+      # representing the customizable portion of the path. You can customize this prefix using the <tt>:path_prefix</tt>
+      # option:
+      #
+      #   class Photo < ActiveRecord::Base
+      #     has_attachment :storage => :s3, :path_prefix => 'my/custom/path'
+      #   end
+      #
+      # Which would result in URLs like <tt>http(s)://:server/:bucket_name/my/custom/path/:id/:filename.</tt>
+      #
+      # === Permissions
+      #
+      # By default, files are stored on S3 with public access permissions. You can customize this using
+      # the <tt>:s3_access</tt> option to <tt>has_attachment</tt>. Available values are 
+      # <tt>:private</tt>, <tt>:public_read_write</tt>, and <tt>:authenticated_read</tt>.
+      #
+      # === Other options
+      #
+      # Of course, all the usual configuration options apply, such as content_type and thumbnails:
+      #
+      #   class Photo < ActiveRecord::Base
+      #     has_attachment :storage => :s3, :content_type => ['application/pdf', :image], :resize_to => 'x50'
+      #     has_attachment :storage => :s3, :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
+      #   end
+      #
+      # === Accessing S3 URLs
+      #
+      # You can get an object's URL using the s3_url accessor. For example, assuming that for your postcard app
+      # you had a bucket name like 'postcard_world_development', and an attachment model called Photo:
+      #
+      #   @postcard.s3_url # => http(s)://s3.amazonaws.com/postcard_world_development/photos/1/mexico.jpg
+      #
+      # The resulting url is in the form: http(s)://:server/:bucket_name/:table_name/:id/:file.
+      # The optional thumbnail argument will output the thumbnail's filename (if any).
+      #
+      # Additionally, you can get an object's base path relative to the bucket root using
+      # <tt>base_path</tt>:
+      #
+      #   @photo.file_base_path # => photos/1
+      #
+      # And the full path (including the filename) using <tt>full_filename</tt>:
+      #
+      #   @photo.full_filename # => photos/
+      #
+      # Niether <tt>base_path</tt> or <tt>full_filename</tt> include the bucket name as part of the path.
+      # You can retrieve the bucket name using the <tt>bucket_name</tt> method.
+      module S3Backend
+        class RequiredLibraryNotFoundError < StandardError; end
+        class ConfigFileNotFoundError < StandardError; end
+
+        def self.included(base) #:nodoc:
+          mattr_reader :bucket_name, :s3_config
+          
+          begin
+            require 'aws/s3'
+            include AWS::S3
+          rescue LoadError
+            raise RequiredLibraryNotFoundError.new('AWS::S3 could not be loaded')
+          end
+
+          begin
+            @@s3_config_path = base.attachment_options[:s3_config_path] || (RAILS_ROOT + '/config/amazon_s3.yml')
+            @@s3_config = YAML.load_file(@@s3_config_path)[ENV['RAILS_ENV']].symbolize_keys
+          #rescue
+          #  raise ConfigFileNotFoundError.new('File %s not found' % @@s3_config_path)
+          end
+
+          @@bucket_name = s3_config[:bucket_name]
+
+          Base.establish_connection!(
+            :access_key_id     => s3_config[:access_key_id],
+            :secret_access_key => s3_config[:secret_access_key],
+            :server            => s3_config[:server],
+            :port              => s3_config[:port],
+            :use_ssl           => s3_config[:use_ssl]
+          )
+
+          # Bucket.create(@@bucket_name)
+
+          base.before_update :rename_file
+        end
+
+        def self.protocol
+          @protocol ||= s3_config[:use_ssl] ? 'https://' : 'http://'
+        end
+        
+        def self.hostname
+          @hostname ||= s3_config[:server] || AWS::S3::DEFAULT_HOST
+        end
+        
+        def self.port_string
+          @port_string ||= s3_config[:port] == (s3_config[:use_ssl] ? 443 : 80) ? '' : ":#{s3_config[:port]}"
+        end
+
+        module ClassMethods
+          def s3_protocol
+            Technoweenie::AttachmentFu::Backends::S3Backend.protocol
+          end
+          
+          def s3_hostname
+            Technoweenie::AttachmentFu::Backends::S3Backend.hostname
+          end
+          
+          def s3_port_string
+            Technoweenie::AttachmentFu::Backends::S3Backend.port_string
+          end
+        end
+
+        # Overwrites the base filename writer in order to store the old filename
+        def filename=(value)
+          @old_filename = filename unless filename.nil? || @old_filename
+          write_attribute :filename, sanitize_filename(value)
+        end
+
+        # The attachment ID used in the full path of a file
+        def attachment_path_id
+          ((respond_to?(:parent_id) && parent_id) || id).to_s
+        end
+
+        # The pseudo hierarchy containing the file relative to the bucket name
+        # Example: <tt>:table_name/:id</tt>
+        def base_path
+          File.join(attachment_options[:path_prefix], attachment_path_id)
+        end
+
+        # The full path to the file relative to the bucket name
+        # Example: <tt>:table_name/:id/:filename</tt>
+        def full_filename(thumbnail = nil)
+          File.join(base_path, thumbnail_name_for(thumbnail))
+        end
+
+        # All public objects are accessible via a GET request to the S3 servers. You can generate a 
+        # url for an object using the s3_url method.
+        #
+        #   @photo.s3_url
+        #
+        # The resulting url is in the form: <tt>http(s)://:server/:bucket_name/:table_name/:id/:file</tt> where
+        # the <tt>:server</tt> variable defaults to <tt>AWS::S3 URL::DEFAULT_HOST</tt> (s3.amazonaws.com) and can be
+        # set using the configuration parameters in <tt>RAILS_ROOT/config/amazon_s3.yml</tt>.
+        #
+        # The optional thumbnail argument will output the thumbnail's filename (if any).
+        def s3_url(thumbnail = nil)
+          File.join(s3_protocol + s3_hostname + s3_port_string, bucket_name, full_filename(thumbnail))
+        end
+        alias :public_filename :s3_url
+
+        # All private objects are accessible via an authenticated GET request to the S3 servers. You can generate an 
+        # authenticated url for an object like this:
+        #
+        #   @photo.authenticated_s3_url
+        #
+        # By default authenticated urls expire 5 minutes after they were generated.
+        #
+        # Expiration options can be specified either with an absolute time using the <tt>:expires</tt> option,
+        # or with a number of seconds relative to now with the <tt>:expires_in</tt> option:
+        #
+        #   # Absolute expiration date (October 13th, 2025)
+        #   @photo.authenticated_s3_url(:expires => Time.mktime(2025,10,13).to_i)
+        #   
+        #   # Expiration in five hours from now
+        #   @photo.authenticated_s3_url(:expires_in => 5.hours)
+        #
+        # You can specify whether the url should go over SSL with the <tt>:use_ssl</tt> option.
+        # By default, the ssl settings for the current connection will be used:
+        #
+        #   @photo.authenticated_s3_url(:use_ssl => true)
+        #
+        # Finally, the optional thumbnail argument will output the thumbnail's filename (if any):
+        #
+        #   @photo.authenticated_s3_url('thumbnail', :expires_in => 5.hours, :use_ssl => true)
+        def authenticated_s3_url(*args)
+          thumbnail = args.first.is_a?(String) ? args.first : nil
+          options   = args.last.is_a?(Hash)    ? args.last  : {}
+          S3Object.url_for(full_filename(thumbnail), bucket_name, options)
+        end
+
+        def create_temp_file
+          write_to_temp_file current_data
+        end
+
+        def current_data
+          S3Object.value full_filename, bucket_name
+        end
+
+        def s3_protocol
+          Technoweenie::AttachmentFu::Backends::S3Backend.protocol
+        end
+        
+        def s3_hostname
+          Technoweenie::AttachmentFu::Backends::S3Backend.hostname
+        end
+          
+        def s3_port_string
+          Technoweenie::AttachmentFu::Backends::S3Backend.port_string
+        end
+
+        protected
+          # Called in the after_destroy callback
+          def destroy_file
+            S3Object.delete full_filename, bucket_name
+          end
+
+          def rename_file
+            return unless @old_filename && @old_filename != filename
+            
+            old_full_filename = File.join(base_path, @old_filename)
+
+            S3Object.rename(
+              old_full_filename,
+              full_filename,
+              bucket_name,
+              :access => attachment_options[:s3_access]
+            )
+
+            @old_filename = nil
+            true
+          end
+
+          def save_to_storage
+            if save_attachment?
+              S3Object.store(
+                full_filename,
+                (temp_path ? File.open(temp_path) : temp_data),
+                bucket_name,
+                :content_type => content_type,
+                :access => attachment_options[:s3_access]
+              )
+            end
+
+            @old_filename = nil
+            true
+          end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,55 @@
+require 'image_science'
+module Technoweenie # :nodoc:
+  module AttachmentFu # :nodoc:
+    module Processors
+      module ImageScienceProcessor
+        def self.included(base)
+          base.send :extend, ClassMethods
+          base.alias_method_chain :process_attachment, :processing
+        end
+
+        module ClassMethods
+          # Yields a block containing an RMagick Image for the given binary data.
+          def with_image(file, &block)
+            ::ImageScience.with_image file, &block
+          end
+        end
+
+        protected
+          def process_attachment_with_processing
+            return unless process_attachment_without_processing && image?
+            with_image do |img|
+              self.width  = img.width  if respond_to?(:width)
+              self.height = img.height if respond_to?(:height)
+              resize_image_or_thumbnail! img
+            end
+          end
+
+          # Performs the actual resizing operation for a thumbnail
+          def resize_image(img, size)
+            # create a dummy temp file to write to
+            filename.sub! /gif$/, 'png'
+            self.temp_path = write_to_temp_file(filename)
+            grab_dimensions = lambda do |img|
+              self.width  = img.width  if respond_to?(:width)
+              self.height = img.height if respond_to?(:height)
+              img.save temp_path
+              callback_with_args :after_resize, img
+            end
+
+            size = size.first if size.is_a?(Array) && size.length == 1
+            if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum))
+              if size.is_a?(Fixnum)
+                img.thumbnail(size, &grab_dimensions)
+              else
+                img.resize(size[0], size[1], &grab_dimensions)
+              end
+            else
+              new_size = [img.width, img.height] / size.to_s
+              img.resize(new_size[0], new_size[1], &grab_dimensions)
+            end
+          end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,56 @@
+require 'mini_magick'
+module Technoweenie # :nodoc:
+  module AttachmentFu # :nodoc:
+    module Processors
+      module MiniMagickProcessor
+        def self.included(base)
+          base.send :extend, ClassMethods
+          base.alias_method_chain :process_attachment, :processing
+        end
+        
+        module ClassMethods
+          # Yields a block containing an MiniMagick Image for the given binary data.
+          def with_image(file, &block)
+            begin
+              binary_data = file.is_a?(MiniMagick::Image) ? file : MiniMagick::Image.from_file(file) unless !Object.const_defined?(:MiniMagick)
+            rescue
+              # Log the failure to load the image.
+              logger.debug("Exception working with image: #{$!}")
+              binary_data = nil
+            end
+            block.call binary_data if block && binary_data
+          ensure
+            !binary_data.nil?
+          end
+        end
+
+      protected
+        def process_attachment_with_processing
+          return unless process_attachment_without_processing
+          with_image do |img|
+            resize_image_or_thumbnail! img
+            self.width  = img[:width] if respond_to?(:width)
+            self.height = img[:height]  if respond_to?(:height)
+            callback_with_args :after_resize, img
+          end if image?
+        end
+
+        # Performs the actual resizing operation for a thumbnail
+        def resize_image(img, size)
+          size = size.first if size.is_a?(Array) && size.length == 1
+          if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum))
+            if size.is_a?(Fixnum)
+              size = [size, size]
+              img.resize(size.join('x'))
+            else
+              img.resize(size.join('x') + '!')
+            end
+          else
+            img.resize(size.to_s)
+          end
+          self.temp_path = img
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,53 @@
+require 'RMagick'
+module Technoweenie # :nodoc:
+  module AttachmentFu # :nodoc:
+    module Processors
+      module RmagickProcessor
+        def self.included(base)
+          base.send :extend, ClassMethods
+          base.alias_method_chain :process_attachment, :processing
+        end
+        
+        module ClassMethods
+          # Yields a block containing an RMagick Image for the given binary data.
+          def with_image(file, &block)
+            begin
+              binary_data = file.is_a?(Magick::Image) ? file : Magick::Image.read(file).first unless !Object.const_defined?(:Magick)
+            rescue
+              # Log the failure to load the image.  This should match ::Magick::ImageMagickError
+              # but that would cause acts_as_attachment to require rmagick.
+              logger.debug("Exception working with image: #{$!}")
+              binary_data = nil
+            end
+            block.call binary_data if block && binary_data
+          ensure
+            !binary_data.nil?
+          end
+        end
+
+      protected
+        def process_attachment_with_processing
+          return unless process_attachment_without_processing
+          with_image do |img|
+            resize_image_or_thumbnail! img
+            self.width  = img.columns if respond_to?(:width)
+            self.height = img.rows    if respond_to?(:height)
+            callback_with_args :after_resize, img
+          end if image?
+        end
+      
+        # Performs the actual resizing operation for a thumbnail
+        def resize_image(img, size)
+          size = size.first if size.is_a?(Array) && size.length == 1 && !size.first.is_a?(Fixnum)
+          if size.is_a?(Fixnum) || (size.is_a?(Array) && size.first.is_a?(Fixnum))
+            size = [size, size] if size.is_a?(Fixnum)
+            img.thumbnail!(*size)
+          else
+            img.change_geometry(size.to_s) { |cols, rows, image| image.resize!(cols, rows) }
+          end
+          self.temp_path = write_to_temp_file(img.to_blob)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,403 @@
+module Technoweenie # :nodoc:
+  module AttachmentFu # :nodoc:
+    @@default_processors = %w(ImageScience Rmagick MiniMagick)
+    @@tempfile_path      = File.join(RAILS_ROOT, 'tmp', 'attachment_fu')
+    @@content_types      = ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png', 'image/jpg']
+    mattr_reader :content_types, :tempfile_path, :default_processors
+    mattr_writer :tempfile_path
+
+    class ThumbnailError < StandardError;  end
+    class AttachmentError < StandardError; end
+
+    module ActMethods
+      # Options: 
+      # *  <tt>:content_type</tt> - Allowed content types.  Allows all by default.  Use :image to allow all standard image types.
+      # *  <tt>:min_size</tt> - Minimum size allowed.  1 byte is the default.
+      # *  <tt>:max_size</tt> - Maximum size allowed.  1.megabyte is the default.
+      # *  <tt>:size</tt> - Range of sizes allowed.  (1..1.megabyte) is the default.  This overrides the :min_size and :max_size options.
+      # *  <tt>:resize_to</tt> - Used by RMagick to resize images.  Pass either an array of width/height, or a geometry string.
+      # *  <tt>:thumbnails</tt> - Specifies a set of thumbnails to generate.  This accepts a hash of filename suffixes and RMagick resizing options.
+      # *  <tt>:thumbnail_class</tt> - Set what class to use for thumbnails.  This attachment class is used by default.
+      # *  <tt>:path_prefix</tt> - path to store the uploaded files.  Uses public/#{table_name} by default for the filesystem, and just #{table_name}
+      #      for the S3 backend.  Setting this sets the :storage to :file_system.
+      # *  <tt>:storage</tt> - Use :file_system to specify the attachment data is stored with the file system.  Defaults to :db_system.
+      #
+      # Examples:
+      #   has_attachment :max_size => 1.kilobyte
+      #   has_attachment :size => 1.megabyte..2.megabytes
+      #   has_attachment :content_type => 'application/pdf'
+      #   has_attachment :content_type => ['application/pdf', 'application/msword', 'text/plain']
+      #   has_attachment :content_type => :image, :resize_to => [50,50]
+      #   has_attachment :content_type => ['application/pdf', :image], :resize_to => 'x50'
+      #   has_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
+      #   has_attachment :storage => :file_system, :path_prefix => 'public/files'
+      #   has_attachment :storage => :file_system, :path_prefix => 'public/files', 
+      #     :content_type => :image, :resize_to => [50,50]
+      #   has_attachment :storage => :file_system, :path_prefix => 'public/files',
+      #     :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }
+      #   has_attachment :storage => :s3
+      def has_attachment(options = {})
+        # this allows you to redefine the acts' options for each subclass, however
+        options[:min_size]         ||= 1
+        options[:max_size]         ||= 1.megabyte
+        options[:size]             ||= (options[:min_size]..options[:max_size])
+        options[:thumbnails]       ||= {}
+        options[:thumbnail_class]  ||= self
+        options[:s3_access]        ||= :public_read
+        options[:content_type] = [options[:content_type]].flatten.collect! { |t| t == :image ? Technoweenie::AttachmentFu.content_types : t }.flatten unless options[:content_type].nil?
+        
+        unless options[:thumbnails].is_a?(Hash)
+          raise ArgumentError, ":thumbnails option should be a hash: e.g. :thumbnails => { :foo => '50x50' }"
+        end
+        
+        # doing these shenanigans so that #attachment_options is available to processors and backends
+        class_inheritable_accessor :attachment_options
+        self.attachment_options = options
+
+        # only need to define these once on a class
+        unless included_modules.include?(InstanceMethods)
+          attr_accessor :thumbnail_resize_options
+
+          attachment_options[:storage]     ||= (attachment_options[:file_system_path] || attachment_options[:path_prefix]) ? :file_system : :db_file
+          attachment_options[:path_prefix] ||= attachment_options[:file_system_path]
+          if attachment_options[:path_prefix].nil?
+            attachment_options[:path_prefix] = attachment_options[:storage] == :s3 ? table_name : File.join("public", table_name)
+          end
+          attachment_options[:path_prefix]   = attachment_options[:path_prefix][1..-1] if options[:path_prefix].first == '/'
+
+          with_options :foreign_key => 'parent_id' do |m|
+            m.has_many   :thumbnails, :class_name => attachment_options[:thumbnail_class].to_s
+            m.belongs_to :parent, :class_name => base_class.to_s
+          end
+          before_destroy :destroy_thumbnails
+
+          before_validation :set_size_from_temp_path
+          after_save :after_process_attachment
+          after_destroy :destroy_file
+          extend  ClassMethods
+          include InstanceMethods
+          include Technoweenie::AttachmentFu::Backends.const_get("#{options[:storage].to_s.classify}Backend")
+          case attachment_options[:processor]
+            when :none
+            when nil
+              processors = Technoweenie::AttachmentFu.default_processors.dup
+              begin
+                include Technoweenie::AttachmentFu::Processors.const_get("#{processors.first}Processor") if processors.any?
+              rescue LoadError, MissingSourceFile
+                processors.shift
+                retry
+              end
+            else
+              begin
+                include Technoweenie::AttachmentFu::Processors.const_get("#{options[:processor].to_s.classify}Processor")
+              rescue LoadError, MissingSourceFile
+                puts "Problems loading #{options[:processor]}Processor: #{$!}"
+              end
+          end
+          after_validation :process_attachment
+        end
+      end
+    end
+
+    module ClassMethods
+      delegate :content_types, :to => Technoweenie::AttachmentFu
+
+      # Performs common validations for attachment models.
+      def validates_as_attachment
+        validates_presence_of :size, :content_type, :filename
+        validate              :attachment_attributes_valid?
+      end
+
+      # Returns true or false if the given content type is recognized as an image.
+      def image?(content_type)
+        content_types.include?(content_type)
+      end
+
+      # Callback after an image has been resized.
+      #
+      #   class Foo < ActiveRecord::Base
+      #     acts_as_attachment
+      #     after_resize do |record, img| 
+      #       record.aspect_ratio = img.columns.to_f / img.rows.to_f
+      #     end
+      #   end
+      def after_resize(&block)
+        write_inheritable_array(:after_resize, [block])
+      end
+
+      # Callback after an attachment has been saved either to the file system or the DB.
+      # Only called if the file has been changed, not necessarily if the record is updated.
+      #
+      #   class Foo < ActiveRecord::Base
+      #     acts_as_attachment
+      #     after_attachment_saved do |record|
+      #       ...
+      #     end
+      #   end
+      def after_attachment_saved(&block)
+        write_inheritable_array(:after_attachment_saved, [block])
+      end
+
+      # Callback before a thumbnail is saved.  Use this to pass any necessary extra attributes that may be required.
+      #
+      #   class Foo < ActiveRecord::Base
+      #     acts_as_attachment
+      #     before_thumbnail_saved do |record, thumbnail|
+      #       ...
+      #     end
+      #   end
+      def before_thumbnail_saved(&block)
+        write_inheritable_array(:before_thumbnail_saved, [block])
+      end
+
+      # Get the thumbnail class, which is the current attachment class by default.
+      # Configure this with the :thumbnail_class option.
+      def thumbnail_class
+        attachment_options[:thumbnail_class] = attachment_options[:thumbnail_class].constantize unless attachment_options[:thumbnail_class].is_a?(Class)
+        attachment_options[:thumbnail_class]
+      end
+
+      # Copies the given file path to a new tempfile, returning the closed tempfile.
+      def copy_to_temp_file(file, temp_base_name)
+        returning Tempfile.new(temp_base_name, Technoweenie::AttachmentFu.tempfile_path) do |tmp|
+          tmp.close
+          FileUtils.cp file, tmp.path
+        end
+      end
+      
+      # Writes the given data to a new tempfile, returning the closed tempfile.
+      def write_to_temp_file(data, temp_base_name)
+        returning Tempfile.new(temp_base_name, Technoweenie::AttachmentFu.tempfile_path) do |tmp|
+          tmp.binmode
+          tmp.write data
+          tmp.close
+        end
+      end
+    end
+
+    module InstanceMethods
+      # Checks whether the attachment's content type is an image content type
+      def image?
+        self.class.image?(content_type)
+      end
+      
+      # Returns true/false if an attachment is thumbnailable.  A thumbnailable attachment has an image content type and the parent_id attribute.
+      def thumbnailable?
+        image? && respond_to?(:parent_id) && parent_id.nil?
+      end
+
+      # Returns the class used to create new thumbnails for this attachment.
+      def thumbnail_class
+        self.class.thumbnail_class
+      end
+
+      # Gets the thumbnail name for a filename.  'foo.jpg' becomes 'foo_thumbnail.jpg'
+      def thumbnail_name_for(thumbnail = nil)
+        return filename if thumbnail.blank?
+        ext = nil
+        basename = filename.gsub /\.\w+$/ do |s|
+          ext = s; ''
+        end
+        "#{basename}_#{thumbnail}#{ext}"
+      end
+
+      # Creates or updates the thumbnail for the current attachment.
+      def create_or_update_thumbnail(temp_file, file_name_suffix, *size)
+        thumbnailable? || raise(ThumbnailError.new("Can't create a thumbnail if the content type is not an image or there is no parent_id column"))
+        returning find_or_initialize_thumbnail(file_name_suffix) do |thumb|
+          thumb.content_type = content_type
+          thumb.filename = thumbnail_name_for(file_name_suffix)
+          thumb.temp_path = temp_file
+          thumb.thumbnail_resize_options = size
+          callback_with_args :before_thumbnail_saved, thumb
+          thumb.save!
+        end
+      end
+
+      # Sets the content type.
+      def content_type=(new_type)
+        write_attribute :content_type, new_type.to_s.strip
+      end
+      
+      # Sanitizes a filename.
+      def filename=(new_name)
+        write_attribute :filename, sanitize_filename(new_name)
+      end
+
+      # Returns the width/height in a suitable format for the image_tag helper: (100x100)
+      def image_size
+        [width.to_s, height.to_s] * 'x'
+      end
+
+      # Returns true if the attachment data will be written to the storage system on the next save
+      def save_attachment?
+        File.file?(temp_path.to_s)
+      end
+
+      # nil placeholder in case this field is used in a form.
+      def uploaded_data() nil; end
+
+      # This method handles the uploaded file object.  If you set the field name to uploaded_data, you don't need
+      # any special code in your controller.
+      #
+      #   <% form_for :attachment, :html => { :multipart => true } do |f| -%>
+      #     <p><%= f.file_field :uploaded_data %></p>
+      #     <p><%= submit_tag :Save %>
+      #   <% end -%>
+      #
+      #   @attachment = Attachment.create! params[:attachment]
+      #
+      # TODO: Allow it to work with Merb tempfiles too.
+      def uploaded_data=(file_data)
+        return nil if file_data.nil? || file_data.size == 0 
+        self.content_type = file_data.content_type
+        self.filename     = file_data.original_filename if respond_to?(:filename)
+        if file_data.is_a?(StringIO)
+          file_data.rewind
+          self.temp_data = file_data.read
+        else
+          self.temp_path = file_data.path
+        end
+      end
+
+      # Gets the latest temp path from the collection of temp paths.  While working with an attachment,
+      # multiple Tempfile objects may be created for various processing purposes (resizing, for example).
+      # An array of all the tempfile objects is stored so that the Tempfile instance is held on to until
+      # it's not needed anymore.  The collection is cleared after saving the attachment.
+      def temp_path
+        p = temp_paths.first
+        p.respond_to?(:path) ? p.path : p.to_s
+      end
+      
+      # Gets an array of the currently used temp paths.  Defaults to a copy of #full_filename.
+      def temp_paths
+        @temp_paths ||= (new_record? || !File.exist?(full_filename)) ? [] : [copy_to_temp_file(full_filename)]
+      end
+      
+      # Adds a new temp_path to the array.  This should take a string or a Tempfile.  This class makes no 
+      # attempt to remove the files, so Tempfiles should be used.  Tempfiles remove themselves when they go out of scope.
+      # You can also use string paths for temporary files, such as those used for uploaded files in a web server.
+      def temp_path=(value)
+        temp_paths.unshift value
+        temp_path
+      end
+
+      # Gets the data from the latest temp file.  This will read the file into memory.
+      def temp_data
+        save_attachment? ? File.read(temp_path) : nil
+      end
+      
+      # Writes the given data to a Tempfile and adds it to the collection of temp files.
+      def temp_data=(data)
+        self.temp_path = write_to_temp_file data unless data.nil?
+      end
+      
+      # Copies the given file to a randomly named Tempfile.
+      def copy_to_temp_file(file)
+        self.class.copy_to_temp_file file, random_tempfile_filename
+      end
+      
+      # Writes the given file to a randomly named Tempfile.
+      def write_to_temp_file(data)
+        self.class.write_to_temp_file data, random_tempfile_filename
+      end
+      
+      # Stub for creating a temp file from the attachment data.  This should be defined in the backend module.
+      def create_temp_file() end
+
+      # Allows you to work with a processed representation (RMagick, ImageScience, etc) of the attachment in a block.
+      #
+      #   @attachment.with_image do |img|
+      #     self.data = img.thumbnail(100, 100).to_blob
+      #   end
+      #
+      def with_image(&block)
+        self.class.with_image(temp_path, &block)
+      end
+
+      protected
+        # Generates a unique filename for a Tempfile. 
+        def random_tempfile_filename
+          "#{rand Time.now.to_i}#{filename || 'attachment'}"
+        end
+
+        def sanitize_filename(filename)
+          returning filename.strip do |name|
+            # NOTE: File.basename doesn't work right with Windows paths on Unix
+            # get only the filename, not the whole path
+            name.gsub! /^.*(\\|\/)/, ''
+            
+            # Finally, replace all non alphanumeric, underscore or periods with underscore
+            name.gsub! /[^\w\.\-]/, '_'
+          end
+        end
+
+        # before_validation callback.
+        def set_size_from_temp_path
+          self.size = File.size(temp_path) if save_attachment?
+        end
+
+        # validates the size and content_type attributes according to the current model's options
+        def attachment_attributes_valid?
+          [:size, :content_type].each do |attr_name|
+            enum = attachment_options[attr_name]
+            errors.add attr_name, ActiveRecord::Errors.default_error_messages[:inclusion] unless enum.nil? || enum.include?(send(attr_name))
+          end
+        end
+
+        # Initializes a new thumbnail with the given suffix.
+        def find_or_initialize_thumbnail(file_name_suffix)
+          respond_to?(:parent_id) ?
+            thumbnail_class.find_or_initialize_by_thumbnail_and_parent_id(file_name_suffix.to_s, id) :
+            thumbnail_class.find_or_initialize_by_thumbnail(file_name_suffix.to_s)
+        end
+
+        # Stub for a #process_attachment method in a processor
+        def process_attachment
+          @saved_attachment = save_attachment?
+        end
+
+        # Cleans up after processing.  Thumbnails are created, the attachment is stored to the backend, and the temp_paths are cleared.
+        def after_process_attachment
+          if @saved_attachment
+            if respond_to?(:process_attachment_with_processing) && thumbnailable? && !attachment_options[:thumbnails].blank? && parent_id.nil?
+              temp_file = temp_path || create_temp_file
+              attachment_options[:thumbnails].each { |suffix, size| create_or_update_thumbnail(temp_file, suffix, *size) }
+            end
+            save_to_storage
+            @temp_paths.clear
+            @saved_attachment = nil
+            callback :after_attachment_saved
+          end
+        end
+
+        # Resizes the given processed img object with either the attachment resize options or the thumbnail resize options.
+        def resize_image_or_thumbnail!(img)
+          if (!respond_to?(:parent_id) || parent_id.nil?) && attachment_options[:resize_to] # parent image
+            resize_image(img, attachment_options[:resize_to])
+          elsif thumbnail_resize_options # thumbnail
+            resize_image(img, thumbnail_resize_options) 
+          end
+        end
+
+        # Yanked from ActiveRecord::Callbacks, modified so I can pass args to the callbacks besides self.
+        # Only accept blocks, however
+        def callback_with_args(method, arg = self)
+          notify(method)
+
+          result = nil
+          callbacks_for(method).each do |callback|
+            result = callback.call(self, arg)
+            return false if result == false
+          end
+
+          return result
+        end
+        
+        # Removes the thumbnails for the attachment, if it has any
+        def destroy_thumbnails
+          self.thumbnails.each { |thumbnail| thumbnail.destroy } if thumbnailable?
+        end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/amazon_s3.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/amazon_s3.yml
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/amazon_s3.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/amazon_s3.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+test:
+  bucket_name: afu
+  access_key_id: YOURACCESSKEY
+  secret_access_key: YOURSECRETACCESSKEY
+  server: 127.0.0.1
+  port: 3002
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/backends/db_file_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/backends/db_file_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/backends/db_file_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/backends/db_file_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class DbFileTest < Test::Unit::TestCase
+  include BaseAttachmentTests
+  attachment_model Attachment
+
+  def test_should_call_after_attachment_saved(klass = Attachment)
+    attachment_model.saves = 0
+    assert_created do
+      upload_file :filename => '/files/rails.png'
+    end
+    assert_equal 1, attachment_model.saves
+  end
+  
+  test_against_subclass :test_should_call_after_attachment_saved, Attachment
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/backends/file_system_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/backends/file_system_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/backends/file_system_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/backends/file_system_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,80 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class FileSystemTest < Test::Unit::TestCase
+  include BaseAttachmentTests
+  attachment_model FileAttachment
+
+  def test_filesystem_size_for_file_attachment(klass = FileAttachment)
+    attachment_model klass
+    assert_created 1 do
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_equal attachment.size, File.open(attachment.full_filename).stat.size
+    end
+  end
+  
+  test_against_subclass :test_filesystem_size_for_file_attachment, FileAttachment
+
+  def test_should_not_overwrite_file_attachment(klass = FileAttachment)
+    attachment_model klass
+    assert_created 2 do
+      real = upload_file :filename => '/files/rails.png'
+      assert_valid real
+      assert !real.new_record?, real.errors.full_messages.join("\n")
+      assert !real.size.zero?
+      
+      fake = upload_file :filename => '/files/fake/rails.png'
+      assert_valid fake
+      assert !fake.size.zero?
+      
+      assert_not_equal File.open(real.full_filename).stat.size, File.open(fake.full_filename).stat.size
+    end
+  end
+  
+  test_against_subclass :test_should_not_overwrite_file_attachment, FileAttachment
+
+  def test_should_store_file_attachment_in_filesystem(klass = FileAttachment)
+    attachment_model klass
+    attachment = nil
+    assert_created do
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
+    end
+    attachment
+  end
+  
+  test_against_subclass :test_should_store_file_attachment_in_filesystem, FileAttachment
+  
+  def test_should_delete_old_file_when_updating(klass = FileAttachment)
+    attachment_model klass
+    attachment   = upload_file :filename => '/files/rails.png'
+    old_filename = attachment.full_filename
+    assert_not_created do
+      use_temp_file 'files/rails.png' do |file|
+        attachment.filename        = 'rails2.png'
+        attachment.temp_path = File.join(fixture_path, file)
+        attachment.save!
+        assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
+        assert !File.exists?(old_filename),             "#{old_filename} still exists"
+      end
+    end
+  end
+  
+  test_against_subclass :test_should_delete_old_file_when_updating, FileAttachment
+  
+  def test_should_delete_old_file_when_renaming(klass = FileAttachment)
+    attachment_model klass
+    attachment   = upload_file :filename => '/files/rails.png'
+    old_filename = attachment.full_filename
+    assert_not_created do
+      attachment.filename        = 'rails2.png'
+      attachment.save
+      assert  File.exists?(attachment.full_filename), "#{attachment.full_filename} does not exist"    
+      assert !File.exists?(old_filename),             "#{old_filename} still exists"
+      assert !attachment.reload.size.zero?
+      assert_equal 'rails2.png', attachment.filename
+    end
+  end
+  
+  test_against_subclass :test_should_delete_old_file_when_renaming, FileAttachment
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/backends/remote/s3_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,103 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
+require 'net/http'
+
+class S3Test < Test::Unit::TestCase
+  if File.exist?(File.join(File.dirname(__FILE__), '../../amazon_s3.yml'))
+    include BaseAttachmentTests
+    attachment_model S3Attachment
+
+    def test_should_create_correct_bucket_name(klass = S3Attachment)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_equal attachment.s3_config[:bucket_name], attachment.bucket_name
+    end
+
+    test_against_subclass :test_should_create_correct_bucket_name, S3Attachment
+
+    def test_should_create_default_path_prefix(klass = S3Attachment)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_equal File.join(attachment_model.table_name, attachment.attachment_path_id), attachment.base_path
+    end
+
+    test_against_subclass :test_should_create_default_path_prefix, S3Attachment
+
+    def test_should_create_custom_path_prefix(klass = S3WithPathPrefixAttachment)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_equal File.join('some/custom/path/prefix', attachment.attachment_path_id), attachment.base_path
+    end
+
+    test_against_subclass :test_should_create_custom_path_prefix, S3WithPathPrefixAttachment
+
+    def test_should_create_valid_url(klass = S3Attachment)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_equal "#{s3_protocol}#{s3_hostname}#{s3_port_string}/#{attachment.bucket_name}/#{attachment.full_filename}", attachment.s3_url
+    end
+
+    test_against_subclass :test_should_create_valid_url, S3Attachment
+
+    def test_should_create_authenticated_url(klass = S3Attachment)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_match /^http.+AWSAccessKeyId.+Expires.+Signature.+/, attachment.authenticated_s3_url(:use_ssl => true)
+    end
+
+    test_against_subclass :test_should_create_authenticated_url, S3Attachment
+
+    def test_should_save_attachment(klass = S3Attachment)
+      attachment_model klass
+      assert_created do
+        attachment = upload_file :filename => '/files/rails.png'
+        assert_valid attachment
+        assert attachment.image?
+        assert !attachment.size.zero?
+        assert_kind_of Net::HTTPOK, http_response_for(attachment.s3_url)
+      end
+    end
+
+    test_against_subclass :test_should_save_attachment, S3Attachment
+
+    def test_should_delete_attachment_from_s3_when_attachment_record_destroyed(klass = S3Attachment)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+
+      urls = [attachment.s3_url] + attachment.thumbnails.collect(&:s3_url)
+
+      urls.each {|url| assert_kind_of Net::HTTPOK, http_response_for(url) }
+      attachment.destroy
+      urls.each do |url|
+        begin
+          http_response_for(url)
+        rescue Net::HTTPForbidden, Net::HTTPNotFound
+          nil
+        end
+      end
+    end
+
+    test_against_subclass :test_should_delete_attachment_from_s3_when_attachment_record_destroyed, S3Attachment
+
+    protected
+      def http_response_for(url)
+        url = URI.parse(url)
+        Net::HTTP.start(url.host, url.port) {|http| http.request_head(url.path) }
+      end
+      
+      def s3_protocol
+        Technoweenie::AttachmentFu::Backends::S3Backend.protocol
+      end
+      
+      def s3_hostname
+        Technoweenie::AttachmentFu::Backends::S3Backend.hostname
+      end
+
+      def s3_port_string
+        Technoweenie::AttachmentFu::Backends::S3Backend.port_string
+      end
+  else
+    def test_flunk_s3
+      puts "s3 config file not loaded, tests not running"
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/base_attachment_tests.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/base_attachment_tests.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/base_attachment_tests.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/base_attachment_tests.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,57 @@
+module BaseAttachmentTests
+  def test_should_create_file_from_uploaded_file
+    assert_created do
+      attachment = upload_file :filename => '/files/foo.txt'
+      assert_valid attachment
+      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+      assert  attachment.image?
+      assert !attachment.size.zero?
+      #assert_equal 3, attachment.size
+      assert_nil      attachment.width
+      assert_nil      attachment.height
+    end
+  end
+  
+  def test_reassign_attribute_data
+    assert_created 1 do
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.size > 0, "no data was set"
+      
+      attachment.temp_data = 'wtf'
+      assert attachment.save_attachment?
+      attachment.save!
+      
+      assert_equal 'wtf', attachment_model.find(attachment.id).send(:current_data)
+    end
+  end
+  
+  def test_no_reassign_attribute_data_on_nil
+    assert_created 1 do
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.size > 0, "no data was set"
+      
+      attachment.temp_data = nil
+      assert !attachment.save_attachment?
+    end
+  end
+  
+  def test_should_overwrite_old_contents_when_updating
+    attachment   = upload_file :filename => '/files/rails.png'
+    assert_not_created do # no new db_file records
+      use_temp_file 'files/rails.png' do |file|
+        attachment.filename = 'rails2.png'
+        attachment.temp_path = File.join(fixture_path, file)
+        attachment.save!
+      end
+    end
+  end
+  
+  def test_should_save_without_updating_file
+    attachment = upload_file :filename => '/files/foo.txt'
+    assert_valid attachment
+    assert !attachment.save_attachment?
+    assert_nothing_raised { attachment.save! }
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/basic_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/basic_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/basic_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/basic_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,64 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+class BasicTest < Test::Unit::TestCase
+  def test_should_set_default_min_size
+    assert_equal 1, Attachment.attachment_options[:min_size]
+  end
+  
+  def test_should_set_default_max_size
+    assert_equal 1.megabyte, Attachment.attachment_options[:max_size]
+  end
+  
+  def test_should_set_default_size
+    assert_equal (1..1.megabyte), Attachment.attachment_options[:size]
+  end
+  
+  def test_should_set_default_thumbnails_option
+    assert_equal Hash.new, Attachment.attachment_options[:thumbnails]
+  end
+
+  def test_should_set_default_thumbnail_class
+    assert_equal Attachment, Attachment.attachment_options[:thumbnail_class]
+  end
+  
+  def test_should_normalize_content_types_to_array
+    assert_equal %w(pdf), PdfAttachment.attachment_options[:content_type]
+    assert_equal %w(pdf doc txt), DocAttachment.attachment_options[:content_type]
+    assert_equal ['image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png'], ImageAttachment.attachment_options[:content_type]
+    assert_equal ['pdf', 'image/jpeg', 'image/pjpeg', 'image/gif', 'image/png', 'image/x-png'], ImageOrPdfAttachment.attachment_options[:content_type]
+  end
+  
+  def test_should_sanitize_content_type
+    @attachment = Attachment.new :content_type => ' foo '
+    assert_equal 'foo', @attachment.content_type
+  end
+  
+  def test_should_sanitize_filenames
+    @attachment = Attachment.new :filename => 'blah/foo.bar'
+    assert_equal 'foo.bar',    @attachment.filename
+
+    @attachment.filename = 'blah\\foo.bar'
+    assert_equal 'foo.bar',    @attachment.filename
+
+    @attachment.filename = 'f o!O-.bar'
+    assert_equal 'f_o_O-.bar', @attachment.filename
+  end
+  
+  def test_should_convert_thumbnail_name
+    @attachment = FileAttachment.new :filename => 'foo.bar'
+    assert_equal 'foo.bar',           @attachment.thumbnail_name_for(nil)
+    assert_equal 'foo.bar',           @attachment.thumbnail_name_for('')
+    assert_equal 'foo_blah.bar',      @attachment.thumbnail_name_for(:blah)
+    assert_equal 'foo_blah.blah.bar', @attachment.thumbnail_name_for('blah.blah')
+    
+    @attachment.filename = 'foo.bar.baz'
+    assert_equal 'foo.bar_blah.baz', @attachment.thumbnail_name_for(:blah)
+  end
+  
+  def test_should_require_valid_thumbnails_option
+    klass = Class.new(ActiveRecord::Base)
+    assert_raise ArgumentError do
+      klass.has_attachment :thumbnails => []
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/database.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/database.yml
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/database.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/database.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+sqlite:
+  :adapter: sqlite
+  :dbfile: attachment_fu_plugin.sqlite.db
+sqlite3:
+  :adapter: sqlite3
+  :dbfile: attachment_fu_plugin.sqlite3.db
+postgresql:
+  :adapter: postgresql
+  :username: postgres
+  :password: postgres
+  :database: attachment_fu_plugin_test
+  :min_messages: ERROR
+mysql:
+  :adapter: mysql
+  :host: localhost
+  :username: rails
+  :password:
+  :database: attachment_fu_plugin_test
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/extra_attachment_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/extra_attachment_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/extra_attachment_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/extra_attachment_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,57 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+class OrphanAttachmentTest < Test::Unit::TestCase
+  include BaseAttachmentTests
+  attachment_model OrphanAttachment
+  
+  def test_should_create_image_from_uploaded_file
+    assert_created do
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+      assert  attachment.image?
+      assert !attachment.size.zero?
+    end
+  end
+  
+  def test_should_create_file_from_uploaded_file
+    assert_created do
+      attachment = upload_file :filename => '/files/foo.txt'
+      assert_valid attachment
+      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+      assert  attachment.image?
+      assert !attachment.size.zero?
+    end
+  end
+  
+  def test_should_create_image_from_uploaded_file_with_custom_content_type
+    assert_created do
+      attachment = upload_file :content_type => 'foo/bar', :filename => '/files/rails.png'
+      assert_valid attachment
+      assert !attachment.image?
+      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+      assert !attachment.size.zero?
+      #assert_equal 1784, attachment.size
+    end
+  end
+  
+  def test_should_create_thumbnail
+    attachment = upload_file :filename => '/files/rails.png'
+    
+    assert_raise Technoweenie::AttachmentFu::ThumbnailError do
+      attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 50, 50)
+    end
+  end
+  
+  def test_should_create_thumbnail_with_geometry_string
+   attachment = upload_file :filename => '/files/rails.png'
+    
+    assert_raise Technoweenie::AttachmentFu::ThumbnailError do
+      attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 'x50')
+    end
+  end
+end
+
+class MinimalAttachmentTest < OrphanAttachmentTest
+  attachment_model MinimalAttachment
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/fixtures/attachment.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/fixtures/attachment.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/fixtures/attachment.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/fixtures/attachment.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,127 @@
+class Attachment < ActiveRecord::Base
+  @@saves = 0
+  cattr_accessor :saves
+  has_attachment :processor => :rmagick
+  validates_as_attachment
+  after_attachment_saved do |record|
+    self.saves += 1
+  end
+end
+
+class SmallAttachment < Attachment
+  has_attachment :max_size => 1.kilobyte
+end
+
+class BigAttachment < Attachment
+  has_attachment :size => 1.megabyte..2.megabytes
+end
+
+class PdfAttachment < Attachment
+  has_attachment :content_type => 'pdf'
+end
+
+class DocAttachment < Attachment
+  has_attachment :content_type => %w(pdf doc txt)
+end
+
+class ImageAttachment < Attachment
+  has_attachment :content_type => :image, :resize_to => [50,50]
+end
+
+class ImageOrPdfAttachment < Attachment
+  has_attachment :content_type => ['pdf', :image], :resize_to => 'x50'
+end
+
+class ImageWithThumbsAttachment < Attachment
+  has_attachment :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
+  after_resize do |record, img|
+    record.aspect_ratio = img.columns.to_f / img.rows.to_f
+  end
+end
+
+class FileAttachment < ActiveRecord::Base
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
+  validates_as_attachment
+end
+
+class ImageFileAttachment < FileAttachment
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+    :content_type => :image, :resize_to => [50,50]
+end
+
+class ImageWithThumbsFileAttachment < FileAttachment
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+    :thumbnails => { :thumb => [50, 50], :geometry => 'x50' }, :resize_to => [55,55]
+  after_resize do |record, img|
+    record.aspect_ratio = img.columns.to_f / img.rows.to_f
+  end
+end
+
+class ImageWithThumbsClassFileAttachment < FileAttachment
+  # use file_system_path to test backwards compatibility
+  has_attachment :file_system_path => 'vendor/plugins/attachment_fu/test/files',
+    :thumbnails => { :thumb => [50, 50] }, :resize_to => [55,55],
+    :thumbnail_class => 'ImageThumbnail'
+end
+
+class ImageThumbnail < FileAttachment
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files/thumbnails'
+end
+
+# no parent
+class OrphanAttachment < ActiveRecord::Base
+  has_attachment :processor => :rmagick
+  validates_as_attachment
+end
+
+# no filename, no size, no content_type
+class MinimalAttachment < ActiveRecord::Base
+  has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files', :processor => :rmagick
+  validates_as_attachment
+  
+  def filename
+    "#{id}.file"
+  end
+end
+
+begin
+  class ImageScienceAttachment < ActiveRecord::Base
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :image_science, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
+  end
+rescue MissingSourceFile
+  puts $!.message
+  puts "no ImageScience"
+end
+
+begin
+  class MiniMagickAttachment < ActiveRecord::Base
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :mini_magick, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
+  end
+rescue MissingSourceFile
+  puts $!.message
+  puts "no Mini Magick"
+end
+
+begin
+  class MiniMagickAttachment < ActiveRecord::Base
+    has_attachment :path_prefix => 'vendor/plugins/attachment_fu/test/files',
+      :processor => :mini_magick, :thumbnails => { :thumb => [50, 51], :geometry => '31>' }, :resize_to => 55
+  end
+rescue MissingSourceFile
+end
+
+begin
+  class S3Attachment < ActiveRecord::Base
+    has_attachment :storage => :s3, :processor => :rmagick, :s3_config_path => File.join(File.dirname(__FILE__), '../amazon_s3.yml')
+    validates_as_attachment
+  end
+
+  class S3WithPathPrefixAttachment < S3Attachment
+    has_attachment :storage => :s3, :path_prefix => 'some/custom/path/prefix', :processor => :rmagick
+    validates_as_attachment
+  end
+rescue Technoweenie::AttachmentFu::Backends::S3Backend::ConfigFileNotFoundError
+  puts "S3 error: #{$!}"
+end
Files mephisto-0.7.3/vendor/plugins/attachment_fu/test/fixtures/files/fake/rails.png and technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/fixtures/files/fake/rails.png differ
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/fixtures/files/foo.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/fixtures/files/foo.txt
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/fixtures/files/foo.txt	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/fixtures/files/foo.txt	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+foo
\ No newline at end of file
Files mephisto-0.7.3/vendor/plugins/attachment_fu/test/fixtures/files/rails.png and technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/fixtures/files/rails.png differ
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/geometry_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/geometry_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/geometry_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/geometry_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,101 @@
+require 'test/unit'
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/geometry')) unless Object.const_defined?(:Geometry)
+
+class GeometryTest < Test::Unit::TestCase
+  def test_should_resize
+    assert_geometry 50, 64,
+      "50x50"   => [39, 50],
+      "60x60"   => [47, 60],
+      "100x100" => [78, 100]
+  end
+  
+  def test_should_resize_no_width
+    assert_geometry 50, 64,
+      "x50"  => [39, 50],
+      "x60"  => [47, 60],
+      "x100" => [78, 100]
+  end
+  
+  def test_should_resize_no_height
+    assert_geometry 50, 64,
+      "50"  => [50, 64],
+      "60"  => [60, 77],
+      "100" => [100, 128]
+  end
+  
+  def test_should_resize_with_percent
+    assert_geometry 50, 64,
+      "50x50%"   => [25, 32],
+      "60x60%"   => [30, 38],
+      "120x112%" => [60, 72]
+  end
+  
+  def test_should_resize_with_percent_and_no_width
+    assert_geometry 50, 64,
+      "x50%"  => [50, 32],
+      "x60%"  => [50, 38],
+      "x112%" => [50, 72]
+  end
+  
+  def test_should_resize_with_percent_and_no_height
+    assert_geometry 50, 64,
+      "50%"  => [25, 32],
+      "60%"  => [30, 38],
+      "120%" => [60, 77]
+  end
+  
+  def test_should_resize_with_less
+    assert_geometry 50, 64,
+      "50x50<"   => [50, 64],
+      "60x60<"   => [50, 64],
+      "100x100<" => [78, 100],
+      "100x112<" => [88, 112],
+      "40x70<"   => [50, 64]
+  end
+  
+  def test_should_resize_with_less_and_no_width
+    assert_geometry 50, 64,
+      "x50<"  => [50, 64],
+      "x60<"  => [50, 64],
+      "x100<" => [78, 100]
+  end
+  
+  def test_should_resize_with_less_and_no_height
+    assert_geometry 50, 64,
+      "50<"  => [50, 64],
+      "60<"  => [60, 77],
+      "100<" => [100, 128]
+  end
+
+  def test_should_resize_with_greater
+    assert_geometry 50, 64,
+      "50x50>"   => [39, 50],
+      "60x60>"   => [47, 60],
+      "100x100>" => [50, 64],
+      "100x112>" => [50, 64],
+      "40x70>"   => [40, 51]
+  end
+  
+  def test_should_resize_with_greater_and_no_width
+    assert_geometry 50, 64,
+      "x40>"  => [31, 40],
+      "x60>"  => [47, 60],
+      "x100>" => [50, 64]
+  end
+  
+  def test_should_resize_with_greater_and_no_height
+    assert_geometry 50, 64,
+      "40>"  => [40, 51],
+      "60>"  => [50, 64],
+      "100>" => [50, 64]
+  end
+
+  protected
+    def assert_geometry(width, height, values)
+      values.each do |geo, result|
+        # run twice to verify the Geometry string isn't modified after a run
+        geo = Geometry.from_s(geo)
+        2.times { assert_equal result, [width, height] / geo }
+      end
+    end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/processors/image_science_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/processors/image_science_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/processors/image_science_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/processors/image_science_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class ImageScienceTest < Test::Unit::TestCase
+  attachment_model ImageScienceAttachment
+
+  if Object.const_defined?(:ImageScience)
+    def test_should_resize_image
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.image?
+      # test image science thumbnail
+      assert_equal 42, attachment.width
+      assert_equal 55, attachment.height
+      
+      thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+      geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+      
+      # test exact resize dimensions
+      assert_equal 50, thumb.width
+      assert_equal 51, thumb.height
+      
+      # test geometry string
+      assert_equal 31, geo.width
+      assert_equal 41, geo.height
+    end
+  else
+    def test_flunk
+      puts "ImageScience not loaded, tests not running"
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/processors/mini_magick_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class MiniMagickTest < Test::Unit::TestCase
+  attachment_model MiniMagickAttachment
+
+  if Object.const_defined?(:MiniMagick)
+    def test_should_resize_image
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert attachment.image?
+      # test MiniMagick thumbnail
+      assert_equal 43, attachment.width
+      assert_equal 55, attachment.height
+      
+      thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+      geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+      
+      # test exact resize dimensions
+      assert_equal 50, thumb.width
+      assert_equal 51, thumb.height
+      
+      # test geometry string
+      assert_equal 31, geo.width
+      assert_equal 40, geo.height
+    end
+  else
+    def test_flunk
+      puts "MiniMagick not loaded, tests not running"
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/processors/rmagick_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,241 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
+
+class RmagickTest < Test::Unit::TestCase
+  attachment_model Attachment
+
+  if Object.const_defined?(:Magick)
+    def test_should_create_image_from_uploaded_file
+      assert_created do
+        attachment = upload_file :filename => '/files/rails.png'
+        assert_valid attachment
+        assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+        assert  attachment.image?
+        assert !attachment.size.zero?
+        #assert_equal 1784, attachment.size
+        assert_equal 50,   attachment.width
+        assert_equal 64,   attachment.height
+        assert_equal '50x64', attachment.image_size
+      end
+    end
+    
+    def test_should_create_image_from_uploaded_file_with_custom_content_type
+      assert_created do
+        attachment = upload_file :content_type => 'foo/bar', :filename => '/files/rails.png'
+        assert_valid attachment
+        assert !attachment.image?
+        assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+        assert !attachment.size.zero?
+        #assert_equal 1784, attachment.size
+        assert_nil attachment.width
+        assert_nil attachment.height
+        assert_equal [], attachment.thumbnails
+      end
+    end
+    
+    def test_should_create_thumbnail
+      attachment = upload_file :filename => '/files/rails.png'
+      
+      assert_created do
+        basename, ext = attachment.filename.split '.'
+        thumbnail = attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 50, 50)
+        assert_valid thumbnail
+        assert !thumbnail.size.zero?
+        #assert_in_delta 4673, thumbnail.size, 2
+        assert_equal 50,   thumbnail.width
+        assert_equal 50,   thumbnail.height
+        assert_equal [thumbnail.id], attachment.thumbnails.collect(&:id)
+        assert_equal attachment.id,  thumbnail.parent_id if thumbnail.respond_to?(:parent_id)
+        assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
+      end
+    end
+    
+    def test_should_create_thumbnail_with_geometry_string
+      attachment = upload_file :filename => '/files/rails.png'
+      
+      assert_created do
+        basename, ext = attachment.filename.split '.'
+        thumbnail = attachment.create_or_update_thumbnail(attachment.create_temp_file, 'thumb', 'x50')
+        assert_valid thumbnail
+        assert !thumbnail.size.zero?
+        #assert_equal 3915, thumbnail.size
+        assert_equal 39,   thumbnail.width
+        assert_equal 50,   thumbnail.height
+        assert_equal [thumbnail], attachment.thumbnails
+        assert_equal attachment.id,  thumbnail.parent_id if thumbnail.respond_to?(:parent_id)
+        assert_equal "#{basename}_thumb.#{ext}", thumbnail.filename
+      end
+    end
+    
+    def test_should_resize_image(klass = ImageAttachment)
+      attachment_model klass
+      assert_equal [50, 50], attachment_model.attachment_options[:resize_to]
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+      assert  attachment.image?
+      assert !attachment.size.zero?
+      #assert_in_delta 4673, attachment.size, 2
+      assert_equal 50, attachment.width
+      assert_equal 50, attachment.height
+    end
+    
+    test_against_subclass :test_should_resize_image, ImageAttachment
+    
+    def test_should_resize_image_with_geometry(klass = ImageOrPdfAttachment)
+      attachment_model klass
+      assert_equal 'x50', attachment_model.attachment_options[:resize_to]
+      attachment = upload_file :filename => '/files/rails.png'
+      assert_valid attachment
+      assert !attachment.db_file.new_record? if attachment.respond_to?(:db_file)
+      assert  attachment.image?
+      assert !attachment.size.zero?
+      #assert_equal 3915, attachment.size
+      assert_equal 39,   attachment.width
+      assert_equal 50,   attachment.height
+    end
+    
+    test_against_subclass :test_should_resize_image_with_geometry, ImageOrPdfAttachment
+    
+    def test_should_give_correct_thumbnail_filenames(klass = ImageWithThumbsFileAttachment)
+      attachment_model klass
+      assert_created 3 do
+        attachment = upload_file :filename => '/files/rails.png'
+        thumb      = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+        geo        = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+        
+        [attachment, thumb, geo].each { |record| assert_valid record }
+    
+        assert_match /rails\.png$/,          attachment.full_filename
+        assert_match /rails_geometry\.png$/, attachment.full_filename(:geometry)
+        assert_match /rails_thumb\.png$/,    attachment.full_filename(:thumb)
+      end
+    end
+    
+    test_against_subclass :test_should_give_correct_thumbnail_filenames, ImageWithThumbsFileAttachment
+    
+    def test_should_automatically_create_thumbnails(klass = ImageWithThumbsAttachment)
+      attachment_model klass
+      assert_created 3 do
+        attachment = upload_file :filename => '/files/rails.png'
+        assert_valid attachment
+        assert !attachment.size.zero?
+        #assert_equal 1784, attachment.size
+        assert_equal 55,   attachment.width
+        assert_equal 55,   attachment.height
+        assert_equal 2,    attachment.thumbnails.length
+        assert_equal 1.0,  attachment.aspect_ratio
+        
+        thumb = attachment.thumbnails.detect { |t| t.filename =~ /_thumb/ }
+        assert !thumb.new_record?, thumb.errors.full_messages.join("\n")
+        assert !thumb.size.zero?
+        #assert_in_delta 4673, thumb.size, 2
+        assert_equal 50,   thumb.width
+        assert_equal 50,   thumb.height
+        assert_equal 1.0,  thumb.aspect_ratio
+        
+        geo   = attachment.thumbnails.detect { |t| t.filename =~ /_geometry/ }
+        assert !geo.new_record?, geo.errors.full_messages.join("\n")
+        assert !geo.size.zero?
+        #assert_equal 3915, geo.size
+        assert_equal 50,   geo.width
+        assert_equal 50,   geo.height
+        assert_equal 1.0,  geo.aspect_ratio
+      end
+    end
+    
+    test_against_subclass :test_should_automatically_create_thumbnails, ImageWithThumbsAttachment
+    
+    # same as above method, but test it on a file model
+    test_against_class :test_should_automatically_create_thumbnails, ImageWithThumbsFileAttachment
+    test_against_subclass :test_should_automatically_create_thumbnails_on_class, ImageWithThumbsFileAttachment
+    
+    def test_should_use_thumbnail_subclass(klass = ImageWithThumbsClassFileAttachment)
+      attachment_model klass
+      attachment = nil
+      assert_difference ImageThumbnail, :count do
+        attachment = upload_file :filename => '/files/rails.png'
+        assert_valid attachment
+      end
+      assert_kind_of ImageThumbnail,  attachment.thumbnails.first
+      assert_equal attachment.id,     attachment.thumbnails.first.parent.id
+      assert_kind_of FileAttachment,  attachment.thumbnails.first.parent
+      assert_equal 'rails_thumb.png', attachment.thumbnails.first.filename
+      assert_equal attachment.thumbnails.first.full_filename, attachment.full_filename(attachment.thumbnails.first.thumbnail),
+        "#full_filename does not use thumbnail class' path."
+      assert_equal attachment.destroy attachment
+    end
+    
+    test_against_subclass :test_should_use_thumbnail_subclass, ImageWithThumbsClassFileAttachment
+    
+    def test_should_remove_old_thumbnail_files_when_updating(klass = ImageWithThumbsFileAttachment)
+      attachment_model klass
+      attachment = nil
+      assert_created 3 do
+        attachment = upload_file :filename => '/files/rails.png'
+      end
+    
+      old_filenames = [attachment.full_filename] + attachment.thumbnails.collect(&:full_filename)
+    
+      assert_not_created do
+        use_temp_file "files/rails.png" do |file|
+          attachment.filename        = 'rails2.png'
+          attachment.temp_path = File.join(fixture_path, file)
+          attachment.save
+          new_filenames = [attachment.reload.full_filename] + attachment.thumbnails.collect { |t| t.reload.full_filename }
+          new_filenames.each { |f| assert  File.exists?(f), "#{f} does not exist" }
+          old_filenames.each { |f| assert !File.exists?(f), "#{f} still exists" }
+        end
+      end
+    end
+    
+    test_against_subclass :test_should_remove_old_thumbnail_files_when_updating, ImageWithThumbsFileAttachment
+    
+    def test_should_delete_file_when_in_file_system_when_attachment_record_destroyed(klass = ImageWithThumbsFileAttachment)
+      attachment_model klass
+      attachment = upload_file :filename => '/files/rails.png'
+      filenames = [attachment.full_filename] + attachment.thumbnails.collect(&:full_filename)
+      filenames.each { |f| assert  File.exists?(f),  "#{f} never existed to delete on destroy" }
+      attachment.destroy
+      filenames.each { |f| assert !File.exists?(f),  "#{f} still exists" }
+    end
+    
+    test_against_subclass :test_should_delete_file_when_in_file_system_when_attachment_record_destroyed, ImageWithThumbsFileAttachment
+    
+    def test_should_overwrite_old_thumbnail_records_when_updating(klass = ImageWithThumbsAttachment)
+      attachment_model klass
+      attachment = nil
+      assert_created 3 do
+        attachment = upload_file :filename => '/files/rails.png'
+      end
+      assert_not_created do # no new db_file records
+        use_temp_file "files/rails.png" do |file|
+          attachment.filename             = 'rails2.png'
+          attachment.temp_path = File.join(fixture_path, file)
+          attachment.save!
+        end
+      end
+    end
+    
+    test_against_subclass :test_should_overwrite_old_thumbnail_records_when_updating, ImageWithThumbsAttachment
+    
+    def test_should_overwrite_old_thumbnail_records_when_renaming(klass = ImageWithThumbsAttachment)
+      attachment_model klass
+      attachment = nil
+      assert_created 3 do
+        attachment = upload_file :class => klass, :filename => '/files/rails.png'
+      end
+      assert_not_created do # no new db_file records
+        attachment.filename = 'rails2.png'
+        attachment.save
+        assert !attachment.reload.size.zero?
+        assert_equal 'rails2.png', attachment.filename
+      end
+    end
+    
+    test_against_subclass :test_should_overwrite_old_thumbnail_records_when_renaming, ImageWithThumbsAttachment
+  else
+    def test_flunk
+      puts "RMagick not installed, no tests running"
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/schema.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/schema.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/schema.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/schema.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,86 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :attachments, :force => true do |t|
+    t.column :db_file_id,      :integer
+    t.column :parent_id,       :integer
+    t.column :thumbnail,       :string
+    t.column :filename,        :string, :limit => 255
+    t.column :content_type,    :string, :limit => 255
+    t.column :size,            :integer
+    t.column :width,           :integer
+    t.column :height,          :integer
+    t.column :aspect_ratio,    :float
+  end
+
+  create_table :file_attachments, :force => true do |t|
+    t.column :parent_id,       :integer
+    t.column :thumbnail,       :string 
+    t.column :filename,        :string, :limit => 255
+    t.column :content_type,    :string, :limit => 255
+    t.column :size,            :integer
+    t.column :width,           :integer
+    t.column :height,          :integer
+    t.column :type,            :string
+    t.column :aspect_ratio,    :float
+  end
+
+  create_table :image_science_attachments, :force => true do |t|
+    t.column :parent_id,       :integer
+    t.column :thumbnail,       :string 
+    t.column :filename,        :string, :limit => 255
+    t.column :content_type,    :string, :limit => 255
+    t.column :size,            :integer
+    t.column :width,           :integer
+    t.column :height,          :integer
+    t.column :type,            :string
+  end
+
+  create_table :mini_magick_attachments, :force => true do |t|
+    t.column :parent_id,       :integer
+    t.column :thumbnail,       :string 
+    t.column :filename,        :string, :limit => 255
+    t.column :content_type,    :string, :limit => 255
+    t.column :size,            :integer
+    t.column :width,           :integer
+    t.column :height,          :integer
+    t.column :type,            :string
+  end
+
+  create_table :mini_magick_attachments, :force => true do |t|
+    t.column :parent_id,       :integer
+    t.column :thumbnail,       :string 
+    t.column :filename,        :string, :limit => 255
+    t.column :content_type,    :string, :limit => 255
+    t.column :size,            :integer
+    t.column :width,           :integer
+    t.column :height,          :integer
+    t.column :type,            :string
+  end
+
+  create_table :orphan_attachments, :force => true do |t|
+    t.column :db_file_id,      :integer
+    t.column :filename,        :string, :limit => 255
+    t.column :content_type,    :string, :limit => 255
+    t.column :size,            :integer
+  end
+  
+  create_table :minimal_attachments, :force => true do |t|
+    t.column :size,            :integer
+    t.column :content_type,    :string, :limit => 255
+  end
+
+  create_table :db_files, :force => true do |t|
+    t.column :data, :binary
+  end
+
+  create_table :s3_attachments, :force => true do |t|
+    t.column :parent_id,       :integer
+    t.column :thumbnail,       :string 
+    t.column :filename,        :string, :limit => 255
+    t.column :content_type,    :string, :limit => 255
+    t.column :size,            :integer
+    t.column :width,           :integer
+    t.column :height,          :integer
+    t.column :type,            :string
+    t.column :aspect_ratio,    :float
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/test_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/test_helper.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/test_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/test_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,142 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+ENV['RAILS_ENV'] = 'test'
+
+require 'test/unit'
+require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
+require 'breakpoint'
+require 'active_record/fixtures'
+require 'action_controller/test_process'
+
+config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+
+db_adapter = ENV['DB']
+
+# no db passed, try one of these fine config-free DBs before bombing.
+db_adapter ||= 
+  begin
+    require 'rubygems'
+    require 'sqlite'
+    'sqlite'
+  rescue MissingSourceFile
+    begin
+      require 'sqlite3'
+      'sqlite3'
+    rescue MissingSourceFile
+    end
+  end
+
+if db_adapter.nil?
+  raise "No DB Adapter selected.  Pass the DB= option to pick one, or install Sqlite or Sqlite3."
+end
+
+ActiveRecord::Base.establish_connection(config[db_adapter])
+
+load(File.dirname(__FILE__) + "/schema.rb")
+
+Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures"
+$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+
+class Test::Unit::TestCase #:nodoc:
+  include ActionController::TestProcess
+  def create_fixtures(*table_names)
+    if block_given?
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
+    else
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
+    end
+  end
+
+  def setup
+    Attachment.saves = 0
+    DbFile.transaction { [Attachment, FileAttachment, OrphanAttachment, MinimalAttachment, DbFile].each { |klass| klass.delete_all } }
+    attachment_model self.class.attachment_model
+  end
+  
+  def teardown
+    FileUtils.rm_rf File.join(File.dirname(__FILE__), 'files')
+  end
+
+  self.use_transactional_fixtures = true
+  self.use_instantiated_fixtures  = false
+
+  def self.attachment_model(klass = nil)
+    @attachment_model = klass if klass 
+    @attachment_model
+  end
+
+  def self.test_against_class(test_method, klass, subclass = false)
+    define_method("#{test_method}_on_#{:sub if subclass}class") do
+      klass = Class.new(klass) if subclass
+      attachment_model klass
+      send test_method, klass
+    end
+  end
+
+  def self.test_against_subclass(test_method, klass)
+    test_against_class test_method, klass, true
+  end
+
+  protected
+    def upload_file(options = {})
+      use_temp_file options[:filename] do |file|
+        att = attachment_model.create :uploaded_data => fixture_file_upload(file, options[:content_type] || 'image/png')
+        att.reload unless att.new_record?
+        return att
+      end
+    end
+
+    def use_temp_file(fixture_filename)
+      temp_path = File.join('/tmp', File.basename(fixture_filename))
+      FileUtils.mkdir_p File.join(fixture_path, 'tmp')
+      FileUtils.cp File.join(fixture_path, fixture_filename), File.join(fixture_path, temp_path)
+      yield temp_path
+    ensure
+      FileUtils.rm_rf File.join(fixture_path, 'tmp')
+    end
+
+    def assert_created(num = 1)
+      assert_difference attachment_model.base_class, :count, num do
+        if attachment_model.included_modules.include? DbFile
+          assert_difference DbFile, :count, num do
+            yield
+          end
+        else
+          yield
+        end
+      end
+    end
+    
+    def assert_not_created
+      assert_created(0) { yield }
+    end
+    
+    def should_reject_by_size_with(klass)
+      attachment_model klass
+      assert_not_created do
+        attachment = upload_file :filename => '/files/rails.png'
+        assert attachment.new_record?
+        assert attachment.errors.on(:size)
+        assert_nil attachment.db_file if attachment.respond_to?(:db_file)
+      end
+    end
+    
+    def assert_difference(object, method = nil, difference = 1)
+      initial_value = object.send(method)
+      yield
+      assert_equal initial_value + difference, object.send(method)
+    end
+    
+    def assert_no_difference(object, method, &block)
+      assert_difference object, method, 0, &block
+    end
+    
+    def attachment_model(klass = nil)
+      @attachment_model = klass if klass 
+      @attachment_model
+    end
+end
+
+require File.join(File.dirname(__FILE__), 'fixtures/attachment')
+require File.join(File.dirname(__FILE__), 'base_attachment_tests')
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/attachment_fu/test/validation_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/validation_test.rb
--- mephisto-0.7.3/vendor/plugins/attachment_fu/test/validation_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/attachment_fu/test/validation_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,55 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
+
+class ValidationTest < Test::Unit::TestCase
+  def test_should_invalidate_big_files
+    @attachment = SmallAttachment.new
+    assert !@attachment.valid?
+    assert @attachment.errors.on(:size)
+    
+    @attachment.size = 2000
+    assert !@attachment.valid?
+    assert @attachment.errors.on(:size), @attachment.errors.full_messages.to_sentence
+    
+    @attachment.size = 1000
+    assert !@attachment.valid?
+    assert_nil @attachment.errors.on(:size)
+  end
+
+  def test_should_invalidate_small_files
+    @attachment = BigAttachment.new
+    assert !@attachment.valid?
+    assert @attachment.errors.on(:size)
+    
+    @attachment.size = 2000
+    assert !@attachment.valid?
+    assert @attachment.errors.on(:size), @attachment.errors.full_messages.to_sentence
+    
+    @attachment.size = 1.megabyte
+    assert !@attachment.valid?
+    assert_nil @attachment.errors.on(:size)
+  end
+  
+  def test_should_validate_content_type
+    @attachment = PdfAttachment.new
+    assert !@attachment.valid?
+    assert @attachment.errors.on(:content_type)
+
+    @attachment.content_type = 'foo'
+    assert !@attachment.valid?
+    assert @attachment.errors.on(:content_type)
+
+    @attachment.content_type = 'pdf'
+    assert !@attachment.valid?
+    assert_nil @attachment.errors.on(:content_type)
+  end
+
+  def test_should_require_filename
+    @attachment = Attachment.new
+    assert !@attachment.valid?
+    assert @attachment.errors.on(:filename)
+    
+    @attachment.filename = 'foo'
+    assert !@attachment.valid?
+    assert_nil @attachment.errors.on(:filename)
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/CHANGELOG technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/CHANGELOG
--- mephisto-0.7.3/vendor/plugins/engines/CHANGELOG	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/CHANGELOG	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,258 @@
+= 2.0.0 - (ANOTHER) MASSIVE INTERNAL REFACTORING
+
+* Engines now conforms to the new plugin loading mechanism, delegating plugin load order and lots of other things to Rails itself.
+
+
+
+= 1.2.2
+
+* Added the ability to code mix different types of files, cleaning up the existing code-mixing implementation slightly (Ticket #271)
+
+
+= 1.2.1
+
+* Added documentation to clarify some of the issues with Rails unloading classes that aren't required using "require_dependency" (Ticket #266)
+
+* Fixed a bug where test_help was being loaded when it wasn't needed, and was actually causing problems (Ticket #265)
+
+
+= 1.2.0 - MASSIVE INTERNAL REFACTORING
+
+* !!!Support for Rails < 1.2 has been dropped!!!; if you are using Rails =< 1.1.6, please use Engines 1.1.6, available from http://svn.rails-engines.org/engines/tags/rel_1.1.6
+
+* Engines are dead! Long live plugins! There is now no meaningful notion of an engine - all plugins can take advantage of the more powerful features that the engines plugin provides by including app directories, etc.
+
+* Init_engine.rb is no longer used; please use the plugin-standard init.rb instead.
+
+* Engines.start is no longer required; please use the config.plugins array provided by Rails instead
+
+* To get the most benefit from Engines, set config.plugins to ["engines", "*"] to load the engines plugin first, and then all other plugins in their normal order after.
+
+* Access all loaded plugins via the new Rails.plugins array, and by name using Rails.plugins[:plugin_name].
+
+* Access plugin metadata loaded automatically from about.yml: Rails.plugins[:name].about. Plugin#version is provided directly, for easy access.
+
+* Module.config is has been removed - use mattr_accessor instead, and initialize your default values via the init.rb mechanism.
+
+* Public asset helpers have been rewritten; instead of engine_stylesheet, now use stylesheet_link_tag :name, :plugin => "plugin_name"
+
+* Plugin migrations have been reworked to integrate into the main migration stream. Please run script/generate plugin_migration to create plugin migrations in your main application.
+
+* The fixture method for loading fixtures against any class has been removed; instead, engines will now provide a mechanism for loading fixtures from all plugins, by mirroring fixtures into a common location.
+
+* All references to engines have been removed; For example, any rake tasks which applied to engines now apply to all plugins. The default Rails rake tasks for plugins are overridden where necessary.
+
+* Layouts can now be shared via plugins - inspiration gratefully taken from PluginAWeek's plugin_routing :)
+
+* Actual routing from plugins is now possible, by including routes.rb in your plugin directory and using the from_plugin method in config/routes.rb (Ticket #182)
+
+* Controllers are no longer loaded twice if they're not present in the normal app/ directory (Ticket #177)
+
+* The preferred location for javascripts/stylesheets/etc is now 'assets' rather than 'public'
+
+* Ensure that plugins started before routing have their controllers appropriately added to config.controller_paths (Ticket #258)
+
+* Removed Engines.version - it's not longer relevant, now we're loading version information from about.yml files.
+
+* Added a huge amount of documentation to all new modules.
+
+* Added new warning message if installation of engines 1.2.x is attempted in a Rails 1.1.x application
+
+* Added details of the removal of the config method to UPGRADING
+
+* Removed the plugins:info rake task in favour of adding information to script/about via the Rails::Info module (Ticket #261)
+
+* Improved handling of testing and documentation tasks for plugins
+
+
+
+= 1.1.4
+
+* Fixed creation of multipart emails (Ticket #190)
+
+* Added a temporary fix to the code-mixing issue. In your engine's test/test_helper.rb, please add the following lines:
+
+   # Ensure that the code mixing and view loading from the application is disabled
+   Engines.disable_app_views_loading = true
+   Engines.disable_app_code_mixing = true
+
+  which will prevent code mixing for controllers and helpers, and loading views from the application. One thing to remember is to load any controllers/helpers using 'require_or_load' in your tests, to ensure that the engine behaviour is respected (Ticket #135)
+
+* Added tasks to easily test engines individually (Ticket #120)
+
+* Fixture extensions will now fail with an exception if the corresponding class cannot be loaded (Ticket #138)
+
+* Patch for new routing/controller loading in Rails 1.1.6. The routing code is now replaced with the contents of config.controller_paths, along with controller paths from any started engines (Ticket #196)
+
+* Rails' Configuration instance is now stored, and available from all engines and plugins.
+
+
+
+= 1.1.3
+
+* Fixed README to show 'models' rather than 'model' class (Ticket #167)
+* Fixed dependency loading to work with Rails 1.1.4 (Ticket #180)
+
+
+
+= 1.1.2
+
+* Added better fix to version checking (Ticket #130, jdell@gbdev.com).
+
+* Fixed generated init_engine.rb so that VERSION module doesn't cause probems (Ticket #131, japgolly@gmail.com)
+
+* Fixed error with Rails 1.0 when trying to ignore the engine_schema_info table (Ticket #132, snowblink@gmail.com)
+
+* Re-added old style rake tasks (Ticket #133)
+
+* No longer adding all subdirectories of <engine>/app or <engine>/lib, as this can cause issues when files are grouped in modules (Ticket #149, kasatani@gmail.com)
+
+* Fixed engine precidence ordering for Rails 1.1 (Ticket #146)
+
+* Added new Engines.each method to assist in processing the engines in the desired order (Ticket #146)
+
+* Fixed annoying error message at appears when starting the console in development mode (Ticket #134)
+
+* Engines is now super-careful about loading the correct version of Rails from vendor (Ticket #154)
+
+
+
+= 1.1.1
+
+* Fixed migration rake task failing when given a specific version (Ticket #115)
+
+* Added new rake task "test:engines" which will test engines (and other plugins) but ensure that the test database is cloned from development beforehand (Ticket #125)
+
+* Fixed issue where 'engine_schema_info' table was included in schema dumps (Ticket #87)
+
+* Fixed multi-part emails (Ticket #121)
+
+* Added an 'install.rb' file to new engines created by the bundled generator, which installs the engines plugin automatically if it doesn't already exist (Ticket #122)
+
+* Added a default VERSION module to generated engines (Ticket #123)
+
+* Refactored copying of engine's public files to a method of an Engine instance. You can now call Engines.get(:engine_name).copy_public_files (Ticket #108)
+
+* Changed engine generator templates from .rb files to .erb files (Ticket #106)
+
+* Fixed the test_helper.erb file to use the correct testing extensions and not load any schema - the schema will be cloned automatically via rake test:engines
+
+* Fixed problem when running with Rails 1.1.1 where version wasn't determined correctly (Ticket #129)
+
+* Fixed bug preventing engines from loading when both Rails 1.1.0 and 1.1.1 gems are installed and in use.
+
+* Updated version (d'oh!)
+
+
+
+= 1.1.0
+
+* Improved regexp matching for Rails 1.0 engines with peculiar paths
+
+* Engine instance objects can be accessed via Engines[:name], an alias for Engines.get(:name) (Ticket #99)
+
+* init_engine.rb is now processed as the final step in the Engine.start process, so it can access files within the lib directory, which is now in the $LOAD_PATH at that point. (Ticket #99)
+
+* Clarified MIT license (Ticket #98)
+
+* Updated Rake tasks to integrate smoothly with Rails 1.1 namespaces
+
+* Changed the version to "1.1.0 (svn)"
+
+* Added more information about using the plugin with Edge Rails to the README
+
+* moved extensions into lib/engines/ directory to enable use of Engines module in extension code.
+
+* Added conditional require_or_load method which attempts to detect the current Rails version. To use the Edge Rails version of the loading mechanism, add the line:
+
+*   Engines.config :edge, true
+
+* to your environment.rb file.
+
+* Merged changes from /branches/edge and /branches/rb_1.0 into /trunk
+
+* engine_schema_info now respects the prefix/suffixes set for ActiveRecord::Base (Ticket #67)
+
+* added ActiveRecord::Base.wrapped_table_name(name) method to assist in determining the correct table name
+
+
+
+= 1.0.6
+
+* Added ability to determine version information for engines: rake engine_info
+
+* Added a custom logger for the Engines module, to stop pollution of the Rails logs.
+
+* Added some more tests (in particular, see rails_engines/applications/engines_test).
+
+* Another attempt at solving Ticket #53 - controllers and helpers should now be loadable from modules, and if a full path (including RAILS_ROOT/ENGINES_ROOT) is given, it should be safely stripped from the require filename such that corresponding files can be located in any active engines. In other words, controller/helper overloading should now completely work, even if the controllers/helpers are in modules.
+
+* Added (finally) patch from Ticket #22 - ActionMailer helpers should now load
+
+* Removed support for Engines.start :engine, :engine_name => 'whatever'. It was pointless.
+
+* Fixed engine name referencing; engine_stylesheet/engine_javascript can now happily use shorthand engine names (i.e. :test == :test_engine) (Ticket #45)
+
+* Fixed minor documentation error ('Engine.start' ==> 'Engines.start') (Ticket #57)
+
+* Fixed double inclusion of RAILS_ROOT in engine_migrate rake task (Ticket #61)
+
+* Added ability to force config values even if given as a hash (Ticket #62)
+
+
+
+= 1.0.5
+
+* Fixed bug stopping fixtures from loading with PostgreSQL
+
+
+
+= 1.0.4
+
+* Another attempt at loading controllers within modules (Ticket #56)
+
+
+
+= 1.0.3
+
+* Fixed serious dependency bug stopping controllers being loaded (Ticket #56)
+
+
+
+= 1.0.2
+
+* Fixed bug with overloading controllers in modules from /app directory
+
+* Fixed exception thrown when public files couldn't be created; exception is now logged (Ticket #52)
+
+* Fixed problem with generated test_helper.rb file via File.expand_path (Ticket #50)
+
+
+
+= 1.0.1
+
+* Added engine generator for creation of new engines
+
+* Fixed 'Engine' typo in README
+
+* Fixed bug in fixtures extensions
+
+* Fixed /lib path management bug
+
+* Added method to determine public directory location from Engine object
+
+* Fixed bug in the error message in get_engine_dir()
+
+* Added proper component loading
+
+* Added preliminary tests for the config() methods module
+
+
+
+= pre-v170
+
+* Fixed copyright notices to point to DHH, rather than me.
+
+* Moved extension require statements into lib/engines.rb, so the will be loaded if another module/file calls require 'engines
+
+* Added a CHANGELOG file (this file)
diff -Nur mephisto-0.7.3/vendor/plugins/engines/MIT-LICENSE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/MIT-LICENSE
--- mephisto-0.7.3/vendor/plugins/engines/MIT-LICENSE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/MIT-LICENSE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+Copyright (c) 2007 James Adam
+
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/README
--- mephisto-0.7.3/vendor/plugins/engines/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,63 @@
+The engines plugin enhances Rails' own plugin framework, making it simple to share controllers, helpers, models, public assets, routes and migrations in plugins.
+
+For more information, see http://rails-engines.org
+
+= Using the plugin
+
+Once you've installed the engines plugin, you'll need to add a single line to the top of config/environment.rb:
+
+  require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
+  
+You should add this line just below the require for Rails' own boot.rb file. This will enabled the enhanced plugin loading mechanism automatically for you (i.e. you don't need to set config.plugin_loader manually).
+
+With that aside, you're now ready to start using more powerful plugins in your application. Read on to find out more about what the engines plugin enables.
+
+
+== Better plugins
+
+In addition to the regular set of plugin-supported files (lib, init.rb, tasks, generators, tests), plugins can carry the following when the engines plugin is also installed.
+
+
+=== Controllers, Helpers, and Views
+
+Include these files in an <tt>app</tt> directory just like you would in a normal Rails application. If you need to override a method, view or partial, create the corresponding file in your main <tt>app</tt> directory and it will be used instead.
+
+* Controllers & Helpers: See Engines::RailsExtensions::Dependencies for more information.
+* Views: See Engines::RailsExtensions::Templates for more information.
+
+=== Models
+
+Model code can similarly be placed in an <tt>app/models/</tt> directory. Unfortunately, it's not possible to automatically override methods within a model; if your application needs to change the way a model behaves, consider creating a subclass, or replacing the model entirely within your application's <tt>app/models/</tt> directory. See Engines::RailsExtensions::Dependencies for more information.
+
+IMPORTANT NOTE: when you load code from within plugins, it is typically not handled well by Rails in terms of unloading and reloading changes. Look here for more information - http://rails-engines.org/development/common-issues-when-overloading-code-from-plugins/
+
+=== Routes
+
+Include your route declarations in a <tt>routes.rb</tt> file at the root of your plugins, e.g.:
+
+  connect "/my/url", :controller => "some_controller"
+  my_named_route "do_stuff", :controller => "blah", :action => "stuff"
+  # etc.
+  
+You can then load these files into your application by declaring their inclusion in the application's <tt>config/routes.rb</tt>:
+
+  map.from_plugin :plugin_name
+
+See Engines::RailsExtensions::Routing for more information.
+  
+=== Migrations
+
+Migrations record the changes in your database as your application evolves. With engines 1.2, migrations from plugins can also join in this evolution as first-class entities. To add migrations to a plugin, include a <tt>db/migrate/</tt> folder and add migrations there as normal. These migrations can then be integrated into the main flow of database evolution by running the plugin_migration generator:
+
+  script/generate plugin_migration
+  
+This will produce a migration in your application. Running this migration (via <tt>rake db:migrate</tt>, as normal) will migrate the database according to the latest migrations in each plugin. See Engines::RailsExtensions::Migrations for more information.
+
+
+=== More powerful Rake tasks
+
+The engines plugin enhances and adds to the suite of default rake tasks for working with plugins. The <tt>doc:plugins</tt> task now includes controllers, helpers and models under <tt>app</tt>, and anything other code found under the plugin's <tt>code_paths</tt> attribute. New testing tasks have been added to run unit, functional and integration tests from plugins, whilst making it easier to load fixtures from plugins. See Engines::Testing for more details about testing, and run
+
+  rake -T
+  
+to see the set of rake tasks available.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/Rakefile
--- mephisto-0.7.3/vendor/plugins/engines/Rakefile	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,32 @@
+require 'rake'
+require 'rake/rdoctask'
+require 'tmpdir'
+
+task :default => :doc
+
+desc 'Generate documentation for the engines plugin.'
+Rake::RDocTask.new(:doc) do |doc|
+  doc.rdoc_dir = 'doc'
+  doc.title    = 'Engines'
+  doc.main     = "README"
+  doc.rdoc_files.include("README", "CHANGELOG", "MIT-LICENSE")
+  doc.rdoc_files.include('lib/**/*.rb')
+  doc.options << '--line-numbers' << '--inline-source'
+end
+
+desc 'Run the engine plugin tests within their test harness'
+task :cruise do
+  # checkout the project into a temporary directory
+  version = "rails_2.0"
+  test_dir = "#{Dir.tmpdir}/engines_plugin_#{version}_test"
+  puts "Checking out test harness for #{version} into #{test_dir}"
+  `svn co http://svn.rails-engines.org/test/engines/#{version} #{test_dir}`
+
+  # run all the tests in this project
+  Dir.chdir(test_dir)
+  load 'Rakefile'
+  puts "Running all tests in test harness"
+  ['db:migrate', 'test', 'test:plugins'].each do |t|
+    Rake::Task[t].invoke
+  end  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/about.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/about.yml
--- mephisto-0.7.3/vendor/plugins/engines/about.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/about.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+author: James Adam
+email: james.adam@gmail.com
+homepage: http://www.rails-engines.org
+summary: Enhances the plugin mechanism to perform more flexible sharing
+description: The Rails Engines plugin allows the sharing of almost any type of code or asset that you could use in a Rails application, including controllers, models, stylesheets, and views.
+license: MIT
+version: 2.0.0-RC1
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/boot.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/boot.rb
--- mephisto-0.7.3/vendor/plugins/engines/boot.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/boot.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+begin
+  require 'rails/version'
+  unless Rails::VERSION::MAJOR >= 2 ||
+         (Rails::VERSION::MAJOR >= 1 && Rails::VERSION::MINOR >= 99)
+    raise "This version of the engines plugin requires Rails 2.0 or later!"
+  end
+end
+
+require File.join(File.dirname(__FILE__), 'lib/engines')
+
+# initialize Rails::Configuration with our own default values to spare users 
+# some hassle with the installation and keep the environment cleaner
+
+{ :default_plugin_locators => [Engines::Plugin::FileSystemLocator],
+  :default_plugin_loader => Engines::Plugin::Loader,
+  :default_plugins => [:engines, :all] }.each do |name, default|    
+  Rails::Configuration.send(:define_method, name) { default }
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/generators/plugin_migration/USAGE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/generators/plugin_migration/USAGE
--- mephisto-0.7.3/vendor/plugins/engines/generators/plugin_migration/USAGE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/generators/plugin_migration/USAGE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,45 @@
+Description:
+  The plugin migration generator assists in working with schema additions 
+  required by plugins. Instead of running migrations from plugins directly,
+  the generator creates a regular Rails migration which will be responsible
+  for migrating the plugins from their current version to the latest version
+  installed.
+  
+  This is important because the set of application migrations remains an
+  accurate record of the state of the database, even as plugins are installed
+  and removed during the development process.
+
+Example:
+  ./script/generate plugin_migration [<plugin_name> <another_plugin_name> ...]
+
+  This will generate:
+
+    RAILS_ROOT
+      |- db
+          |-migrate
+              |- xxx_plugin_migrations.rb
+
+  which contains the migrations for the given plugin(s).
+  
+  
+Advanced Usage:
+
+There may be situations where you need *complete* control over the migrations
+of plugins in your application, migrating a certainly plugin down to X, and
+another plugin up to Y, where neither X or Y are the latest migrations for those
+plugins.
+
+For those unfortunate few, I have two pieces of advice:
+
+ 1. Why? This is a code smell [http://c2.com/xp/CodeSmell.html].
+ 
+ 2. Well, OK. Don't panic. You can completely control plugin migrations by
+    creating your own migrations. To manually migrate a plugin to a specific
+    version, simply use
+    
+      Engines.plugins[:your_plugin_name].migrate(version)
+      
+    where version is the integer of the migration this plugin should end
+    up at.
+    
+With great power comes great responsibility. Use this wisely.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
--- mephisto-0.7.3/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,79 @@
+# Generates a migration which migrates all plugins to their latest versions
+# within the database.
+class PluginMigrationGenerator < Rails::Generator::Base
+  
+  def initialize(runtime_args, runtime_options={})
+    super
+    @options = {:assigns => {}}
+    
+    ensure_plugin_schema_table_exists
+    get_plugins_to_migrate(runtime_args)
+    
+    if @plugins_to_migrate.empty?
+      puts "All plugins are migrated to their latest versions"
+      exit(0)
+    end
+
+    @options[:migration_file_name] = build_migration_name
+    @options[:assigns][:class_name] = build_migration_name.classify
+  end
+  
+  def manifest
+    record do |m|
+      m.migration_template 'plugin_migration.erb', 'db/migrate', @options
+    end
+  end
+  
+  protected
+  
+    # Create the plugin schema table if it doesn't already exist. See
+    # Engines::RailsExtensions::Migrations#initialize_schema_information_with_engine_additions
+    def ensure_plugin_schema_table_exists
+      ActiveRecord::Base.connection.initialize_schema_information
+    end
+
+    # Determine all the plugins which have migrations that aren't present
+    # according to the plugin schema information from the database.
+    def get_plugins_to_migrate(plugin_names)
+
+      # First, grab all the plugins which exist and have migrations
+      @plugins_to_migrate = if plugin_names.empty?
+        Engines.plugins
+      else
+        plugin_names.map do |name| 
+          Engines.plugins[name] ? Engines.plugins[name] : raise("Cannot find the plugin '#{name}'")
+        end
+      end
+      
+      @plugins_to_migrate.reject! { |p| p.latest_migration.nil? }
+      
+      # Then find the current versions from the database    
+      @current_versions = {}
+      @plugins_to_migrate.each do |plugin|
+        @current_versions[plugin.name] = Engines::Plugin::Migrator.current_version(plugin)
+      end
+
+      # Then find the latest versions from their migration directories
+      @new_versions = {}      
+      @plugins_to_migrate.each do |plugin|
+        @new_versions[plugin.name] = plugin.latest_migration
+      end
+      
+      # Remove any plugins that don't need migration
+      @plugins_to_migrate.map { |p| p.name }.each do |name|
+        @plugins_to_migrate.delete(Engines.plugins[name]) if @current_versions[name] == @new_versions[name]
+      end
+      
+      @options[:assigns][:plugins] = @plugins_to_migrate
+      @options[:assigns][:new_versions] = @new_versions
+      @options[:assigns][:current_versions] = @current_versions
+    end
+
+    # Construct a unique migration name based on the plugins involved and the
+    # versions they should reach after this migration is run.
+    def build_migration_name
+      @plugins_to_migrate.map do |plugin| 
+        "#{plugin.name}_to_version_#{@new_versions[plugin.name]}" 
+      end.join("_and_")
+    end  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb
--- mephisto-0.7.3/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+class <%= class_name %> < ActiveRecord::Migration
+  def self.up
+  <%- plugins.each do |plugin| -%>
+    Engines.plugins["<%= plugin.name %>"].migrate(<%= new_versions[plugin.name] %>)
+  <%- end -%>
+  end
+
+  def self.down
+  <%- plugins.each do |plugin| -%>
+    Engines.plugins["<%= plugin.name %>"].migrate(<%= current_versions[plugin.name] %>)
+  <%- end -%>
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/engines/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/init.rb
--- mephisto-0.7.3/vendor/plugins/engines/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+Engines.init if defined? :Engines
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/assets.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/assets.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/assets.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/assets.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,38 @@
+module Engines
+  module Assets    
+    class << self      
+      @@readme = %{Files in this directory are automatically generated from your plugins.
+They are copied from the 'assets' directories of each plugin into this directory
+each time Rails starts (script/server, script/console... and so on).
+Any edits you make will NOT persist across the next server restart; instead you
+should edit the files within the <plugin_name>/assets/ directory itself.}     
+       
+      # Ensure that the plugin asset subdirectory of RAILS_ROOT/public exists, and
+      # that we've added a little warning message to instruct developers not to mess with
+      # the files inside, since they're automatically generated.
+      def initialize_base_public_directory
+        dir = Engines.public_directory
+        unless File.exist?(dir)
+          Engines.logger.debug "Creating public engine files directory '#{dir}'"
+          FileUtils.mkdir(dir)
+        end
+        readme = File.join(dir, "README")        
+        File.open(readme, 'w') { |f| f.puts @@readme } unless File.exist?(readme)
+      end
+    
+      # Replicates the subdirectories under the plugins's +assets+ (or +public+) 
+      # directory into the corresponding public directory. See also 
+      # Plugin#public_directory for more.
+      def mirror_files_for(plugin)
+        return if plugin.public_directory.nil?
+        begin 
+          Engines.logger.debug "Attempting to copy plugin assets from '#{plugin.public_directory}' to '#{Engines.public_directory}'"
+          Engines.mirror_files_from(plugin.public_directory, File.join(Engines.public_directory, plugin.name))      
+        rescue Exception => e
+          Engines.logger.warn "WARNING: Couldn't create the public file structure for plugin '#{plugin.name}'; Error follows:"
+          Engines.logger.warn e
+        end
+      end
+    end 
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/list.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/list.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/list.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/list.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,30 @@
+# The PluginList class is an array, enhanced to allow access to loaded plugins
+# by name, and iteration over loaded plugins in order of priority. This array is used
+# by Engines::RailsExtensions::RailsInitializer to create the Engines.plugins array.
+#
+# Each loaded plugin has a corresponding Plugin instance within this array, and 
+# the order the plugins were loaded is reflected in the entries in this array.
+#
+# For more information, see the Rails module.
+module Engines
+  class Plugin
+    class List < Array
+      # Finds plugins with the set with the given name (accepts Strings or Symbols), or
+      # index. So, Engines.plugins[0] returns the first-loaded Plugin, and Engines.plugins[:engines]
+      # returns the Plugin instance for the engines plugin itself.
+      def [](name_or_index)
+        if name_or_index.is_a?(Fixnum)
+          super
+        else
+          self.find { |plugin| plugin.name.to_s == name_or_index.to_s }
+        end
+      end
+  
+      # Go through each plugin, highest priority first (last loaded first). Effectively,
+      # this is like <tt>Engines.plugins.reverse</tt>
+      def by_precedence
+        reverse
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/loader.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/loader.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/loader.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/loader.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+module Engines
+  class Plugin
+    class Loader < Rails::Plugin::Loader    
+      protected    
+        def register_plugin_as_loaded(plugin)
+          super plugin
+          Engines.plugins << plugin
+          register_to_routing(plugin)
+        end    
+        
+        # Registers the plugin's controller_paths for the routing system. 
+        def register_to_routing(plugin)
+          initializer.configuration.controller_paths += plugin.select_existing_paths(:controller_paths)
+          initializer.configuration.controller_paths.uniq!
+        end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/locator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/locator.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/locator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/locator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+module Engines
+  class Plugin
+    class FileSystemLocator < Rails::Plugin::FileSystemLocator
+      def create_plugin(path)
+        plugin = Engines::Plugin.new(path)
+        plugin.valid? ? plugin : nil
+      end        
+    end
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/migrator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/migrator.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin/migrator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin/migrator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,60 @@
+# The Plugin::Migrator class contains the logic to run migrations from
+# within plugin directories. The directory in which a plugin's migrations
+# should be is determined by the Plugin#migration_directory method.
+#
+# To migrate a plugin, you can simple call the migrate method (Plugin#migrate)
+# with the version number that plugin should be at. The plugin's migrations
+# will then be used to migrate up (or down) to the given version.
+#
+# For more information, see Engines::RailsExtensions::Migrations
+class Engines::Plugin::Migrator < ActiveRecord::Migrator
+
+  # We need to be able to set the 'current' engine being migrated.
+  cattr_accessor :current_plugin
+
+  # Runs the migrations from a plugin, up (or down) to the version given
+  def self.migrate_plugin(plugin, version)
+    self.current_plugin = plugin
+    migrate(plugin.migration_directory, version)
+  end
+  
+  # Returns the name of the table used to store schema information about
+  # installed plugins.
+  #
+  # See Engines.schema_info_table for more details.
+  def self.schema_info_table_name
+    ActiveRecord::Base.wrapped_table_name Engines.schema_info_table
+  end
+
+  # Returns the current version of the given plugin
+  def self.current_version(plugin=current_plugin)
+    result = ActiveRecord::Base.connection.select_one(<<-ESQL
+      SELECT version FROM #{schema_info_table_name} 
+      WHERE plugin_name = '#{plugin.name}'
+    ESQL
+    )
+    if result
+      result["version"].to_i
+    else
+      # There probably isn't an entry for this engine in the migration info table.
+      # We need to create that entry, and set the version to 0
+      ActiveRecord::Base.connection.execute(<<-ESQL
+        INSERT INTO #{schema_info_table_name} (version, plugin_name) 
+        VALUES (0,'#{plugin.name}')
+      ESQL
+      )      
+      0
+    end
+  end
+
+  # Sets the version of the plugin in Engines::Plugin::Migrator.current_plugin to
+  # the given version.
+  def set_schema_version(version)
+    ActiveRecord::Base.connection.update(<<-ESQL
+      UPDATE #{self.class.schema_info_table_name} 
+      SET version = #{down? ? version.to_i - 1 : version.to_i} 
+      WHERE plugin_name = '#{self.current_plugin.name}'
+    ESQL
+    )
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/plugin.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/plugin.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,125 @@
+# An instance of Plugin is created for each plugin loaded by Rails, and
+# stored in the <tt>Engines.plugins</tt> PluginList 
+# (see Engines::RailsExtensions::RailsInitializer for more details).
+#
+#   Engines.plugins[:plugin_name]
+#
+# If this plugin contains paths in directories other than <tt>app/controllers</tt>,
+# <tt>app/helpers</tt>, <tt>app/models</tt> and <tt>components</tt>, authors can
+# declare this by adding extra paths to #code_paths:
+#
+#    Rails.plugin[:my_plugin].code_paths << "app/sweepers" << "vendor/my_lib"
+#
+# Other properties of the Plugin instance can also be set.
+module Engines
+  class Plugin < Rails::Plugin    
+    # Plugins can add code paths to this attribute in init.rb if they 
+    # need plugin directories to be added to the load path, i.e.
+    #
+    #   plugin.code_paths << 'app/other_classes'
+    #
+    # Defaults to ["app/controllers", "app/helpers", "app/models", "components"]
+    attr_accessor :code_paths
+
+    # Plugins can add paths to this attribute in init.rb if they need
+    # controllers loaded from additional locations. 
+    attr_accessor :controller_paths
+  
+    # The directory in this plugin to mirror into the shared directory
+    # under +public+.
+    #
+    # Defaults to "assets" (see default_public_directory).
+    attr_accessor :public_directory   
+    
+    protected
+  
+      # The default set of code paths which will be added to $LOAD_PATH
+      # and Dependencies.load_paths
+      def default_code_paths
+        # lib will actually be removed from the load paths when we call
+        # uniq! in #inject_into_load_paths, but it's important to keep it
+        # around (for the documentation tasks, for instance).
+        %w(app/controllers app/helpers app/models components lib)
+      end
+    
+      # The default set of code paths which will be added to the routing system
+      def default_controller_paths
+        %w(app/controllers components)
+      end
+
+      # Attempts to detect the directory to use for public files.
+      # If +assets+ exists in the plugin, this will be used. If +assets+ is missing
+      # but +public+ is found, +public+ will be used.
+      def default_public_directory
+        Engines.select_existing_paths(%w(assets public).map { |p| File.join(directory, p) }).first
+      end
+    
+    public
+  
+    def initialize(directory)
+      super directory
+      @code_paths = default_code_paths
+      @controller_paths = default_controller_paths
+      @public_directory = default_public_directory
+    end
+  
+    # Returns a list of paths this plugin wishes to make available in $LOAD_PATH
+    #
+    # Overwrites the correspondend method in the superclass  
+    def load_paths
+      report_nonexistant_or_empty_plugin! unless valid?
+      select_existing_paths :code_paths
+    end
+    
+    # Extends the superclass' load method to additionally mirror public assets
+    def load(initializer)
+      return if loaded?
+      super initializer
+      add_plugin_view_paths
+      Assets.mirror_files_for(self)
+    end    
+  
+    # for code_paths and controller_paths select those paths that actually 
+    # exist in the plugin's directory
+    def select_existing_paths(name)
+      Engines.select_existing_paths(self.send(name).map { |p| File.join(directory, p) })
+    end    
+
+    def add_plugin_view_paths
+      view_path = File.join(directory, 'app', 'views')
+      if File.exist?(view_path)
+        ActionController::Base.view_paths.insert(1, view_path) # push it just underneath the app
+      end
+    end
+
+    # The path to this plugin's public files
+    def public_asset_directory
+      "#{File.basename(Engines.public_directory)}/#{name}"
+    end
+    
+    # The path to this plugin's routes file
+    def routes_path
+      File.join(directory, "routes.rb")
+    end
+
+    # The directory containing this plugin's migrations (<tt>plugin/db/migrate</tt>)
+    def migration_directory
+      File.join(self.directory, 'db', 'migrate')
+    end
+  
+    # Returns the version number of the latest migration for this plugin. Returns
+    # nil if this plugin has no migrations.
+    def latest_migration
+      migrations = Dir[migration_directory+"/*.rb"]
+      return nil if migrations.empty?
+      migrations.map { |p| File.basename(p) }.sort.last.match(/0*(\d+)\_/)[1].to_i
+    end
+  
+    # Migrate this plugin to the given version. See Engines::Plugin::Migrator for more
+    # information.   
+    def migrate(version = nil)
+      Engines::Plugin::Migrator.migrate_plugin(self, version)
+    end
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,85 @@
+# The way ActionMailer is coded in terms of finding templates is very restrictive, to the point
+# where all templates for rendering must exist under the single base path. This is difficult to
+# work around without re-coding significant parts of the action mailer code.
+#
+# ---
+#
+# The MailTemplates module overrides two (private) methods from ActionMailer to enable mail 
+# templates within plugins:
+#
+# [+template_path+]             which now produces the contents of #template_paths
+# [+initialize_template_class+] which now find the first matching template and creates 
+#                               an ActionVew::Base instance with the correct view_paths
+#
+# Ideally ActionMailer would use the same template-location logic as ActionView, and the same
+# view paths as ActionController::Base.view_paths, but it currently does not.
+module Engines::RailsExtensions::ActionMailer
+  def self.included(base) #:nodoc:
+    base.class_eval do
+      # TODO commented this out because it seems to break ActionMailer
+      # how can this be fixed?
+      
+      alias_method_chain :template_path, :engine_additions
+      alias_method_chain :initialize_template_class, :engine_additions
+    end
+  end
+
+  private
+  
+    #--
+    # ActionMailer::Base#create uses two mechanisms to determine the proper template file(s)
+    # to load. Firstly, it searches within the template_root for files that much the explicit
+    # (or implicit) part encodings (like signup.text.plain.erb for the signup action). 
+    # This is how implicit multipart emails are built, by the way.
+    #
+    # Secondly, it then creates an ActionMailer::Base instance with it's view_paths parameter
+    # set to the template_root, so that ActionMailer will then take over rendering the
+    # templates.
+    #
+    # Ideally, ActionMailer would pass the same set of view paths as it gets in a normal
+    # request (i.e. ActionController::Base.view_paths), so that all possible view paths
+    # were searched. However, this seems to introduce some problems with helper modules.
+    #
+    # So instead, and because we have to fool these two independent parts of ActionMailer,
+    # we fudge with the mechanisms it uses to find the templates (via template_paths, and
+    # template_path_with_engine_additions), and then intercept the creation of the ActionView
+    # instance so we can set the view_paths (in initialize_template_class_with_engine_additions).
+    #++
+  
+    # Returns all possible template paths for the current mailer, including those
+    # within the loaded plugins.
+    def template_paths
+      paths = Engines.plugins.by_precedence.map { |p| "#{p.directory}/app/views/#{mailer_name}" }
+      paths.unshift(template_path_without_engine_additions) unless Engines.disable_application_view_loading
+      paths
+    end
+
+    # Return something that Dir[] can glob against. This method is called in 
+    # ActionMailer::Base#create! and used as part of an argument to Dir. We can
+    # take advantage of this by using some of the features of Dir.glob to search
+    # multiple paths for matching files.
+    def template_path_with_engine_additions
+      "{#{template_paths.join(",")}}"
+    end
+
+    # Return an instance of ActionView::Base with the view paths set to all paths
+    # in ActionController::Base.view_paths (i.e. including all plugin view paths)
+    def initialize_template_class_with_engine_additions(assigns)
+      # I'd like to just return this, but I get problems finding methods in helper
+      # modules if the method implemention from the regular class is not called
+      # 
+      # ActionView::Base.new(ActionController::Base.view_paths.dup, assigns, self)
+      renderer = initialize_template_class_without_engine_additions(assigns)
+      renderer.view_paths = ActionController::Base.view_paths.dup
+      renderer
+    end
+end
+
+# We don't need to do this if ActionMailer hasn't been loaded.
+if Object.const_defined?(:ActionMailer) 
+  module ::ActionMailer #:nodoc:
+    class Base #:nodoc:
+      include Engines::RailsExtensions::ActionMailer
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/active_record.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/active_record.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/active_record.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/active_record.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,24 @@
+# Here we add a single helpful method to ActiveRecord::Base. This method may be deprecated
+# in the future, since support for the Module#config mechanism which required it has
+# also been dropped.
+module Engines::RailsExtensions::ActiveRecord
+  # NOTE: Currently the Migrations system will ALWAYS wrap given table names
+  # in the prefix/suffix, so any table name set via ActiveRecord::Base#set_table_name, 
+  # for instance will always get wrapped in the process of migration. For this 
+  # reason, whatever value you give to the config will be wrapped when set_table_name 
+  # is used in the model.
+  #
+  # This method is useful for determining the actual name (including prefix and 
+  # suffix) that Rails will use for a model, given a particular set_table_name
+  # parameter.
+  def wrapped_table_name(name)
+    table_name_prefix + name + table_name_suffix
+  end
+  
+end
+
+module ::ActiveRecord #:nodoc:
+  class Base #:nodoc:
+    extend Engines::RailsExtensions::ActiveRecord
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,119 @@
+# The engines plugin makes it trivial to share public assets using plugins. 
+# To do this, include an <tt>assets</tt> directory within your plugin, and put
+# your javascripts, stylesheets and images in subdirectories of that folder:
+#
+#   my_plugin
+#     |- init.rb
+#     |- lib/
+#     |- assets/
+#          |- javascripts/
+#          |    |- my_functions.js
+#          |
+#          |- stylesheets/
+#          |    |- my_styles.css
+#          |
+#          |- images/
+#               |- my_face.jpg
+#
+# Files within the <tt>asset</tt> structure are automatically mirrored into
+# a publicly-accessible folder each time your application starts (see
+# Engines::Assets#mirror_assets).
+#
+#
+# == Using plugin assets in views
+#
+# It's also simple to use Rails' helpers in your views to use plugin assets.
+# The default helper methods have been enhanced by the engines plugin to accept
+# a <tt>:plugin</tt> option, indicating the plugin containing the desired asset.
+#
+# For example, it's easy to use plugin assets in your layouts:
+#
+#   <%= stylesheet_link_tag "my_styles", :plugin => "my_plugin", :media => "screen" %>
+#   <%= javascript_include_tag "my_functions", :plugin => "my_plugin" %>
+# 
+# ... and similarly in views and partials, it's easy to use plugin images:
+#
+#   <%= image_tag "my_face", :plugin => "my_plugin" %>
+#   <!-- or -->
+#   <%= image_path "my_face", :plugin => "my_plugin" %>
+#
+# Where the default helpers allow the specification of more than one file (i.e. the
+# javascript and stylesheet helpers), you can do similarly for multiple assets from 
+# within a single plugin.
+#
+# ---
+#
+# This module enhances four of the methods from ActionView::Helpers::AssetTagHelper:
+#
+#  * stylesheet_link_tag
+#  * javascript_include_tag
+#  * image_path
+#  * image_tag
+#
+# Each one of these methods now accepts the key/value pair <tt>:plugin => "plugin_name"</tt>,
+# which can be used to specify the originating plugin for any assets.
+#
+module Engines::RailsExtensions::AssetHelpers
+  def self.included(base) #:nodoc:
+    base.class_eval do
+      [:stylesheet_link_tag, :javascript_include_tag, :image_path, :image_tag].each do |m|
+        alias_method_chain m, :engine_additions
+      end
+    end
+  end
+
+  # Adds plugin functionality to Rails' default stylesheet_link_tag method.
+  def stylesheet_link_tag_with_engine_additions(*sources)
+    stylesheet_link_tag_without_engine_additions(*Engines::RailsExtensions::AssetHelpers.pluginify_sources("stylesheets", *sources))
+  end
+
+  # Adds plugin functionality to Rails' default javascript_include_tag method.  
+  def javascript_include_tag_with_engine_additions(*sources)
+    javascript_include_tag_without_engine_additions(*Engines::RailsExtensions::AssetHelpers.pluginify_sources("javascripts", *sources))
+  end
+
+  #--
+  # Our modified image_path now takes a 'plugin' option, though it doesn't require it
+  #++
+
+  # Adds plugin functionality to Rails' default image_path method.
+  def image_path_with_engine_additions(source, options={})
+    options.stringify_keys!
+    source = Engines::RailsExtensions::AssetHelpers.plugin_asset_path(options["plugin"], "images", source) if options["plugin"]
+    image_path_without_engine_additions(source)
+  end
+
+  # Adds plugin functionality to Rails' default image_tag method.
+  def image_tag_with_engine_additions(source, options={})
+    options.stringify_keys!
+    if options["plugin"]
+      source = Engines::RailsExtensions::AssetHelpers.plugin_asset_path(options["plugin"], "images", source)
+      options.delete("plugin")
+    end
+    image_tag_without_engine_additions(source, options)
+  end
+
+  #--
+  # The following are methods on this module directly because of the weird-freaky way
+  # Rails creates the helper instance that views actually get
+  #++
+
+  # Convert sources to the paths for the given plugin, if any plugin option is given
+  def self.pluginify_sources(type, *sources)
+    options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
+    sources.map! { |s| plugin_asset_path(options["plugin"], type, s) } if options["plugin"]
+    options.delete("plugin") # we don't want it appearing in the HTML
+    sources << options # re-add options      
+  end  
+
+  # Returns the publicly-addressable relative URI for the given asset, type and plugin
+  def self.plugin_asset_path(plugin_name, type, asset)
+    raise "No plugin called '#{plugin_name}' - please use the full name of a loaded plugin." if Engines.plugins[plugin_name].nil?
+    "/#{Engines.plugins[plugin_name].public_asset_directory}/#{type}/#{asset}"
+  end
+  
+end
+
+module ::ActionView::Helpers::AssetTagHelper #:nodoc:
+  include Engines::RailsExtensions::AssetHelpers
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,145 @@
+# One of the magic features that that engines plugin provides is the ability to
+# override selected methods in controllers and helpers from your application.
+# This is achieved by trapping requests to load those files, and then mixing in
+# code from plugins (in the order the plugins were loaded) before finally loading
+# any versions from the main +app+ directory.
+#
+# The behaviour of this extension is output to the log file for help when
+# debugging.
+#
+# == Example
+#
+# A plugin contains the following controller in <tt>plugin/app/controllers/my_controller.rb</tt>:
+#
+#   class MyController < ApplicationController
+#     def index
+#       @name = "HAL 9000"
+#     end
+#     def list
+#       @robots = Robot.find(:all)
+#     end
+#   end
+#
+# In one application that uses this plugin, we decide that the name used in the
+# index action should be "Robbie", not "HAL 9000". To override this single method,
+# we create the corresponding controller in our application 
+# (<tt>RAILS_ROOT/app/controllers/my_controller.rb</tt>), and redefine the method:
+#
+#   class MyController < ApplicationController
+#     def index
+#       @name = "Robbie"
+#     end
+#   end
+#
+# The list method remains as it was defined in the plugin controller.
+#
+# The same basic principle applies to helpers, and also views and partials (although
+# view overriding is performed in Engines::RailsExtensions::Templates; see that
+# module for more information).
+#
+# === What about models?
+#
+# Unfortunately, it's not possible to provide this kind of magic for models.
+# The only reason why it's possible for controllers and helpers is because
+# they can be recognised by their filenames ("whatever_controller", "jazz_helper"),
+# whereas models appear the same as any other typical Ruby library ("node",
+# "user", "image", etc.). 
+#
+# If mixing were allowed in models, it would mean code mixing for *every* 
+# file that was loaded via +require_or_load+, and this could result in
+# problems where, for example, a Node model might start to include 
+# functionality from another file called "node" somewhere else in the
+# <tt>$LOAD_PATH</tt>.
+#
+# One way to overcome this is to provide model functionality as a module in
+# a plugin, which developers can then include into their own model
+# implementations.
+#
+# Another option is to provide an abstract model (see the ActiveRecord::Base
+# documentation) and have developers subclass this model in their own
+# application if they must.
+#
+# ---
+#
+# The Engines::RailsExtensions::Dependencies module includes a method to
+# override Dependencies.require_or_load, which is called to load code needed
+# by Rails as it encounters constants that aren't defined.
+#
+# This method is enhanced with the code-mixing features described above.
+#
+module Engines::RailsExtensions::Dependencies
+  def self.included(base) #:nodoc:
+    base.class_eval { alias_method_chain :require_or_load, :engine_additions }
+  end
+
+  # Attempt to load the given file from any plugins, as well as the application.
+  # This performs the 'code mixing' magic, allowing application controllers and
+  # helpers to override single methods from those in plugins.
+  # If the file can be found in any plugins, it will be loaded first from those
+  # locations. Finally, the application version is loaded, using Ruby's behaviour
+  # to replace existing methods with their new definitions.
+  #
+  # If <tt>Engines.disable_code_mixing == true</tt>, the first controller/helper on the
+  # <tt>$LOAD_PATH</tt> will be used (plugins' +app+ directories are always lower on the
+  # <tt>$LOAD_PATH</tt> than the main +app+ directory).
+  #
+  # If <tt>Engines.disable_application_code_loading == true</tt>, controllers will
+  # not be loaded from the main +app+ directory *if* they are present in any
+  # plugins.
+  #
+  # Returns true if the file could be loaded (from anywhere); false otherwise -
+  # mirroring the behaviour of +require_or_load+ from Rails (which mirrors
+  # that of Ruby's own +require+, I believe).
+  def require_or_load_with_engine_additions(file_name, const_path=nil)
+    return require_or_load_without_engine_additions(file_name, const_path) if Engines.disable_code_mixing
+
+    file_loaded = false
+
+    # try and load the plugin code first
+    # can't use model, as there's nothing in the name to indicate that the file is a 'model' file
+    # rather than a library or anything else.
+    Engines.code_mixing_file_types.each do |file_type| 
+      # if we recognise this type
+      # (this regexp splits out the module/filename from any instances of app/#{type}, so that
+      #  modules are still respected.)
+      if file_name =~ /^(.*app\/#{file_type}s\/)?(.*_#{file_type})(\.rb)?$/
+        base_name = $2
+        # ... go through the plugins from first started to last, so that
+        # code with a high precedence (started later) will override lower precedence
+        # implementations
+        Engines.plugins.each do |plugin|
+          plugin_file_name = File.expand_path(File.join(plugin.directory, 'app', "#{file_type}s", base_name))
+          Engines.logger.debug("checking plugin '#{plugin.name}' for '#{base_name}'")
+          if File.file?("#{plugin_file_name}.rb")
+            Engines.logger.debug("==> loading from plugin '#{plugin.name}'")
+            file_loaded = true if require_or_load_without_engine_additions(plugin_file_name, const_path)
+          end
+        end
+    
+        # finally, load any application-specific controller classes using the 'proper'
+        # rails load mechanism, EXCEPT when we're testing engines and could load this file
+        # from an engine
+        if Engines.disable_application_code_loading
+          Engines.logger.debug("loading from application disabled.")
+        else
+          # Ensure we are only loading from the /app directory at this point
+          app_file_name = File.join(RAILS_ROOT, 'app', "#{file_type}s", "#{base_name}")
+          if File.file?("#{app_file_name}.rb")
+            Engines.logger.debug("loading from application: #{base_name}")
+            file_loaded = true if require_or_load_without_engine_additions(app_file_name, const_path)
+          else
+            Engines.logger.debug("(file not found in application)")
+          end
+        end        
+      end 
+    end
+
+    # if we managed to load a file, return true. If not, default to the original method.
+    # Note that this relies on the RHS of a boolean || not to be evaluated if the LHS is true.
+    file_loaded || require_or_load_without_engine_additions(file_name, const_path)
+  end  
+end
+
+module ::Dependencies #:nodoc:
+  include Engines::RailsExtensions::Dependencies
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,161 @@
+# Contains the enhancements to Rails' migrations system to support the 
+# Engines::Plugin::Migrator. See Engines::RailsExtensions::Migrations for more
+# information.
+
+require "engines/plugin/migrator"
+
+# = Plugins and Migrations: Background
+#
+# Rails uses migrations to describe changes to the databases as your application
+# evolves. Each change to your application - adding and removing models, most
+# commonly - might require tweaks to your schema in the form of new tables, or new
+# columns on existing tables, or possibly the removal of tables or columns. Migrations
+# can even include arbitrary code to *transform* data as the underlying schema
+# changes.
+# 
+# The point is that at any particular stage in your application's development, 
+# migrations serve to transform the database into a state where it is compatible
+# and appropriate at that time.
+# 
+# == What about plugins?
+# 
+# If you want to share models using plugins, chances are that you might also
+# want to include the corresponding migrations to create tables for those models.
+# With the engines plugin installed, plugins can carry migration data easily:
+# 
+#   vendor/
+#     |
+#     plugins/
+#       |
+#       my_plugin/
+#         |- init.rb
+#         |- lib/
+#         |- db/
+#             |-migrate/
+#                 |- 001_do_something.rb
+#                 |- 002_and_something_else.rb
+#                 |- ...
+# 
+# When you install a plugin which contains migrations, you are undertaking a
+# further step in the development of your application, the same as the addition
+# of any other code. With this in mind, you may want to 'roll back' the
+# installation of this plugin at some point, and the database should be able
+# to migrate back to the point without this plugin in it too.
+#
+# == An example
+#
+# For example, our current application is at version 14 (according to the
+# +schema_info+ table), when we decide that we want to add a tagging plugin. The
+# tagging plugin chosen includes migrations to create the tables it requires
+# (say, _tags_ and _taggings_, for instance), along with the models and helpers
+# one might expect.
+#
+# After installing this plugin, these tables should be created in our database.
+# Rather than running the migrations directly from the plugin, they should be
+# integrated into our main migration stream in order to accurately reflect the
+# state of our application's database *at this moment in time*.
+#
+#   $ script/generate plugin_migration
+#         exists  db/migrate
+#         create  db/migrate/015_migrate_tagging_plugin_to_version_3.rb
+#
+# This migration will take our application to version 15, and contains the following, 
+# typical migration code:
+# 
+#   class MigrateTaggingPluginToVersion3 < ActiveRecord::Migration
+#     def self.up
+#       Engines.plugins[:tagging].migrate(3)
+#     end
+#     def self.down
+#       Engines.plugins[:tagging].migrate(0)
+#     end
+#   end
+#
+# When we migrate our application up, using <tt>rake db:migrate</tt> as normal,
+# the plugin will be migrated up to its latest version (3 in this example). If we
+# ever decide to migrate the application back to the state it was in at version 14,
+# the plugin migrations will be taken back down to version 0 (which, typically,
+# would remove all tables the plugin migrations define).
+#
+# == Upgrading plugins
+#
+# It might happen that later in an application's life, we update to a new version of
+# the tagging plugin which requires some changes to our database. The tagging plugin
+# provides these changes in the form of its own migrations. 
+#
+# In this case, we just need to re-run the plugin_migration generator to create a 
+# new migration from the current revision to the newest one:
+#
+#   $ script/generate plugin_migration
+#        exists db/migrate
+#        create db/migrate/023_migrate_tagging_plugin_to_version_5.rb
+#
+# The contents of this migration are:
+#
+#   class MigrateTaggingPluginToVersion3 < ActiveRecord::Migration
+#     def self.up
+#       Engines.plugins[:tagging].migrate(5)
+#     end
+#     def self.down
+#       Engines.plugins[:tagging].migrate(3)
+#     end
+#   end
+#
+# Notice that if we were to migrate down to revision 22 or lower, the tagging plugin
+# will be migrated back down to version 3 - the version we were previously at.
+#
+#
+# = Creating migrations in plugins
+#
+# In order to use the plugin migration functionality that engines provides, a plugin 
+# only needs to provide regular migrations in a <tt>db/migrate</tt> folder within it.
+#
+# = Explicitly migrating plugins
+#
+# It's possible to migrate plugins within your own migrations, or any other code.
+# Simply get the Plugin instance, and its Plugin#migrate method with the version
+# you wish to end up at:
+#
+#   Engines.plugins[:whatever].migrate(version)
+#
+# ---
+#
+# The Engines::RailsExtensions::Migrations module defines extensions for Rails' 
+# migration systems. Specifically:
+#
+# * Adding a hook to initialize_schema_information to create the plugin schema
+#   info table.
+#
+module Engines::RailsExtensions::Migrations
+  def self.included(base) # :nodoc:
+    base.class_eval { alias_method_chain :initialize_schema_information, :engine_additions }
+  end
+
+  # Create the schema tables, and ensure that the plugin schema table
+  # is also initialized. The plugin schema info table is defined by
+  # Engines::Plugin::Migrator.schema_info_table_name.
+  def initialize_schema_information_with_engine_additions
+    initialize_schema_information_without_engine_additions
+
+    # create the plugin schema stuff.    
+    begin
+      execute <<-ESQL
+        CREATE TABLE #{Engines::Plugin::Migrator.schema_info_table_name} 
+          (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})
+      ESQL
+    rescue ActiveRecord::StatementInvalid
+      # Schema has been initialized
+    end
+  end
+end
+
+module ::ActiveRecord #:nodoc:
+  module ConnectionAdapters #:nodoc:
+    module SchemaStatements #:nodoc:
+      include Engines::RailsExtensions::Migrations
+    end
+  end
+end
+
+# Set ActiveRecord to ignore the plugin schema table by default
+::ActiveRecord::SchemaDumper.ignore_tables << Engines.schema_info_table
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/rails.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/rails.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/rails.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/rails.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+# This is only here to allow for backwards compability with Engines that
+# have been implemented based on Engines for Rails 1.2. It is preferred that
+# the plugin list be accessed via Engines.plugins.
+
+module Rails
+  # Returns the Engines::Plugin::List from Engines.plugins. It is preferable to
+  # access Engines.plugins directly.
+  def self.plugins
+    Engines.plugins
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/routing.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/routing.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/rails_extensions/routing.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/rails_extensions/routing.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,84 @@
+# Effective use of Rails' routes can help create a tidy and elegant set of URLs,
+# and is a significant part of creating an external API for your web application.
+# 
+# When developing plugins which contain controllers, it seems obvious that including
+# the corresponding routes would be extremely useful. This is particularly true
+# when exposing RESTful resources using the new REST-ian features of Rails.
+#
+# == Including routes in your plugin
+#
+# The engines plugin makes it possible to include a set of routes within your plugin
+# very simply, as it turns out. In your plugin, you simply include a <tt>routes.rb</tt> 
+# file like the one below at the root of your plugin:
+# 
+#   connect "/login", :controller => "my_plugin/account", :action => "login"
+#
+#   # add a named route
+#   logout "/logout", :controller => "my_plugin/account", :action => "logout"
+#
+#   # some restful stuff
+#   resources :things do |t|
+#     t.resources :other_things
+#   end
+# 
+# Everywhere in a normal <tt>RAILS_ROOT/config/routes.rb</tt> file 
+# where you might have <tt>map.connect</tt>, you just use <tt>connect</tt> in your 
+# plugin's <tt>routes.rb</tt>.
+# 
+# === Hooking it up in your application
+#
+# While it would be possible to have each plugin's routes automagically included into
+# the application's route set, to do so would actually be a stunningly bad idea. Route
+# priority is the key issue here. You, the application developer, needs to be in complete
+# control when it comes to specifying the priority of routes in your application, since 
+# the ordering of your routes directly affects how Rails will interpret incoming requests.
+# 
+# To add plugin routes into your application's <tt>routes.rb</tt> file, you need to explicitly 
+# map them in using the Engines::RailsExtensions::Routing#from_plugin method:
+# 
+#   ApplicationController::Routing::Routes.draw do |map|
+#
+#     map.connect "/app_stuff", :controller => "application_thing" # etc...
+#
+#     # This line includes the routes from the given plugin at this point, giving you
+#     # control over the priority of your application routes 
+#     map.from_plugin :your_plugin
+#
+#     map.connect ":controller/:action/:id"
+#   end
+# 
+# By including routes in plugins which have controllers, you can now share in a simple way 
+# a compact and elegant URL scheme which corresponds to those controllers.
+#
+# ---
+#
+# The Engines::RailsExtensions::Routing module defines extensions to Rails' 
+# routing (ActionController::Routing) mechanism such that routes can be loaded 
+# from a given plugin.
+#
+# The key method is Engines::RailsExtensions::Routing#from_plugin, which can be called 
+# within your application's <tt>config/routes.rb</tt> file to load plugin routes at that point.
+#
+module Engines::RailsExtensions::Routing
+  # Loads the set of routes from within a plugin and evaluates them at this
+  # point within an application's main <tt>routes.rb</tt> file.
+  #
+  # Plugin routes are loaded from <tt><plugin_root>/routes.rb</tt>.
+  def from_plugin(name)
+    map = self # to make 'map' available within the plugin route file
+    routes_path = Engines.plugins[name].routes_path
+    Engines.logger.debug "loading routes from #{routes_path}"
+    eval(IO.read(routes_path), binding, routes_path) if File.file?(routes_path)
+  end
+end
+
+  
+module ::ActionController #:nodoc:
+  module Routing #:nodoc:
+    class RouteSet #:nodoc:
+      class Mapper #:nodoc:
+        include Engines::RailsExtensions::Routing
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines/testing.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/testing.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines/testing.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines/testing.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,87 @@
+# Contains the enhancements to assist in testing plugins. See Engines::Testing
+# for more details.
+
+require 'test/unit'
+
+require 'tmpdir'
+require 'fileutils'
+
+# In most cases, Rails' own plugin testing mechanisms are sufficient. However, there
+# are cases where plugins can be given a helping hand in the testing arena. This module 
+# contains some methods to assist when testing plugins that contain fixtures.
+# 
+# == Fixtures and plugins
+#
+# Since Rails' own fixtures method is fairly strict about where files can be loaded from,
+# the simplest approach when running plugin tests with fixtures is to simply copy all
+# fixtures into a single temporary location and inform the standard Rails mechanism to
+# use this directory, rather than RAILS_ROOT/test/fixtures.
+#
+# The Engines::Testing#setup_plugin_fixtures method does this, copying all plugin fixtures
+# into the temporary location before and tests are performed. This behaviour is invoked
+# the the rake tasks provided by the Engines plugin, in the "test:plugins" namespace. If
+# necessary, you can invoke the task manually.
+#
+# If you wish to take advantage of this, add a call to the Engines::Testing.set_fixture_path
+# method somewhere before your tests (in a test_helper file, or above the TestCase itself).
+#
+# = Testing plugins
+#
+# Normally testing a plugin will require that Rails is loaded, unless you are including
+# a skeleton Rails environment or set of mocks within your plugin tests. If you require
+# the Rails environment to be started, you must ensure that this actually happens; while
+# it's not obvious, your tests do not automatically run with Rails loaded.
+#
+# The simplest way to setup plugin tests is to include a test helper with the following
+# contents:
+#
+#   # Load the normal Rails helper. This ensures the environment is loaded
+#   require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper')
+#   # Ensure that we are using the temporary fixture path
+#   Engines::Testing.set_fixture_path
+#
+# Then run tests using the provided tasks (<tt>test:plugins</tt>, or the tasks that the engines
+# plugin provides - <tt>test:plugins:units</tt>, etc.).
+#
+# Alternatively, you can explicitly load the environment by adpating the contents of the
+# default <tt>test_helper</tt>:
+#
+#   ENV["RAILS_ENV"] = "test"
+#   # Note that we are requiring config/environment from the root of the enclosing application.
+#   require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+#   require 'test_help'
+#
+module Engines::Testing
+  mattr_accessor :temporary_fixtures_directory
+  self.temporary_fixtures_directory = FileUtils.mkdir_p(File.join(Dir.tmpdir, "rails_fixtures"))
+  
+  # Copies fixtures from plugins and the application into a temporary directory 
+  # (Engines::Testing.temporary_fixtures_directory). 
+  # 
+  # If a set of plugins is not given, fixtures are copied from all plugins in order 
+  # of precedence, meaning that plugins can 'overwrite' the fixtures of others if they are 
+  # loaded later; the application's fixtures are copied last, allowing any custom fixtures
+  # to override those in the plugins. If no argument is given, plugins are loaded via
+  # PluginList#by_precedence.
+  #
+  # This method is called by the engines-supplied plugin testing rake tasks
+  def self.setup_plugin_fixtures(plugins = Engines.plugins.by_precedence)
+    
+    # Copy all plugin fixtures, and then the application fixtures, into this directory
+    plugins.each do |plugin| 
+      plugin_fixtures_directory =  File.join(plugin.directory, "test", "fixtures")
+      if File.directory?(plugin_fixtures_directory)
+        Engines.mirror_files_from(plugin_fixtures_directory, self.temporary_fixtures_directory)
+      end
+    end
+    Engines.mirror_files_from(File.join(RAILS_ROOT, "test", "fixtures"),
+                              self.temporary_fixtures_directory)
+  end
+  
+  # Sets the fixture path used by Test::Unit::TestCase to the temporary
+  # directory which contains all plugin fixtures.
+  def self.set_fixture_path
+    Test::Unit::TestCase.fixture_path = self.temporary_fixtures_directory
+    $LOAD_PATH.unshift self.temporary_fixtures_directory
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/lib/engines.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines.rb
--- mephisto-0.7.3/vendor/plugins/engines/lib/engines.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/lib/engines.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,169 @@
+require 'active_support'
+require File.join(File.dirname(__FILE__), 'engines/plugin')
+require File.join(File.dirname(__FILE__), 'engines/plugin/list')
+require File.join(File.dirname(__FILE__), 'engines/plugin/loader')
+require File.join(File.dirname(__FILE__), 'engines/plugin/locator')
+require File.join(File.dirname(__FILE__), 'engines/assets')
+require File.join(File.dirname(__FILE__), 'engines/rails_extensions/rails')
+
+# == Parameters
+#
+# The Engines module has a number of public configuration parameters:
+#
+# [+public_directory+]  The directory into which plugin assets should be
+#                       mirrored. Defaults to <tt>RAILS_ROOT/public/plugin_assets</tt>.
+# [+schema_info_table+] The table to use when storing plugin migration 
+#                       version information. Defaults to +plugin_schema_info+.
+#
+# Additionally, there are a few flags which control the behaviour of
+# some of the features the engines plugin adds to Rails:
+#
+# [+disable_application_view_loading+] A boolean flag determining whether
+#                                      or not views should be loaded from 
+#                                      the main <tt>app/views</tt> directory.
+#                                      Defaults to false; probably only 
+#                                      useful when testing your plugin.
+# [+disable_application_code_loading+] A boolean flag determining whether
+#                                      or not to load controllers/helpers 
+#                                      from the main +app+ directory,
+#                                      if corresponding code exists within 
+#                                      a plugin. Defaults to false; again, 
+#                                      probably only useful when testing 
+#                                      your plugin.
+# [+disable_code_mixing+] A boolean flag indicating whether all plugin
+#                         copies of a particular controller/helper should 
+#                         be loaded and allowed to override each other, 
+#                         or if the first matching file should be loaded 
+#                         instead. Defaults to false.
+#
+module Engines
+  # The set of all loaded plugins
+  mattr_accessor :plugins
+  self.plugins = Engines::Plugin::List.new  
+  
+  # List of extensions to load, can be changed in init.rb before calling Engines.init
+  mattr_accessor :rails_extensions
+  self.rails_extensions = %w(active_record action_mailer asset_helpers routing migrations dependencies)
+  
+  # The name of the public directory to mirror public engine assets into.
+  # Defaults to <tt>RAILS_ROOT/public/plugin_assets</tt>.
+  mattr_accessor :public_directory
+  self.public_directory = File.join(RAILS_ROOT, 'public', 'plugin_assets')
+
+  # The table in which to store plugin schema information. Defaults to
+  # "plugin_schema_info".
+  mattr_accessor :schema_info_table
+  self.schema_info_table = "plugin_schema_info"
+
+  #--
+  # These attributes control the behaviour of the engines extensions
+  #++
+  
+  # Set this to true if views should *only* be loaded from plugins
+  mattr_accessor :disable_application_view_loading
+  self.disable_application_view_loading = false
+  
+  # Set this to true if controller/helper code shouldn't be loaded 
+  # from the application
+  mattr_accessor :disable_application_code_loading
+  self.disable_application_code_loading = false
+  
+  # Set this ti true if code should not be mixed (i.e. it will be loaded
+  # from the first valid path on $LOAD_PATH)
+  mattr_accessor :disable_code_mixing
+  self.disable_code_mixing = false
+  
+  # This is used to determine which files are candidates for the "code
+  # mixing" feature that the engines plugin provides, where classes from
+  # plugins can be loaded, and then code from the application loaded
+  # on top of that code to override certain methods.
+  mattr_accessor :code_mixing_file_types
+  self.code_mixing_file_types = %w(controller helper)
+  
+  class << self
+    def init
+      load_extensions
+      Engines::Assets.initialize_base_public_directory
+    end
+    
+    def logger
+      RAILS_DEFAULT_LOGGER
+    end
+    
+    def load_extensions
+      rails_extensions.each { |name| require "engines/rails_extensions/#{name}" }
+      # load the testing extensions, if we are in the test environment.
+      require "engines/testing" if RAILS_ENV == "test"
+    end
+    
+    def select_existing_paths(paths)
+      paths.select { |path| File.directory?(path) }
+    end  
+  
+    # The engines plugin will, by default, mix code from controllers and helpers,
+    # allowing application code to override specific methods in the corresponding
+    # controller or helper classes and modules. However, if other file types should
+    # also be mixed like this, they can be added by calling this method. For example,
+    # if you want to include "things" within your plugin and override them from
+    # your applications, you should use the following layout:
+    #
+    #   app/
+    #    +-- things/
+    #    |       +-- one_thing.rb
+    #    |       +-- another_thing.rb
+    #   ...
+    #   vendor/
+    #       +-- plugins/
+    #                +-- my_plugin/
+    #                           +-- app/
+    #                                +-- things/
+    #                                        +-- one_thing.rb
+    #                                        +-- another_thing.rb
+    #
+    # The important point here is that your "things" are named <whatever>_thing.rb,
+    # and that they are placed within plugin/app/things (the pluralized form of 'thing').
+    # 
+    # It's important to note that you'll also want to ensure that the "things" are
+    # on your load path in your plugin's init.rb:
+    #
+    #   Rails.plugins[:my_plugin].code_paths << "app/things"
+    #
+    def mix_code_from(*types)
+      self.code_mixing_file_types += types.map { |x| x.to_s.singularize }
+    end
+  
+    # A general purpose method to mirror a directory (+source+) into a destination
+    # directory, including all files and subdirectories. Files will not be mirrored
+    # if they are identical already (checked via FileUtils#identical?).
+    def mirror_files_from(source, destination)
+      return unless File.directory?(source)
+  
+      # TODO: use Rake::FileList#pathmap?    
+      source_files = Dir[source + "/**/*"]
+      source_dirs = source_files.select { |d| File.directory?(d) }
+      source_files -= source_dirs  
+  
+      source_dirs.each do |dir|
+        # strip down these paths so we have simple, relative paths we can
+        # add to the destination
+        target_dir = File.join(destination, dir.gsub(source, ''))
+        begin        
+          FileUtils.mkdir_p(target_dir)
+        rescue Exception => e
+          raise "Could not create directory #{target_dir}: \n" + e
+        end
+      end
+
+      source_files.each do |file|
+        begin
+          target = File.join(destination, file.gsub(source, ''))
+          unless File.exist?(target) && FileUtils.identical?(file, target)
+            FileUtils.cp(file, target)
+          end 
+        rescue Exception => e
+          raise "Could not copy #{file} to #{target}: \n" + e 
+        end
+      end  
+    end   
+  end  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines/tasks/engines.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/tasks/engines.rake
--- mephisto-0.7.3/vendor/plugins/engines/tasks/engines.rake	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines/tasks/engines.rake	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,176 @@
+# This code lets us redefine existing Rake tasks, which is extremely
+# handy for modifying existing Rails rake tasks.
+# Credit for the original snippet of code goes to Jeremy Kemper
+# http://pastie.caboo.se/9620
+unless Rake::TaskManager.methods.include?(:redefine_task)
+  module Rake
+    module TaskManager
+      def redefine_task(task_class, args, &block)
+        task_name, deps = resolve_args(args)
+        task_name = task_class.scope_name(@scope, task_name)
+        deps = [deps] unless deps.respond_to?(:to_ary)
+        deps = deps.collect {|d| d.to_s }
+        task = @tasks[task_name.to_s] = task_class.new(task_name, self)
+        task.application = self
+        @last_comment = nil
+        task.enhance(deps, &block)
+        task
+      end
+    end
+    class Task
+      class << self
+        def redefine_task(args, &block)
+          Rake.application.redefine_task(self, [args], &block)
+        end
+      end
+    end
+  end
+end
+
+namespace :db do
+  namespace :migrate do
+    desc 'Migrate database and plugins to current status.'
+    task :all => [ 'db:migrate', 'db:migrate:plugins' ]
+    
+    desc 'Migrate plugins to current status.'
+    task :plugins => :environment do
+      Engines.plugins.each do |plugin|
+        next unless File.exists? plugin.migration_directory
+        puts "Migrating plugin #{plugin.name} ..."
+        plugin.migrate
+      end
+    end
+
+    desc 'Migrate a specified plugin.'
+    task({:plugin => :environment}, :name, :version) do |task, args|
+      name = args[:name] || ENV['NAME']
+      if plugin = Engines.plugins[name]
+        version = args[:version] || ENV['VERSION']
+        puts "Migrating #{plugin.name} to " + (version ? "version #{version}" : 'latest version') + " ..."
+        plugin.migrate(version ? version.to_i : nil)
+      else
+        puts "Plugin #{name} does not exist."
+      end
+    end    
+  end
+end
+
+
+namespace :db do  
+  namespace :fixtures do
+    namespace :plugins do
+      
+      desc "Load plugin fixtures into the current environment's database."
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+        Dir.glob(File.join(RAILS_ROOT, 'vendor', 'plugins', ENV['PLUGIN'] || '**', 
+                 'test', 'fixtures', '*.yml')).each do |fixture_file|
+          Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
+        end
+      end
+      
+    end
+  end
+end
+
+# this is just a modification of the original task in railties/lib/tasks/documentation.rake, 
+# because the default task doesn't support subdirectories like <plugin>/app or
+# <plugin>/component. These tasks now include every file under a plugin's code paths (see
+# Plugin#code_paths).
+namespace :doc do
+
+  plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
+
+  namespace :plugins do
+
+    # Define doc tasks for each plugin
+    plugins.each do |plugin|
+      desc "Create plugin documentation for '#{plugin}'"
+      Rake::Task.redefine_task(plugin => :environment) do
+        plugin_base   = RAILS_ROOT + "/vendor/plugins/#{plugin}"
+        options       = []
+        files         = Rake::FileList.new
+        options << "-o doc/plugins/#{plugin}"
+        options << "--title '#{plugin.titlecase} Plugin Documentation'"
+        options << '--line-numbers' << '--inline-source'
+        options << '-T html'
+
+        # Include every file in the plugin's code_paths (see Plugin#code_paths)
+        if Engines.plugins[plugin]
+          files.include("#{plugin_base}/{#{Engines.plugins[plugin].code_paths.join(",")}}/**/*.rb")
+        end
+        if File.exists?("#{plugin_base}/README")
+          files.include("#{plugin_base}/README")    
+          options << "--main '#{plugin_base}/README'"
+        end
+        files.include("#{plugin_base}/CHANGELOG") if File.exists?("#{plugin_base}/CHANGELOG")
+
+        if files.empty?
+          puts "No source files found in #{plugin_base}. No documentation will be generated."
+        else
+          options << files.to_s
+          sh %(rdoc #{options * ' '})
+        end
+      end
+    end
+  end
+end
+
+
+
+namespace :test do
+  task :warn_about_multiple_plugin_testing_with_engines do
+    puts %{-~============== A Moste Polite Warninge ===========================~-
+
+You may experience issues testing multiple plugins at once when using
+the code-mixing features that the engines plugin provides. If you do
+experience any problems, please test plugins individually, i.e.
+
+  $ rake test:plugins PLUGIN=my_plugin
+
+or use the per-type plugin test tasks:
+
+  $ rake test:plugins:units
+  $ rake test:plugins:functionals
+  $ rake test:plugins:integration
+  $ rake test:plugins:all
+
+Report any issues on http://dev.rails-engines.org. Thanks!
+
+-~===============( ... as you were ... )============================~-}
+  end
+  
+  namespace :plugins do
+
+    desc "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
+    task :all => [:warn_about_multiple_plugin_testing_with_engines, 
+                  :units, :functionals, :integration]
+    
+    desc "Run all plugin unit tests"
+    Rake::TestTask.new(:units => :setup_plugin_fixtures) do |t|
+      t.pattern = "vendor/plugins/#{ENV['PLUGIN'] || "**"}/test/unit/**/*_test.rb"
+      t.verbose = true
+    end
+    
+    desc "Run all plugin functional tests"
+    Rake::TestTask.new(:functionals => :setup_plugin_fixtures) do |t|
+      t.pattern = "vendor/plugins/#{ENV['PLUGIN'] || "**"}/test/functional/**/*_test.rb"
+      t.verbose = true
+    end
+    
+    desc "Integration test engines"
+    Rake::TestTask.new(:integration => :setup_plugin_fixtures) do |t|
+      t.pattern = "vendor/plugins/#{ENV['PLUGIN'] || "**"}/test/integration/**/*_test.rb"
+      t.verbose = true
+    end
+
+    desc "Mirrors plugin fixtures into a single location to help plugin tests"
+    task :setup_plugin_fixtures => :environment do
+      Engines::Testing.setup_plugin_fixtures
+    end
+    
+    # Patch the default plugin testing task to have setup_plugin_fixtures as a prerequisite
+    Rake::Task["test:plugins"].prerequisites << "test:plugins:setup_plugin_fixtures"
+  end  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/init.rb
--- mephisto-0.7.3/vendor/plugins/engines_config/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+require 'engines/configurable'
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/lib/engines/configurable.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/lib/engines/configurable.rb
--- mephisto-0.7.3/vendor/plugins/engines_config/lib/engines/configurable.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/lib/engines/configurable.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,56 @@
+module Engines
+  class Plugin
+    module Configurable
+      class Config < ActiveRecord::Base  
+        set_table_name 'plugin_configs'
+        serialize :options, Hash
+    
+        def after_initialize
+          write_attribute(:options, {}) if read_attribute(:options).nil?
+        end
+      end
+
+      def option(property, default, field_type = :text_field)
+        instance_eval <<-END, __FILE__, __LINE__
+          def #{property}
+            config.options[#{property.inspect}] || #{default.inspect}
+          end      
+          def #{property}=(value)
+            config.options[#{property.inspect}] = value
+          end
+        END
+        default_options[property] = field_type
+      end
+  
+      def options=(options)
+        config.options = options
+      end
+  
+      def default_options
+        @default_options ||= {}
+      end
+      
+      def save!
+        config.save!        
+      end
+      
+      def destroy
+        config.destroy
+        @config = nil
+      end
+      
+      private
+  
+      def config
+        @config ||= Config.find_or_initialize_by_name(conf_name)
+      end
+      
+      # allow subclasses to hook in here
+      def conf_name
+        name
+      end
+    end
+  end
+end
+
+Engines::Plugin.send :include, Engines::Plugin::Configurable
Files mephisto-0.7.3/vendor/plugins/engines_config/test/db/engines_config_plugin.sqlite3.db and technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/db/engines_config_plugin.sqlite3.db differ
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/test/plugins/plugin_alpha/about.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/plugins/plugin_alpha/about.yml
--- mephisto-0.7.3/vendor/plugins/engines_config/test/plugins/plugin_alpha/about.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/plugins/plugin_alpha/about.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+author: Sven Fuchs
+version: 0.0.1
+homepage: http://www.artweb-design.de
+notes: just for testing
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/test/plugins/plugin_alpha/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/plugins/plugin_alpha/init.rb
--- mephisto-0.7.3/vendor/plugins/engines_config/test/plugins/plugin_alpha/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/plugins/plugin_alpha/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+option :an_option, 'a default'
+option :another_option, 'another default'
+
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/test/plugins/plugin_alpha/routes.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/plugins/plugin_alpha/routes.rb
--- mephisto-0.7.3/vendor/plugins/engines_config/test/plugins/plugin_alpha/routes.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/plugins/plugin_alpha/routes.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+map.connect 'something', :controller => 'somethings', :action => 'index'
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/test/test_engines_configurable.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/test_engines_configurable.rb
--- mephisto-0.7.3/vendor/plugins/engines_config/test/test_engines_configurable.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/test_engines_configurable.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class EnginesConfigurableTest < Test::Unit::TestCase
+  def teardown
+    Engines::Plugin::Config.destroy_all
+    plugin_alpha.instance_variable_set(:@config, nil)
+  end
+  
+  def test_should_load_test_plugin
+    assert_nothing_raised { plugin_alpha }
+  end
+  
+  def test_should_allow_to_define_option_within_plugin_init_rb
+    assert plugin_alpha.respond_to?(:an_option)
+  end  
+  
+  def test_should_use_option_default_value
+    assert_equal 'a default', plugin_alpha.an_option
+  end
+  
+  def test_should_save_option_to_active_record_store
+    plugin_alpha.another_option = 'a value'
+    plugin_alpha.save!
+    assert_equal 'a value', Engines::Plugin::Config.find_by_name('plugin_alpha').options[:another_option]
+  end
+  
+  def test_should_read_option_from_active_record_store
+    plugin_alpha.another_option = 'a value'
+    plugin_alpha.save!
+    assert_equal 'a value', plugin_alpha.another_option
+  end
+  
+  private
+  
+  def plugin_alpha
+    Engines.plugins['plugin_alpha']
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/test/test_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/test_helper.rb
--- mephisto-0.7.3/vendor/plugins/engines_config/test/test_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/test_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+ENV['RAILS_ENV'] = 'test'
+
+require 'test/unit' 
+require File.join(File.dirname(__FILE__), '../../../../config/boot')
+
+Rails::Configuration.send(:define_method, :plugin_paths) do
+  ["#{RAILS_ROOT}/vendor/plugins", "vendor/plugins/engines_config/test/plugins"]
+end
+
+require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment'))
+
+Engines::Plugin::Config.set_table_name 'plugin_configs' 
+
+config = { :adapter => "sqlite3", :dbfile => File.dirname(__FILE__) + "/db/engines_config_plugin.sqlite3.db" }
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/log/debug.log")
+ActiveRecord::Base.establish_connection(config)
+
+unless ActiveRecord::Base.connection.tables.include?('plugin_configs')
+  ActiveRecord::Schema.define(:version => 0) do
+    create_table :plugin_configs, :force => true do |t|
+      t.string "name"
+      t.text   "options"
+      t.string "type"
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/engines_config/test/test_plugin_about_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/test_plugin_about_info.rb
--- mephisto-0.7.3/vendor/plugins/engines_config/test/test_plugin_about_info.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/engines_config/test/test_plugin_about_info.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class PluginAboutInfoTest < Test::Unit::TestCase
+  def test_should_read_about_info_from_about_yml
+    assert_equal 'Sven Fuchs', Engines.plugins['plugin_alpha'].about['author']
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/expiring_attr_reader/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/Rakefile
--- mephisto-0.7.3/vendor/plugins/expiring_attr_reader/Rakefile	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the acts_as_attachment plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the acts_as_attachment plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ActsAsAttachment'
+  rdoc.options << '--line-numbers --inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff -Nur mephisto-0.7.3/vendor/plugins/expiring_attr_reader/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/init.rb
--- mephisto-0.7.3/vendor/plugins/expiring_attr_reader/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+Module.send :include, ExpiringAttrReader
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/expiring_attr_reader/lib/expiring_attr_reader.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/lib/expiring_attr_reader.rb
--- mephisto-0.7.3/vendor/plugins/expiring_attr_reader/lib/expiring_attr_reader.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/lib/expiring_attr_reader.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+module ExpiringAttrReader
+  # Creates an expiring method that is called once, and overwrites itself so future calls are faster.  It does this
+  # by setting an instance variable and an attr_reader on the singleton class.  Other instances of this object are
+  # not affected.
+  #
+  # (example taken from http://redhanded.hobix.com/inspect/methodsThatSelfDestruct.html)
+  #   class Hit
+  #     expiring_attr_reader :country, %(`geoiplookup #{@ip}`.chomp.gsub(/^GeoIP Country Edition: /,""))
+  #
+  #     def initialize(ip)
+  #       @ip = ip
+  #     end
+  #   end
+  #
+  # A better idea would be to refactor the expensive code into a method:
+  #
+  #   class Hit
+  #     expiring_attr_reader :country, "self.class.geoiplookup @ip"
+  #
+  #     def initialize(ip)
+  #       @ip = ip
+  #     end
+  #
+  #     def self.geoiplookup(ip)
+  #       `geoiplookup #{ip}`.chomp.gsub(/^GeoIP Country Edition: /,"")
+  #     end
+  #   end
+  def expiring_attr_reader(method_name, value)
+    var_name    = method_name.to_s.gsub(/\W/, '')
+    class_eval(<<-EOS, __FILE__, __LINE__)
+      def #{method_name}
+        def self.#{method_name}; @#{var_name}; end
+        @#{var_name} ||= eval(%(#{value}))
+      end
+    EOS
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/expiring_attr_reader/test/expiring_attr_reader_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/test/expiring_attr_reader_test.rb
--- mephisto-0.7.3/vendor/plugins/expiring_attr_reader/test/expiring_attr_reader_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/expiring_attr_reader/test/expiring_attr_reader_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,61 @@
+$: << File.join(File.dirname(__FILE__), '../lib')
+require 'test/unit'
+require 'expiring_attr_reader'
+Class.send :include, ExpiringAttrReader
+
+class Sample
+  def self.calls
+    @@calls
+  end
+
+  def self.reset
+    @@calls = 0
+  end
+
+  expiring_attr_reader :foo, :expensive_method
+  expiring_attr_reader :extra, %(expensive_method + ' and more!')
+  expiring_attr_reader :foo!,  %(expensive_method + ' with bang')
+  expiring_attr_reader :foo?,  %(expensive_method + ' with q')
+  
+  def expensive_method
+    if @repeat
+      raise "This shouldn't be called again"
+    end
+    @repeat  = true
+    @@calls += 1
+    'result'
+  end
+end
+
+class ExpiringAttrReaderTest < Test::Unit::TestCase
+  def setup
+    Sample.reset
+  end
+  
+  def test_adding_cached_reader
+    assert_equal 'result and more!', Sample.new.extra
+    assert_equal 1, Sample.calls
+  end
+  
+  def test_should_not_repeat_expensive_method
+    s1 = Sample.new
+    s2 = Sample.new
+    
+    2.times { assert_equal 'result', s1.foo }
+    assert_equal 1, Sample.calls
+  
+    2.times { assert_equal 'result', s2.foo }
+    assert_equal 2, Sample.calls
+  end
+  
+  def test_should_allow_expiring_attrs_with_bang_or_question
+    s1 = Sample.new
+    s2 = Sample.new
+    
+    2.times { assert_equal 'result with bang', s1.foo! }
+    assert_equal 1, Sample.calls
+    
+    2.times { assert_equal 'result with q',    s2.foo? }
+    assert_equal 2, Sample.calls
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/filtered_column/lib/filtered_column/filters/smartypants_filter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/lib/filtered_column/filters/smartypants_filter.rb
--- mephisto-0.7.3/vendor/plugins/filtered_column/lib/filtered_column/filters/smartypants_filter.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/lib/filtered_column/filters/smartypants_filter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -4,7 +4,7 @@
       set_name "Markdown with Smarty Pants"
       def self.filter(text)
         if Object.const_defined?(:BlueCloth) && Object.const_defined?(:RubyPants)
-          BlueCloth.new(RubyPants.new(text.gsub(%r{</?notextile>}, '')).to_html).to_html
+          RubyPants.new(BlueCloth.new(text.gsub(%r{</?notextile>}, '')).to_html).to_html
         else
           text
         end
diff -Nur mephisto-0.7.3/vendor/plugins/filtered_column/lib/filtered_column/mixin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/lib/filtered_column/mixin.rb
--- mephisto-0.7.3/vendor/plugins/filtered_column/lib/filtered_column/mixin.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/lib/filtered_column/mixin.rb	2008-03-31 02:18:56.000000000 -0400
@@ -19,6 +19,10 @@
         names.each do |name|
           (self.filtered_options    ||= {})[name] = options
           (self.filtered_attributes ||= []) << name
+          define_method("#{name}_doc") do
+            class << self; attr_accessor "#{name}_doc"; end
+            instance_variable_set("@#{name}_doc", HTML::Document.new(send("#{name}_html")))
+          end
         end
       end
 
@@ -29,7 +33,7 @@
               send "#{attr_name}_html=", FilteredColumn::Processor.process_filter(filter_for_attribute(attr_name), send(attr_name).to_s.dup)
             end
           end
-          
+           
           def filter_for_attribute(attr_name)
             return nil if filter.blank? ||
               (!filtered_options[attr_name][:only].blank?   && !filtered_options[attr_name][:only].include?(filter.to_sym)) ||
diff -Nur mephisto-0.7.3/vendor/plugins/filtered_column/lib/filtered_column/processor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/lib/filtered_column/processor.rb
--- mephisto-0.7.3/vendor/plugins/filtered_column/lib/filtered_column/processor.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/lib/filtered_column/processor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -6,7 +6,7 @@
   class Processor
     @@patterns = [
       /<(filter|macro|typo):([_a-zA-Z0-9]+)([^>]*)\/>/,
-      /<(filter|macro|typo):([_a-zA-Z0-9]+)([^>]*)>(?:[\n\r])*(.*?)[\n\r]*<\/(filter|macro|typo):([_a-zA-Z0-9]+)>/m
+      /<(filter|macro|typo):([_a-zA-Z0-9]+)([^>]*)>(.*?)<\/(filter|macro|typo):([_a-zA-Z0-9]+)>/m
       ].freeze
 
     def self.process_filter(filter_name, text)
diff -Nur mephisto-0.7.3/vendor/plugins/filtered_column/test/abstract_unit.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/test/abstract_unit.rb
--- mephisto-0.7.3/vendor/plugins/filtered_column/test/abstract_unit.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/test/abstract_unit.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,7 +1,8 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment'))
+require 'action_controller/vendor/html-scanner/html/document'
 require 'breakpoint'
 
 Test::Unit::TestCase.class_eval do
diff -Nur mephisto-0.7.3/vendor/plugins/filtered_column/test/filtered_column_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/test/filtered_column_test.rb
--- mephisto-0.7.3/vendor/plugins/filtered_column/test/filtered_column_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/test/filtered_column_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,9 @@
 class FilteredColumnTest < Test::Unit::TestCase
   {
     :textile  => { :input  => '*foo*',        :output => '<p><strong>foo</strong></p>' },
-    :markdown => { :input  => "# bar\n\nfoo", :output => "<h1>bar</h1>\n\n<p>foo</p>" }
+    :markdown => { :input  => "# bar\n\nfoo", :output => "<h1>bar</h1>\n\n<p>foo</p>" },
+    :smartypants => { :input => "\"abc\" `<def ghi=\"jkl\">`\n\n    <mno pqr=\"stu\">...</mno>",
+      :output => "<p>&#8220;abc&#8221; <code>&lt;def ghi=\"jkl\"&gt;</code></p>\n\n<pre><code>&lt;mno pqr=\"stu\"&gt;...&lt;/mno&gt;\n</code></pre>" },
   }.each do |filter_name, values|
     define_method "test_should_filter_with_#{filter_name}" do
       assert_equal values[:output], FilteredColumn::Processor.new("#{filter_name}_filter", values[:input]).filter
@@ -11,8 +13,7 @@
 
     define_method "test_should_filter_model_attribute_with_#{filter_name}" do
       assert_filters_called_on "#{filter_name}_filter".to_sym do
-        a = Article.new :body => values[:input], :filter => "#{filter_name}_filter"
-        a.save 
+        a = Article.create :body => values[:input], :filter => "#{filter_name}_filter"
         assert_equal values[:output], a.body_html
       end
     end
@@ -44,4 +45,9 @@
   def test_should_escape_textile_filter
     assert_equal '<notextile>foo</notextile>', FilteredColumn::Filters::TextileFilter.escape('foo')
   end
+  
+  def test_should_parse_content_with_html_tokenizer
+    article = Article.create :body => '*foo*', :filter => "textile_filter"
+    assert_kind_of HTML::Document, article.body_doc
+  end
 end
diff -Nur mephisto-0.7.3/vendor/plugins/filtered_column/test/macro_filter_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/test/macro_filter_test.rb
--- mephisto-0.7.3/vendor/plugins/filtered_column/test/macro_filter_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column/test/macro_filter_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -20,9 +20,4 @@
   def test_should_escape_macros_with_textile
     assert_equal %(foo:  - flip:  - text: <tt>test</tt>), process_filter(:textile_filter, "<macro:sample><tt>test</tt></macro:sample>")
   end
-
-  def test_sample_macros_with_newlines
-    assert_equal %(foo: foo - flip: bar - text:   test  ), process_macros(%(<macro:sample foo_bar="foo" flip="bar">\r\n\r\r\r\n\n\n  test  \r\n</macro:sample>))
-    assert_equal %(foo:  - flip:  - text:   <tt>test</tt>), process_filter(:textile_filter, "<macro:sample>\r\n  <tt>test</tt>\r\n</macro:sample>")
-  end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/filtered_column_code_macro/lib/code_macro.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column_code_macro/lib/code_macro.rb
--- mephisto-0.7.3/vendor/plugins/filtered_column_code_macro/lib/code_macro.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/filtered_column_code_macro/lib/code_macro.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,16 +1,31 @@
 require 'coderay'
 class CodeMacro < FilteredColumn::Macros::Base
+  DEFAULT_OPTIONS = {:css => :class, :wrap => :div, :line_numbers => :table, :tab_width => 2, :bold_every => 5, :hint => false, :line_number_start => 1}
   def self.filter(attributes, inner_text = '', text = '')
-    lang = attributes.delete(:lang)
-    attributes[:line_numbers] = :table unless attributes.has_key?(:line_numbers)
-    attributes.each do |key, value|
-      attributes[key] = value == 'nil' ? nil : value.to_sym rescue nil
-    end
+    # It's a whole lot easier to just set your attributes statically
+    # I think for most of us the only option we're gonna change is 'lang'
+    # refer to http://rd.cycnus.de/coderay/doc/classes/CodeRay/Encoders/HTML.html for more info
+    # use code_highlighter.css to change highlighting
+    # don't change, formats code so code_highlighter.css can be used
+
+    lang    = attributes[:lang].blank? ? nil : attributes[:lang].to_sym
+    options = DEFAULT_OPTIONS.dup
+    # type of line number to print options: :inline, :table, :list, nil [default = :table]
+    # you can change the line_numbers default value but you will probably have to change the css too
+    options[:line_numbers]      = attributes[:line_numbers].to_sym    unless attributes[:line_numbers].blank?
+    # changes tab spacing [default = 2]
+    options[:tab_width]         = attributes[:tab_width].to_i         unless attributes[:tab_width].blank?
+    # bolds every 'X' line number
+    options[:bold_every]        = attributes[:bold_every].to_i        unless attributes[:bold_every].blank?
+    # use it if you want to can be :info, :info_long, :debug just debugging info in the tags
+    options[:hint]              = attributes[:hint].to_sym            unless attributes[:hint].blank?
+    # start with line number
+    options[:line_number_start] = attributes[:line_number_start].to_i unless attributes[:line_number_start].blank?
 
     begin
-      CodeRay.scan(inner_text, lang.to_sym).html(attributes)
+      CodeRay.scan(inner_text, lang.to_sym).html(options)
     rescue ArgumentError
-      CodeRay.scan(inner_text, lang.to_sym).html(:line_numbers => :table)
+      CodeRay.scan(inner_text, lang.to_sym).html(DEFAULT_OPTIONS)
     rescue
       unless lang.blank?
         RAILS_DEFAULT_LOGGER.warn "CodeRay Error: #{$!.message}"
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/Manifest.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/Manifest.txt
--- mephisto-0.7.3/vendor/plugins/liquid/Manifest.txt	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/Manifest.txt	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,60 @@
+CHANGELOG
+MIT-LICENSE
+Manifest.txt
+README
+Rakefile
+example/server/example_servlet.rb
+example/server/liquid_servlet.rb
+example/server/server.rb
+example/server/templates/index.liquid
+example/server/templates/products.liquid
+init.rb
+lib/extras/liquid_view.rb
+lib/liquid.rb
+lib/liquid/block.rb
+lib/liquid/condition.rb
+lib/liquid/context.rb
+lib/liquid/document.rb
+lib/liquid/drop.rb
+lib/liquid/errors.rb
+lib/liquid/extensions.rb
+lib/liquid/file_system.rb
+lib/liquid/htmltags.rb
+lib/liquid/standardfilters.rb
+lib/liquid/strainer.rb
+lib/liquid/tag.rb
+lib/liquid/tags/assign.rb
+lib/liquid/tags/capture.rb
+lib/liquid/tags/case.rb
+lib/liquid/tags/comment.rb
+lib/liquid/tags/cycle.rb
+lib/liquid/tags/for.rb
+lib/liquid/tags/if.rb
+lib/liquid/tags/ifchanged.rb
+lib/liquid/tags/include.rb
+lib/liquid/tags/unless.rb
+lib/liquid/template.rb
+lib/liquid/variable.rb
+test/block_test.rb
+test/context_test.rb
+test/drop_test.rb
+test/error_handling_test.rb
+test/extra/breakpoint.rb
+test/extra/caller.rb
+test/file_system_test.rb
+test/filter_test.rb
+test/helper.rb
+test/html_tag_test.rb
+test/if_else_test.rb
+test/include_tag_test.rb
+test/output_test.rb
+test/parsing_quirks_test.rb
+test/regexp_test.rb
+test/security_test.rb
+test/standard_filter_test.rb
+test/standard_tag_test.rb
+test/statements_test.rb
+test/strainer_test.rb
+test/template_test.rb
+test/unless_else_test.rb
+test/variable_test.rb
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/Rakefile
--- mephisto-0.7.3/vendor/plugins/liquid/Rakefile	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -1,26 +1,11 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
+require 'hoe'
 
-PKG_VERSION = "1.5.0"
-PKG_NAME = "liquid"
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-
-PKG_FILES = FileList[
-    "lib/**/*", "test/**/*", "example/**/*" "[A-Z]*", "Rakefile", "init.rb"
-].exclude(/\bCVS\b|~$|\.svn/)
-
-desc "Default Task"
-task :default => [ :test ]
-
-desc "Delete tar.gz / zip / rdoc"
-task :cleanup => [ :rm_packages, :clobber_rdoc ]
-
-# Run the unit tests
+PKG_VERSION = "1.7.0"
+PKG_NAME    = "liquid"
+PKG_DESC    = "A secure non evaling end user template engine with aesthetic markup."
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "lib"
@@ -29,104 +14,11 @@
   t.verbose = false
 end
 
-task :install => [:package] do
-  `gem install pkg/#{PKG_FILE_NAME}.gem`
-end
-
-task :coverage do 
-  system("rcov test/*.rb -T --sort coverage")
-end
-
-task :syntax do 
-  filelist = Dir.glob('**/*.rb')
-  filelist.each do |file|
-    output = `ruby -c #{file}`
-    unless output =~ /Syntax OK/
-      puts "#{file}:"
-      puts "  #{output}"
-      return 
-    end
-  end
-  puts 'Syntax OK'  
-end
-
-# Genereate the RDoc documentation
-
-Rake::RDocTask.new { |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "Liquid templates library"
-  rdoc.options << '--line-numbers --inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-}
-
-task :lines do
-  lines = 0
-  codelines = 0
-  Dir.foreach("lib") { |file_name| 
-    next unless file_name =~ /.*rb/
-    
-    f = File.open("lib/" + file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
-    end
-  }
-  puts "Lines #{lines}, LOC #{codelines}"
-end
-
-
-# Publish beta gem  
-desc "Publish the gem on leetsoft"
-task :publish => [:rdoc, :package] do
-  Rake::SshFilePublisher.new("leetsoft.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.zip").upload
-  Rake::SshFilePublisher.new("leetsoft.com", "dist/pkg", "pkg", "#{PKG_FILE_NAME}.tgz").upload
-  Rake::SshFilePublisher.new("leetsoft.com", "dist/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-
-  `ssh tobi@leetsoft.com "mkdir -p dist/api/#{PKG_NAME}"`
-  Rake::SshDirPublisher.new("leetsoft.com", "dist/api/#{PKG_NAME}", "doc").upload
-  `ssh tobi@leetsoft.com './gemupdate'`
-  `rm -rf pkg/`
-  `rm -rf doc/`
-end
-
-
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = "A secure non evaling end user template engine with aesthetic markup"
-  s.has_rdoc = true
-  s.files = PKG_FILES
-
-  s.require_path = 'lib'
-  s.autorequire  = 'liquid'
-  s.author = "Tobias Luetke"
-  s.email = "tobi@leetsoft.com"
-  s.homepage = "http://dist.leetsoft.com/api/liquid"  
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-end
-
-# --- Ruby forge release manager by florian gross -------------------------------------------------
-RUBY_FORGE_PROJECT = 'liquid'
-RUBY_FORGE_USER = 'xal'
-
-RELEASE_NAME  = "REL-#{PKG_VERSION}"
-RUBY_FORGE_GROUPID = "1069"
-RUBY_FORGE_PACKAGEID = "1255"
-
-desc "Publish the release files to RubyForge."
-task :release => [:gem, :package] do
-#  files = ["zip", "tgz"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-
-  system("rubyforge login") 
-  system("rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.zip")
-  system("rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.tgz")
-end
+Hoe.new(PKG_NAME, PKG_VERSION) do |p|
+  p.rubyforge_name = PKG_NAME
+  p.summary        = PKG_DESC
+  p.description    = nil
+  p.author         = "Tobias Luetke"
+  p.email          = "tobi@leetsoft.com"
+  p.url            = "http://home.leetsoft.com/liquid"    
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/example/server/example_servlet.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/example/server/example_servlet.rb
--- mephisto-0.7.3/vendor/plugins/liquid/example/server/example_servlet.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/example/server/example_servlet.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+module ProductsFilter
+  def price(integer)
+    sprintf("$%.2d USD", integer / 100.0)
+  end
+  
+  def prettyprint(text)
+    text.gsub( /\*(.*)\*/, '<b>\1</b>' )
+  end
+  
+  def count(array)
+    array.size
+  end
+  
+  def paragraph(p)
+    "<p>#{p}</p>"
+  end
+end
+
+class Servlet < LiquidServlet
+  
+  def index
+    { 'date' => Time.now }
+  end
+  
+  def products    
+    { 'products' => products_list, 'section' => 'Snowboards', 'cool_products' => true}    
+  end
+  
+  private
+  
+  def products_list
+    [{'name' => 'Arbor Draft', 'price' => 39900, 'description' => 'the *arbor draft* is a excellent product' },
+    {'name' => 'Arbor Element', 'price' => 40000, 'description' => 'the *arbor element* rocks for freestyling'},
+    {'name' => 'Arbor Diamond', 'price' => 59900, 'description' => 'the *arbor diamond* is a made up product because im obsessed with arbor and have no creativity'}]
+  end
+  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/example/server/server.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/example/server/server.rb
--- mephisto-0.7.3/vendor/plugins/liquid/example/server/server.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/example/server/server.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,7 @@
 
 require File.dirname(__FILE__) + '/../../lib/liquid'
 require File.dirname(__FILE__) + '/liquid_servlet'
-require File.dirname(__FILE__) + '/test_servlet'
+require File.dirname(__FILE__) + '/example_servlet'
 
 # Setup webrick
 server = WEBrick::HTTPServer.new( :Port => ARGV[1] || 3000 )
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/example/server/test_servlet.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/example/server/test_servlet.rb
--- mephisto-0.7.3/vendor/plugins/liquid/example/server/test_servlet.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/example/server/test_servlet.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,37 +0,0 @@
-module ProductsFilter
-  def price(integer)
-    sprintf("$%.2d USD", integer / 100.0)
-  end
-  
-  def prettyprint(text)
-    text.gsub( /\*(.*)\*/, '<b>\1</b>' )
-  end
-  
-  def count(array)
-    array.size
-  end
-  
-  def paragraph(p)
-    "<p>#{p}</p>"
-  end
-end
-
-class Servlet < LiquidServlet
-  
-  def index
-    { 'date' => Time.now }
-  end
-  
-  def products    
-    { 'products' => products_list, 'section' => 'Snowboards', 'cool_products' => true}    
-  end
-  
-  private
-  
-  def products_list
-    [{'name' => 'Arbor Draft', 'price' => 39900, 'description' => 'the *arbor draft* is a excellent product' },
-    {'name' => 'Arbor Element', 'price' => 40000, 'description' => 'the *arbor element* rocks for freestyling'},
-    {'name' => 'Arbor Diamond', 'price' => 59900, 'description' => 'the *arbor diamond* is a made up product because im obsessed with arbor and have no creativity'}]
-  end
-  
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/block.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/block.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/block.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/block.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,6 +1,7 @@
 module Liquid
   
   class Block < Tag
+
     def parse(tokens)
       @nodelist ||= []
       @nodelist.clear
@@ -20,7 +21,7 @@
 
             # fetch the tag from registered blocks
             if tag = Template.tags[$1]
-              @nodelist << tag.new($2, tokens)
+              @nodelist << tag.new($1, $2, tokens)
             else
               # this tag is not registered with the system 
               # pass it to the current block for special handling or error reporting
@@ -63,7 +64,7 @@
     end                           
 
     def block_name
-      self.class.name.scan(/\w+$/).first.downcase
+      @tag_name
     end
 
     def create_variable(token)
@@ -76,7 +77,7 @@
     def render(context)
       render_all(@nodelist, context)
     end
-
+    
     protected
 
     def assert_missing_delimitation!
@@ -92,7 +93,7 @@
             token.to_s
           end
         rescue Exception => e          
-          context.template.handle_error(e)
+          context.handle_error(e)
         end
           
       end      
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/condition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/condition.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/condition.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/condition.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,88 +1,97 @@
-# Container for liquid nodes which conveniently wrapps decision making logic
-#
-# Example:
-#
-#   c = Condition.new('1', '==', '1') 
-#   c.evaluate #=> true
-#
-class Condition
-  attr_reader :attachment
-  attr_accessor :left, :operator, :right
+module Liquid
+  # Container for liquid nodes which conveniently wrapps decision making logic
+  #
+  # Example:
+  #
+  #   c = Condition.new('1', '==', '1') 
+  #   c.evaluate #=> true
+  #
+  class Condition
+    @@operators = {
+      '==' => lambda { |cond, left, right|  cond.send(:equal_variables, left, right) },
+      '!=' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
+      '<>' => lambda { |cond, left, right| !cond.send(:equal_variables, left, right) },
+      '<'  => :<,
+      '>'  => :>,
+      '>=' => :>=,
+      '<=' => :<=
+    }
+    
+    def self.operators
+      @@operators
+    end
+
+    attr_reader :attachment
+    attr_accessor :left, :operator, :right
   
-  def initialize(left = nil, operator = nil, right = nil)
-    @left, @operator, @right = left, operator, right
-  end
+    def initialize(left = nil, operator = nil, right = nil)
+      @left, @operator, @right = left, operator, right
+    end
     
-  def evaluate(context = Context.new)
-    interpret_condition(left, right, operator, context)
-  end
+    def evaluate(context = Context.new)
+      interpret_condition(left, right, operator, context)
+    end
   
-  def attach(attachment)
-    @attachment = attachment
-  end
+    def attach(attachment)
+      @attachment = attachment
+    end
   
-  def else?
-    false
-  end
+    def else?
+      false
+    end
     
-  private
+    private
   
-  def equal_variables(left, right)
-    if left.is_a?(Symbol)
-      if right.respond_to?(left)
-        return right.send(left.to_s) 
-      else
-        return nil
+    def equal_variables(left, right)
+      if left.is_a?(Symbol)
+        if right.respond_to?(left)
+          return right.send(left.to_s) 
+        else
+          return nil
+        end
       end
-    end
 
-    if right.is_a?(Symbol)
-      if left.respond_to?(right)
-        return left.send(right.to_s) 
-      else
-        return nil
+      if right.is_a?(Symbol)
+        if left.respond_to?(right)
+          return left.send(right.to_s) 
+        else
+          return nil
+        end
       end
-    end
 
-    left == right      
-  end    
+      left == right      
+    end    
 
-  def interpret_condition(left, right, op, context)
+    def interpret_condition(left, right, op, context)
 
-    # If the operator is empty this means that the decision statement is just 
-    # a single variable. We can just poll this variable from the context and 
-    # return this as the result.
-    return context[left] if op == nil      
-
-    left, right = context[left], context[right]
-
-    operation = case op
-    when '==' then return equal_variables(left, right)
-    when '!=' then return !equal_variables(left, right)
-    when '<>' then return !equal_variables(left, right)
-    when '>'  then :>
-    when '<'  then :<
-    when '>=' then :>=
-    when '<=' then :<=
-    else
-      raise ArgumentError.new("Error in tag '#{name}' - Unknown operator #{op}")        
-    end
-
-    if left.respond_to?(operation) and right.respond_to?(operation)
-      left.send(operation, right)      
-    else
-      nil
-    end
-  end    
-end
+      # If the operator is empty this means that the decision statement is just 
+      # a single variable. We can just poll this variable from the context and 
+      # return this as the result.
+      return context[left] if op == nil      
 
-class ElseCondition < Condition
-      
-  def else? 
-    true
+      left, right = context[left], context[right]
+
+      operation = self.class.operators[op] || raise(ArgumentError.new("Error in tag '#{name}' - Unknown operator #{op}"))
+
+      if operation.respond_to?(:call)
+        operation.call(self, left, right)
+      elsif left.respond_to?(operation) and right.respond_to?(operation)
+        left.send(operation, right)
+      else
+        nil
+      end
+    end    
   end
+
+  class ElseCondition < Condition
+      
+    def else? 
+      true
+    end
   
-  def evaluate(context)
-    true
+    def evaluate(context)
+      true
+    end
   end
+
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/context.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/context.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/context.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/context.rb	2008-03-31 02:18:56.000000000 -0400
@@ -17,20 +17,18 @@
   #   context['bob']  #=> nil  class Context
   class Context
     attr_reader :scopes
-    attr_reader :template
+    attr_reader :errors, :registers
     
-    def initialize(template)
-      @template   = template
-      @scopes     = [template.assigns]
-    end
+    def initialize(assigns = {}, registers = {}, rethrow_errors = false)
+      @scopes     = [(assigns || {})]
+      @registers  = registers
+      @errors     = []
+      @rethrow_errors = rethrow_errors
+    end    
            
     def strainer
       @strainer ||= Strainer.create(self)
-    end
-    
-    def registers
-      @template.registers
-    end
+    end  
                
     # adds filters to this context. 
     # this does not register the filters with the main Template object. see <tt>Template.register_filter</tt> 
@@ -38,12 +36,22 @@
     def add_filters(filters)
       filters = [filters].flatten.compact
       
-      raise ArgumentError, "Expected module but got: #{filter_module.class}" unless filters.all? { |f| f.is_a?(Module)}
-      
       filters.each do |f|         
+        raise ArgumentError, "Expected module but got: #{f.class}" unless f.is_a?(Module)
         strainer.extend(f)
       end      
     end
+    
+    def handle_error(e)
+      errors.push(e)
+      raise if @rethrow_errors
+      
+      case e
+      when SyntaxError then "Liquid syntax error: #{e.message}"        
+      else "Liquid error: #{e.message}"
+      end
+    end
+    
                               
     def invoke(method, *args)
       if strainer.respond_to?(method)
@@ -115,7 +123,7 @@
     #
     def resolve(key)
       case key
-      when nil
+      when nil, 'nil', 'null', ''
         nil
       when 'true'
         true
@@ -123,8 +131,6 @@
         false
       when 'empty'
         :empty?
-      when 'nil', 'null'
-        nil
       # Single quoted strings
       when /^'(.*)'$/
         $1.to_s
@@ -134,11 +140,15 @@
       # Integer and floats
       when /^(\d+)$/ 
         $1.to_i
+      # Ranges
+      when /^\((\S+)\.\.(\S+)\)$/        
+        (resolve($1).to_i..resolve($2).to_i)
+      # Floats
       when /^(\d[\d\.]+)$/ 
         $1.to_f
       else
         variable(key)
-      end
+      end      
     end
     
     # fetches an object starting at the local scope and then moving up 
@@ -148,7 +158,8 @@
         if scope.has_key?(key)
           variable = scope[key] 
           variable = scope[key] = variable.call(self) if variable.is_a?(Proc)
-          variable.context = self if variable.respond_to?(:context=)                          
+          variable = variable.to_liquid
+          variable.context = self if variable.respond_to?(:context=)
           return variable
         end
       end
@@ -166,7 +177,7 @@
     def variable(markup)
       parts   = markup.scan(VariableParser)      
       
-      if object = find_variable(parts.shift).to_liquid
+      if object = find_variable(parts.shift)
             
         parts.each do |part|        
 
@@ -177,8 +188,9 @@
           if object.respond_to?(:has_key?) and object.has_key?(part)
           
             # if its a proc we will replace the entry in the hash table with the proc
-            object[part] = object[part].call(self) if object[part].is_a?(Proc) and object.respond_to?(:[]=)
-            object = object[part].to_liquid
+            res = object[part]
+            res = object[part] = res.call(self) if res.is_a?(Proc) and object.respond_to?(:[]=)
+            object = res.to_liquid
 
           # Array
           elsif object.respond_to?(:fetch) and part =~ /^\d+$/ 
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/extensions.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/extensions.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/extensions.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/extensions.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,56 +1,56 @@
 require 'time'
 require 'date'
 
-class String
+class String # :nodoc:
   def to_liquid
     self
   end
 end
 
-class Array 
+class Array  # :nodoc:
   def to_liquid
     self
   end
 end
 
-class Hash 
+class Hash  # :nodoc:
   def to_liquid
     self
   end
 end
 
-class Numeric
+class Numeric  # :nodoc:
   def to_liquid
     self
   end
 end
 
-class Time
+class Time  # :nodoc:
   def to_liquid
     self
   end
 end
 
-class DateTime < Date
+class DateTime < Date  # :nodoc:
   def to_liquid
     self
   end
 end
 
-class Date
+class Date  # :nodoc:
   def to_liquid
     self
   end
 end
 
-def true.to_liquid
+def true.to_liquid  # :nodoc:
   self
 end
 
-def false.to_liquid
+def false.to_liquid # :nodoc:
   self
 end
 
-def nil.to_liquid
+def nil.to_liquid # :nodoc:
   self
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/htmltags.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/htmltags.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/htmltags.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/htmltags.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,9 +2,7 @@
   class TableRow < Block                                             
     Syntax = /(\w+)\s+in\s+(#{VariableSignature}+)/   
     
-    def initialize(markup, tokens)
-      super
-
+    def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
         @variable_name = $1
         @collection_name = $2
@@ -15,6 +13,8 @@
       else
         raise SyntaxError.new("Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3")
       end
+      
+      super      
     end
     
     def render(context)        
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tag.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tag.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tag.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tag.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,8 +3,9 @@
   class Tag
     attr_accessor :nodelist
     
-    def initialize(markup, tokens)
-      @markup = markup
+    def initialize(tag_name, markup, tokens)
+      @tag_name   = tag_name
+      @markup     = markup
       parse(tokens)
     end
     
@@ -14,7 +15,7 @@
     def name
       self.class.name.downcase
     end
-    
+        
     def render(context)
       ''
     end    
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/assign.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/assign.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/assign.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/assign.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,19 +1,21 @@
 module Liquid
   class Assign < Tag
-    Syntax = /(\w+)\s*=\s*(#{QuotedFragment}+)/   
+    Syntax = /(#{VariableSignature}+)\s*=\s*(#{QuotedFragment}+)/   
   
-    def initialize(markup, tokens)
+    def initialize(tag_name, markup, tokens)          
       if markup =~ Syntax
         @to = $1
         @from = $2
       else
         raise SyntaxError.new("Syntax Error in 'assign' - Valid syntax: assign [var] = [source]")
       end
+      
+      super      
     end
   
     def render(context)
-       context[@to] = context[@from]
-       ''       
+       context.scopes.last[@to.to_s] = context[@from]
+       ''
     end 
   
   end  
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/capture.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/capture.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/capture.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/capture.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,13 +2,14 @@
   class Capture < Block
     Syntax = /(\w+)/
 
-    def initialize(markup, tokens)
+    def initialize(tag_name, markup, tokens)      
       if markup =~ Syntax
         @to = $1
-        super 
       else
         raise SyntaxError.new("Syntax Error in 'capture' - Valid syntax: capture [var]")
       end
+      
+      super       
     end
 
     def render(context)
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/case.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/case.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/case.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/case.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,7 @@
     Syntax     = /(#{QuotedFragment})/
     WhenSyntax = /(#{QuotedFragment})/
 
-    def initialize(markup, tokens)
+    def initialize(tag_name, markup, tokens)      
       @blocks = []
       
       if markup =~ Syntax
@@ -11,54 +11,65 @@
       else
         raise SyntaxError.new("Syntax Error in tag 'case' - Valid syntax: case [condition]")
       end
-
-      push_block('case', markup)
-      
+            
       super
     end
 
     def unknown_tag(tag, markup, tokens)
-      if ['when', 'else'].include?(tag)
-        push_block(tag, markup)
+      @nodelist = []
+      case tag
+      when 'when'
+        record_when_condition(markup)
+      when 'else'
+        record_else_condition(markup)
       else
         super
       end
     end
 
-    def render(context)
-      @blocks.inject([]) do |output, block|
-
-        if block.else?
-           return render_all(block.attachment, context) if output.empty? || output.join !~ /\S/
-        else
-          
-          if block.evaluate(context)
-            context.stack do          
-              output += render_all(block.attachment, context)
-            end          
-          end
-          
-        end
-              
+    def render(context)      
+      context.stack do          
+        execute_else_block = true
         
-        output
-      end.join
+        @blocks.inject([]) do |output, block|
+      
+          if block.else? 
+            
+            return render_all(block.attachment, context) if execute_else_block
+            
+          elsif block.evaluate(context)
+            
+            execute_else_block = false        
+            output += render_all(block.attachment, context)                    
+          end            
+      
+          output
+        end
+      end          
     end
     
     private
     
-    def push_block(tag, markup)            
-      
-      block = if tag == 'else'
-        ElseCondition.new
-      elsif markup =~ WhenSyntax
-        Condition.new(@left, '==', $1)        
-      else
-        raise SyntaxError.new("Syntax Error in tag 'case' - Valid when condition: when [condition] ")
+    def record_when_condition(markup)                
+      # Create a new nodelist and assign it to the new block
+      if not markup =~ WhenSyntax
+        raise SyntaxError.new("Syntax Error in tag 'case' - Valid when condition: {% when [condition] %} ")
       end
-            
-      @blocks.push(block)      
-      @nodelist = block.attach(Array.new) 
+
+      block = Condition.new(@left, '==', $1)        
+      block.attach(@nodelist)
+      @blocks.push(block)            
+    end
+
+    def record_else_condition(markup)            
+
+      if not markup.strip.empty?
+        raise SyntaxError.new("Syntax Error in tag 'case' - Valid else condition: {% else %} (no parameters) ")
+      end
+         
+      block = ElseCondition.new            
+      block.attach(@nodelist)
+      @blocks << block
     end
     
         
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/cycle.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/cycle.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/cycle.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/cycle.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,7 @@
     SimpleSyntax = /#{QuotedFragment}/        
     NamedSyntax = /(#{QuotedFragment})\s*\:\s*(.*)/
   
-    def initialize(markup, tokens)
+    def initialize(tag_name, markup, tokens)      
       case markup
       when NamedSyntax
       	@variables = variables_from_string($2)
@@ -14,7 +14,8 @@
       else
         raise SyntaxError.new("Syntax Error in 'cycle' - Valid syntax: cycle [name :] var [, var2, var3 ...]")
       end
-    
+
+      super    
     end    
   
     def render(context)
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/for.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/for.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/for.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/for.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,9 +2,7 @@
   class For < Block                                             
     Syntax = /(\w+)\s+in\s+(#{VariableSignature}+)/   
   
-    def initialize(markup, tokens)
-      super
-
+    def initialize(tag_name, markup, tokens)
       if markup =~ Syntax
         @variable_name = $1
         @collection_name = $2
@@ -16,12 +14,15 @@
       else
         raise SyntaxError.new("Syntax Error in 'for loop' - Valid syntax: for [item] in [collection]")
       end
+
+      super
     end
   
     def render(context)        
       context.registers[:for] ||= Hash.new(0)
     
       collection = context[@collection_name]
+      collection = collection.to_a if collection.is_a?(Range)
     
       return '' if collection.nil? or collection.empty?
     
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/if.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/if.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/if.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/if.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,8 +1,9 @@
 module Liquid
   class If < Block
-    Syntax = /(#{QuotedFragment})\s*([=!<>]+)?\s*(#{QuotedFragment})?/
+    Syntax = /(#{QuotedFragment})\s*([=!<>a-z_]+)?\s*(#{QuotedFragment})?/
+    
+    def initialize(tag_name, markup, tokens)    
     
-    def initialize(markup, tokens)    
       @blocks = []
       
       push_block('if', markup)
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/include.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/include.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/tags/include.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/tags/include.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,7 +2,7 @@
   class Include < Tag
     Syntax = /(#{QuotedFragment}+)(\s+(?:with|for)\s+(#{QuotedFragment}+))?/
   
-    def initialize(markup, tokens)
+    def initialize(tag_name, markup, tokens)      
       if markup =~ Syntax
 
         @template_name = $1        
@@ -27,8 +27,7 @@
       source  = Liquid::Template.file_system.read_template_file(context[@template_name])      
       partial = Liquid::Template.parse(source)      
       
-      
-      variable = context[@variable_name]
+      variable = context[@variable_name || @template_name[1..-2]]
       
       context.stack do
         @attributes.each do |key, value|
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/template.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/template.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/template.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/template.rb	2008-03-31 02:18:56.000000000 -0400
@@ -70,19 +70,7 @@
     def errors
       @errors ||= []
     end
-    
-    def handle_error(e)
-      errors.push(e)
-      raise if @rethrow_errors
-      
-      case e
-      when SyntaxError        
-        "Liquid syntax error: #{e.message}"        
-      else
-        "Liquid error: #{e.message}"
-      end      
-    end
-    
+        
     # Render takes a hash with local variables.
     #
     # if you use the same filters over and over again consider registering them globally 
@@ -102,9 +90,9 @@
         args.shift
       when Hash
         self.assigns.merge!(args.shift)        
-        Context.new(self)
+        Context.new(assigns, registers, @rethrow_errors)
       when nil
-        Context.new(self)
+        Context.new(assigns, registers, @rethrow_errors)
       end
       
       case args.last
@@ -123,10 +111,15 @@
       when Array
         context.add_filters(args.pop)            
       end
-                                    
+                              
+                              
       # render the nodelist.
       # for performance reasons we get a array back here. to_s will make a string out of it
-      @root.render(context).to_s
+      begin
+        @root.render(context).to_s
+      ensure
+        @errors = context.errors      
+      end
     end
     
     def render!(*args)
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/variable.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/variable.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid/variable.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid/variable.rb	2008-03-31 02:18:56.000000000 -0400
@@ -6,22 +6,27 @@
     attr_accessor :filters, :name
     
     def initialize(markup)
-      @markup = markup                            
-      @name = markup.match(/\s*(#{QuotedFragment})/)[1]
-      if markup.match(/#{FilterSperator}\s*(.*)/)
-        filters = Regexp.last_match(1).split(/#{FilterSperator}/)
-        
-        @filters = filters.collect do |f|          
-          filtername = f.match(/\s*(\w+)/)[1]
-          filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten            
-          [filtername.to_sym, filterargs]
+      @markup  = markup                            
+      @name    = nil
+      @filters = []
+      if match = markup.match(/\s*(#{QuotedFragment})/)
+        @name = match[1]
+        if markup.match(/#{FilterSperator}\s*(.*)/)
+          filters = Regexp.last_match(1).split(/#{FilterSperator}/)
+
+          filters.each do |f|    
+            if matches = f.match(/\s*(\w+)/)
+              filtername = matches[1]
+              filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*(#{QuotedFragment})/).flatten            
+              @filters << [filtername.to_sym, filterargs]
+            end
+          end
         end
-      else
-        @filters = []
       end
     end                        
 
     def render(context)      
+      return '' if @name.nil?
       output = context[@name]
       @filters.inject(output) do |output, filter|
         filterargs = filter[1].to_a.collect do |a|
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/lib/liquid.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid.rb
--- mephisto-0.7.3/vendor/plugins/liquid/lib/liquid.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/lib/liquid.rb	2008-03-31 02:18:56.000000000 -0400
@@ -28,8 +28,8 @@
   VariableAttributeSeparator  = '.'
   TagStart                    = /\{\%/
   TagEnd                      = /\%\}/
-  VariableSignature           = /[\w\-\.\[\]]/
-  VariableSegment             = /[\w\-]/
+  VariableSignature           = /\(?[\w\-\.\[\]]\)?/
+  VariableSegment             = /[\w\-]\??/
   VariableStart               = /\{\{/
   VariableEnd                 = /\}\}/
   QuotedFragment              = /"[^"]+"|'[^']+'|[^\s,|]+/
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/block_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/block_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/block_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/block_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class VariableTest < Test::Unit::TestCase
   include Liquid
@@ -42,6 +42,14 @@
     assert_equal 3, template.root.nodelist.size
   end
   
+  def test_with_custom_tag 
+    Liquid::Template.register_tag("testtag", Block) 
+     
+    assert_nothing_thrown do 
+      template = Liquid::Template.parse( "{% testtag %} {% endtesttag %}") 
+    end 
+  end
+  
   private
   
   def block_types(nodelist)
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/condition_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/condition_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/condition_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/condition_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/helper'
+
+class ConditionTest < Test::Unit::TestCase
+  include Liquid
+
+  def test_default_operators_evalute_true
+    assert_evalutes_true '1', '==', '1'
+    assert_evalutes_true '1', '!=', '2'
+    assert_evalutes_true '1', '<>', '2'
+    assert_evalutes_true '1', '<', '2'
+    assert_evalutes_true '2', '>', '1'
+    assert_evalutes_true '1', '>=', '1'
+    assert_evalutes_true '2', '>=', '1'
+    assert_evalutes_true '1', '<=', '2'
+    assert_evalutes_true '1', '<=', '1'
+  end
+
+  def test_default_operators_evalute_false
+    assert_evalutes_false '1', '==', '2'
+    assert_evalutes_false '1', '!=', '1'
+    assert_evalutes_false '1', '<>', '1'
+    assert_evalutes_false '1', '<', '0'
+    assert_evalutes_false '2', '>', '4'
+    assert_evalutes_false '1', '>=', '3'
+    assert_evalutes_false '2', '>=', '4'
+    assert_evalutes_false '1', '<=', '0'
+    assert_evalutes_false '1', '<=', '0'
+  end
+
+  def test_should_allow_custom_symbol_operator
+    Condition.operators['contains'] = :[]
+    
+    assert_evalutes_true "'bob'", 'contains', "'o'"
+    assert_evalutes_false "'bob'", 'contains', "'f'"
+  ensure
+    Condition.operators.delete 'contains'
+  end
+
+  def test_should_allow_custom_proc_operator
+    Condition.operators['starts_with'] = Proc.new { |cond, left, right| left =~ %r{^#{right}}}
+    
+    assert_evalutes_true "'bob'", 'starts_with', "'b'"
+    assert_evalutes_false "'bob'", 'starts_with', "'o'"
+  ensure
+    Condition.operators.delete 'starts_with'
+  end
+
+  private
+    def assert_evalutes_true(left, op, right)
+      assert Condition.new(left, op, right).evaluate, "Evaluated false: #{left} #{op} #{right}"
+    end
+    
+    def assert_evalutes_false(left, op, right)
+      assert !Condition.new(left, op, right).evaluate, "Evaluated true: #{left} #{op} #{right}"
+    end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/context_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/context_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/context_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/context_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 class HundredCentes
   def to_liquid
     100
@@ -9,6 +9,10 @@
   def amount
     HundredCentes.new
   end
+  
+  def non_zero?
+    true
+  end
 end
 
 class ContextSensitiveDrop < Liquid::Drop
@@ -17,13 +21,32 @@
   end
 end
 
+class Category < Liquid::Drop
+  attr_accessor :name
+
+  def initialize(name)
+    @name = name
+  end
+
+  def to_liquid
+    CategoryDrop.new(self)
+  end
+end
+
+class CategoryDrop
+  attr_accessor :category, :context
+  def initialize(category)
+    @category = category
+  end
+end
+
 
 class ContextTest < Test::Unit::TestCase
   include Liquid
 
   def setup
     @template = Liquid::Template.new
-    @context = Liquid::Context.new(@template)
+    @context = Liquid::Context.new(@template.assigns, @template.registers)
   end
 
   def test_variables
@@ -53,7 +76,7 @@
     assert_equal nil, @context['nil']
     assert_equal nil, @context['nil']    
   end
-
+  
   def test_variables_not_existing
     assert_equal nil, @context['does_not_exist']
   end
@@ -267,12 +290,17 @@
     @context.merge( "cents" => CentsDrop.new )
     assert_equal 100, @context['cents.amount']     
   end
-
+  
   def test_nested_cents_through_drop
     @context.merge( "vars" => {"cents" => CentsDrop.new} )
     assert_equal 100, @context['vars.cents.amount']     
   end
   
+  def test_drop_methods_with_question_marks
+    @context.merge( "cents" => CentsDrop.new )
+    assert @context['cents.non_zero?']     
+  end
+
   def test_context_from_within_drop
     @context.merge( "test" => '123', "vars" => ContextSensitiveDrop.new )
     assert_equal '123', @context['vars.test']     
@@ -282,6 +310,13 @@
     @context.merge( "test" => '123', "vars" => {"local" => ContextSensitiveDrop.new }  )
     assert_equal '123', @context['vars.local.test']     
   end
+  
+  def test_ranges
+    @context.merge( "test" => '5' )
+    assert_equal (1..5), @context['(1..5)']
+    assert_equal (1..5), @context['(1..test)']
+    assert_equal (5..5), @context['(test..test)']
+  end
 
   def test_cents_through_drop_nestedly
     @context.merge( "cents" => {"cents" => CentsDrop.new} )
@@ -337,4 +372,10 @@
     assert_equal 345392, @context['magic']    
   end
   
+  def test_to_liquid_and_context_at_first_level
+    @context['category'] = Category.new("foobar")
+    assert_kind_of CategoryDrop, @context['category']
+    assert_equal @context, @context['category'].context
+  end
+
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/drop_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/drop_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/drop_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/drop_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,6 +1,6 @@
 
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class ContextDrop < Liquid::Drop
   def scopes
@@ -120,8 +120,10 @@
   def test_scope_with_assigns
     assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{{a}}'  ).render('context' => ContextDrop.new)    
     assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{%for i in dummy%}{{a}}{%endfor%}'  ).render('context' => ContextDrop.new, 'dummy' => [1])    
+    assert_equal 'test', Liquid::Template.parse( '{% assign header_gif = "test"%}{{header_gif}}'  ).render('context' => ContextDrop.new)    
+    assert_equal 'test', Liquid::Template.parse( "{% assign header_gif = 'test'%}{{header_gif}}"  ).render('context' => ContextDrop.new)    
   end
-  
+    
   def test_scope_from_tags
     assert_equal '1', Liquid::Template.parse( '{% for i in context.scopes_as_array %}{{i}}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])    
     assert_equal '12', Liquid::Template.parse( '{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}'  ).render('context' => ContextDrop.new, 'dummy' => [1])    
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/error_handling_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/error_handling_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/error_handling_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/error_handling_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,6 +1,6 @@
 
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class ErrorDrop < Liquid::Drop
   def standard_error
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/extra/binding_of_caller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/extra/binding_of_caller.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/extra/binding_of_caller.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/extra/binding_of_caller.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,80 +0,0 @@
-class Continuation # :nodoc:
-  def self.create(*args, &block) # :nodoc:
-    cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
-    result ||= args
-    return *[cc, *result]
-  end
-end
-
-class Binding; end # for RDoc
-# This method returns the binding of the method that called your
-# method. It will raise an Exception when you're not inside a method.
-#
-# It's used like this:
-#   def inc_counter(amount = 1)
-#     Binding.of_caller do |binding|
-#       # Create a lambda that will increase the variable 'counter'
-#       # in the caller of this method when called.
-#       inc = eval("lambda { |arg| counter += arg }", binding)
-#       # We can refer to amount from inside this block safely.
-#       inc.call(amount)
-#     end
-#     # No other statements can go here. Put them inside the block.
-#   end
-#   counter = 0
-#   2.times { inc_counter }
-#   counter # => 2
-#
-# Binding.of_caller must be the last statement in the method.
-# This means that you will have to put everything you want to
-# do after the call to Binding.of_caller into the block of it.
-# This should be no problem however, because Ruby has closures.
-# If you don't do this an Exception will be raised. Because of
-# the way that Binding.of_caller is implemented it has to be
-# done this way.
-def Binding.of_caller(&block)
-  old_critical = Thread.critical
-  Thread.critical = true
-  count = 0
-  cc, result, error, extra_data = Continuation.create(nil, nil)
-  error.call if error
-
-  tracer = lambda do |*args|
-    type, context, extra_data = args[0], args[4], args
-    if type == "return"
-      count += 1
-      # First this method and then calling one will return --
-      # the trace event of the second event gets the context
-      # of the method which called the method that called this
-      # method.
-      if count == 2
-        # It would be nice if we could restore the trace_func
-        # that was set before we swapped in our own one, but
-        # this is impossible without overloading set_trace_func
-        # in current Ruby.
-        set_trace_func(nil)
-        cc.call(eval("binding", context), nil, extra_data)
-      end
-    elsif type == "line" then
-      nil
-    elsif type == "c-return" and extra_data[3] == :set_trace_func then
-      nil
-    else
-      set_trace_func(nil)
-      error_msg = "Binding.of_caller used in non-method context or " +
-        "trailing statements of method using it aren't in the block."
-      cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
-    end
-  end
-
-  unless result
-    set_trace_func(tracer)
-    return nil
-  else
-    Thread.critical = old_critical
-    case block.arity
-      when 1 then yield(result)
-      else yield(result, extra_data)        
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/extra/breakpoint.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/extra/breakpoint.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/extra/breakpoint.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/extra/breakpoint.rb	2008-03-31 02:18:56.000000000 -0400
@@ -16,7 +16,7 @@
 # license please contact me.
 
 require 'irb'
-require 'binding_of_caller'
+require 'caller'
 require 'drb'
 require 'drb/acl'
 require 'thread'
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/extra/caller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/extra/caller.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/extra/caller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/extra/caller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,80 @@
+class Continuation # :nodoc:
+  def self.create(*args, &block) # :nodoc:
+    cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
+    result ||= args
+    return *[cc, *result]
+  end
+end
+
+class Binding; end # for RDoc
+# This method returns the binding of the method that called your
+# method. It will raise an Exception when you're not inside a method.
+#
+# It's used like this:
+#   def inc_counter(amount = 1)
+#     Binding.of_caller do |binding|
+#       # Create a lambda that will increase the variable 'counter'
+#       # in the caller of this method when called.
+#       inc = eval("lambda { |arg| counter += arg }", binding)
+#       # We can refer to amount from inside this block safely.
+#       inc.call(amount)
+#     end
+#     # No other statements can go here. Put them inside the block.
+#   end
+#   counter = 0
+#   2.times { inc_counter }
+#   counter # => 2
+#
+# Binding.of_caller must be the last statement in the method.
+# This means that you will have to put everything you want to
+# do after the call to Binding.of_caller into the block of it.
+# This should be no problem however, because Ruby has closures.
+# If you don't do this an Exception will be raised. Because of
+# the way that Binding.of_caller is implemented it has to be
+# done this way.
+def Binding.of_caller(&block)
+  old_critical = Thread.critical
+  Thread.critical = true
+  count = 0
+  cc, result, error, extra_data = Continuation.create(nil, nil)
+  error.call if error
+
+  tracer = lambda do |*args|
+    type, context, extra_data = args[0], args[4], args
+    if type == "return"
+      count += 1
+      # First this method and then calling one will return --
+      # the trace event of the second event gets the context
+      # of the method which called the method that called this
+      # method.
+      if count == 2
+        # It would be nice if we could restore the trace_func
+        # that was set before we swapped in our own one, but
+        # this is impossible without overloading set_trace_func
+        # in current Ruby.
+        set_trace_func(nil)
+        cc.call(eval("binding", context), nil, extra_data)
+      end
+    elsif type == "line" then
+      nil
+    elsif type == "c-return" and extra_data[3] == :set_trace_func then
+      nil
+    else
+      set_trace_func(nil)
+      error_msg = "Binding.of_caller used in non-method context or " +
+        "trailing statements of method using it aren't in the block."
+      cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
+    end
+  end
+
+  unless result
+    set_trace_func(tracer)
+    return nil
+  else
+    Thread.critical = old_critical
+    case block.arity
+      when 1 then yield(result)
+      else yield(result, extra_data)        
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/file_system_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/file_system_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/file_system_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/file_system_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class FileSystemTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/filter_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/filter_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/filter_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/filter_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 
 module MoneyFilter
@@ -23,7 +23,7 @@
   include Liquid
   
   def setup
-    @context = Context.new(Liquid::Template.new)
+    @context = Context.new
   end
     
   def test_local_filter    
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/helper.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__)+ '/extra')
+
+require 'test/unit'
+require 'test/unit/assertions'
+require 'caller'
+require 'breakpoint'
+require File.dirname(__FILE__) + '/../lib/liquid'
+
+
+module Test
+  module Unit
+    module Assertions
+        include Liquid
+        def assert_template_result(expected, template, assigns={}, message=nil)
+          assert_equal expected, Template.parse(template).render(assigns)
+        end 
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/html_tag_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/html_tag_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/html_tag_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/html_tag_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class HtmlTagTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/if_else_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/if_else_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/if_else_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/if_else_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class IfElseTest < Test::Unit::TestCase
   include Liquid
@@ -92,4 +92,13 @@
   def test_syntax_error_no_variable
     assert_raise(SyntaxError){ assert_template_result('', '{% if jerry == 1 %}')}
   end
+  
+  def test_if_with_custom_condition
+    Condition.operators['contains'] = :[]
+    
+    assert_template_result('yes', %({% if 'bob' contains 'o' %}yes{% endif %}))
+    assert_template_result('no', %({% if 'bob' contains 'f' %}yes{% else %}no{% endif %}))
+  ensure
+    Condition.operators.delete 'contains'
+  end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/include_tag_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/include_tag_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/include_tag_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/include_tag_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class TestFileSystem 
   def read_template_file(template_path)
@@ -40,6 +40,11 @@
                  Template.parse("{% include 'product' with products[0] %}").render( "products" => [ {'title' => 'Draft 151cm'}, {'title' => 'Element 155cm'} ]  )
   end
 
+  def test_include_tag_with_default_name    
+    assert_equal "Product: Draft 151cm ", 
+                 Template.parse("{% include 'product' %}").render( "product" => {'title' => 'Draft 151cm'}  )
+  end
+
   def test_include_tag_for
     
     assert_equal "Product: Draft 151cm Product: Element 155cm ", 
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/output_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/output_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/output_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/output_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 module FunnyFilter
   
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/parsing_quirks_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/parsing_quirks_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/parsing_quirks_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/parsing_quirks_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class ParsingQuirksTest < Test::Unit::TestCase
   include Liquid
@@ -11,4 +11,12 @@
     assert_equal text, template.render
     assert_equal [String], template.root.nodelist.collect {|i| i.class}
   end
+  
+  def test_error_on_empty_filter
+    assert_nothing_raised do
+      Template.parse("{{test |a|b|}}")      
+      Template.parse("{{test}}")      
+      Template.parse("{{|test|}}")      
+    end
+  end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/regexp_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/regexp_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/regexp_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/regexp_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
    
 class RegexpTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/security_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/security_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/security_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/security_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 module SecurityFilter
   def add_one(input)
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/standard_filter_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/standard_filter_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/standard_filter_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/standard_filter_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 
 class Filters
@@ -45,7 +45,8 @@
   def test_truncatewords
     assert_equal 'one two three', @filters.truncatewords('one two three', 4)
     assert_equal 'one two...', @filters.truncatewords('one two three', 2)
-    assert_equal 'one two three', @filters.truncatewords('one two three')    
+    assert_equal 'one two three', @filters.truncatewords('one two three')
+    assert_equal 'Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221;...', @filters.truncatewords('Two small (13&#8221; x 5.5&#8221; x 10&#8221; high) baskets fit inside one large basket (13&#8221; x 16&#8221; x 10.5&#8221; high) with cover.', 15)    
   end
   
   def test_strip_html
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/standard_tag_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/standard_tag_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/standard_tag_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/standard_tag_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 
-class TemplateTest < Test::Unit::TestCase
+class StandardTagTest < Test::Unit::TestCase
   include Liquid
   
   
   def test_tag 
-    tag = Tag.new([], [])
+    tag = Tag.new('tag', [], [])
     assert_equal 'liquid::tag', tag.name 
-    assert_equal '', tag.render(Context.new(Liquid::Template.new))    
+    assert_equal '', tag.render(Context.new)    
   end
   
   def test_no_transform
@@ -69,6 +69,10 @@
 HERE
     assert_template_result(expected,template,'array' => [1,2,3])
   end
+  
+  def test_for_with_range
+    assert_template_result(' 1  2  3 ','{%for item in (1..3) %} {{item}} {%endfor%}')    
+  end
 
   def test_for_with_variable
     assert_template_result(' 1  2  3 ','{%for item in array%} {{item}} {%endfor%}','array' => [1,2,3])
@@ -275,6 +279,25 @@
     assert_template_result('else',  '{% case NULL %}{% when true %}true{% when false %}false{% else %}else{% endcase %}', {})     
   end
   
+  def test_assign_from_case    
+    # Example from the shopify forums
+    code = %q({% case collection.handle %}{% when 'menswear-jackets' %}{% assign ptitle = 'menswear' %}{% when 'menswear-t-shirts' %}{% assign ptitle = 'menswear' %}{% else %}{% assign ptitle = 'womenswear' %}{% endcase %}{{ ptitle }})
+    template = Liquid::Template.parse(code)
+    assert_equal "menswear",   template.render("collection" => {'handle' => 'menswear-jackets'})
+    assert_equal "menswear",   template.render("collection" => {'handle' => 'menswear-t-shirts'})
+    assert_equal "womenswear", template.render("collection" => {'handle' => 'x'})
+    assert_equal "womenswear", template.render("collection" => {'handle' => 'y'})
+    assert_equal "womenswear", template.render("collection" => {'handle' => 'z'})
+  end
+  
+  def test_assign
+    assert_equal 'variable', Liquid::Template.parse( '{% assign a = "variable"%}{{a}}'  ).render            
+  end
+  
+  def test_assign_is_global
+    assert_equal 'variable', Liquid::Template.parse( '{%for i in (1..2) %}{% assign a = "variable"%}{% endfor %}{{a}}'  ).render        
+  end  
+  
   def test_case_detects_bad_syntax
     assert_raise(SyntaxError) do
       assert_template_result('',  '{% case false %}{% when %}true{% endcase %}', {})     
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/statements_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/statements_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/statements_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/statements_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class StatementsTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/strainer_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/strainer_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/strainer_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/strainer_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class StrainerTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/template_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/template_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/template_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/template_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class TemplateTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/test_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/test_helper.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/test_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/test_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,7 @@
 
 require 'test/unit'
 require 'test/unit/assertions'
-require 'binding_of_caller'
+require 'caller'
 require 'breakpoint'
 require File.dirname(__FILE__) + '/../lib/liquid'
 
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/unless_else_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/unless_else_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/unless_else_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/unless_else_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class UnlessElseTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/liquid/test/variable_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/variable_test.rb
--- mephisto-0.7.3/vendor/plugins/liquid/test/variable_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/liquid/test/variable_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(__FILE__) + '/helper'
 
 class VariableTest < Test::Unit::TestCase
   include Liquid
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/base.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/base.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/base.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/base.rb	2008-03-31 02:18:56.000000000 -0400
@@ -42,6 +42,14 @@
   def old_users
     raise NotImplementedError
   end
+  
+  # override this to find all assets from the source database.
+  # Save them to @old_assets.
+  #
+  #   @old_assets = Asset.find(:all)
+  def old_assets
+    raise NotImplementedError
+  end
 
   # override this to retrieve the login name from the source user model
   def get_login(other_user)
@@ -136,7 +144,7 @@
       article.site        = site
       article.user      ||= default_user
       article.updater   ||= default_user
-      article.filter    ||= 'textile_filter'
+      article.filter    ||= "#{@options[:filter] || :textile}_filter"
       article.author_ip ||= '127.0.0.1'
       article.save!
       @article_index[other_article] = article
@@ -152,7 +160,7 @@
     ActiveRecord::Base.logger.info "adding comment"
     returning block.call(other_comment) do |comment|
       comment.article_id  = article.id
-      comment.filter    ||= 'textile_filter'
+      comment.filter    ||= site.filter
       comment.author_ip ||= '127.0.0.1'
       comment.approved    = true
       comment.save!
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/author.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/author.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/author.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/author.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+module MovableType
+  class Author < ActiveRecord::Base
+    set_table_name 'mt_author'
+    set_primary_key 'author_id'
+    establish_connection configurations['mt3']
+
+    has_many :comments, :foreign_key => 'comment_author_id', :class_name => 'MovableType::Comment'
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/blog.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/blog.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/blog.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/blog.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+module MovableType
+  class Blog < ActiveRecord::Base
+    set_table_name 'mt_blog'
+    set_primary_key 'blog_id'
+    establish_connection configurations['mt3']
+    
+    has_many :entries, :foreign_key => 'entry_blog_id', :class_name => 'MovableType::Entry'
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/category.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/category.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/category.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/category.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+module MovableType
+  class Category < ActiveRecord::Base
+    set_table_name 'mt_category'
+    set_primary_key 'category_id'
+    establish_connection configurations['mt3']
+
+    belongs_to :blog, :foreign_key => 'category_blog_id', :class_name => 'MovableType::Blog'
+    has_many :entries, :foreign_key => 'category_entry_id', :class_name => 'MovableType::Entry'
+
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/comment.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/comment.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/comment.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/comment.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+module MovableType
+  class Comment < ActiveRecord::Base
+    set_table_name 'mt_comment'
+    set_primary_key 'comment_id'
+    establish_connection configurations['mt3']
+
+    belongs_to :entry, :foreign_key => 'comment_entry_id', :class_name => 'MovableType::Entry'
+    belongs_to :blog, :foreign_key => 'comment_blog_id', :class_name => 'MovableType::Blog'
+    belongs_to :author, :foreign_key => 'comment_commenter_id', :class_name => 'MovableType::Author'
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/entry.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/entry.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/entry.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/entry.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+module MovableType
+  class Entry < ActiveRecord::Base
+    set_table_name 'mt_entry'
+    set_primary_key 'entry_id'
+    establish_connection configurations['mt3']
+
+    belongs_to :blog, :foreign_key => 'entry_blog_id', :class_name => 'MovableType::Blog'
+    belongs_to :author, :foreign_key => 'entry_author_id', :class_name => 'MovableType::Author'
+    has_many :comments, :foreign_key => 'comment_entry_id', :class_name => 'MovableType::Comment'
+    belongs_to :category, :foreign_key => 'entry_category_id', :class_name => 'MovableType::Category'
+    has_many :placements, :foreign_key => 'placement_entry_id', :class_name => 'MovableType::Placement'
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/placement.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/placement.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type/placement.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type/placement.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+module MovableType
+  class Placement < ActiveRecord::Base
+    set_table_name 'mt_placement'
+    set_primary_key 'placement_id'
+    establish_connection configurations['mt3']
+
+    belongs_to :blog, :foreign_key => 'placement_blog_id', :class_name => 'MovableType::Blog'
+    belongs_to :entry, :foreign_key => 'placement_entry_id', :class_name => 'MovableType::Entry'
+    belongs_to :category, :foreign_key => 'placement_category_id', :class_name => 'MovableType::Category'
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/movable_type.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/movable_type.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,91 @@
+require 'converters/movable_type/blog'
+require 'converters/movable_type/entry'
+require 'converters/movable_type/comment'
+require 'converters/movable_type/author'
+require 'converters/movable_type/category'
+require 'converters/movable_type/placement'
+
+class MovableTypeConverter < BaseConverter
+  cattr_accessor :old_site
+  
+  def self.convert(options = {})
+    converter = new(options)
+    self.old_site = MovableType::Blog.find(options[:blog_id])
+
+    converter.import_users do |mt_user|
+      ::User.new \
+        :login                    => mt_user.author_name,
+        :email                    => mt_user.author_email || "#{mt_user.author_login}@notfound.com",
+        :password                 => new_user_password,
+        :password_confirmation    => new_user_password
+    end
+
+    converter.import_articles do |mt_article|
+      user = converter.users[mt_article.author.user_login] rescue nil
+      ::Article.new \
+        :title        => mt_article.entry_title, 
+        :excerpt      => mt_article.entry_excerpt, 
+        :body         => "#{mt_article.entry_text}#{"\n" unless mt_article.entry_text[-1..-1] == "\n"}#{mt_article.entry_text_more}",
+        :created_at   => mt_article.entry_created_on,
+        :published_at => mt_article.entry_created_on,
+        :updated_at   => mt_article.entry_modified_on,
+        :user         => user,
+        :updater      => user,
+        :tag          => mt_article.placements.collect {|p| p.category.category_label},
+        :section_ids  => converter.find_or_create_sections(mt_article)
+    end
+    
+    converter.import_comments do |mt_comment|
+      user = converter.users[mt_comment.commenter.user_login] rescue nil
+      ::Comment.new \
+        :body         => mt_comment.comment_text,
+        :created_at   => mt_comment.comment_created_on,
+        :updated_at   => mt_comment.comment_modified_on,
+        :published_at => mt_comment.comment_created_on,
+        :author       => mt_comment.comment_author,
+        :author_url   => mt_comment.comment_url,
+        :author_email => mt_comment.comment_email,
+        :author_ip    => mt_comment.comment_ip,
+        :user         => user
+    end
+  end
+
+  def old_articles
+    @old_articles ||= self.class.old_site.entries.find_by_entry_status(2)  # published
+  end
+
+  def old_users
+    @old_users ||= begin
+      MovableType::Author.find(:all).index_by &:author_name
+    end
+  end
+
+  def get_login(mt_user)
+    mt_user.author_name
+  end
+
+  def handle_bad_user_email(mt_user, email)
+    mt_user.author_email = email
+  end
+
+  def handle_bad_comment_author_email(mt_comment, email)
+    mt_comment.comment_email = email
+  end
+  
+  def handle_bad_comment_author_url(mt_comment, url)
+    mt_comment.comment_url = url
+  end
+  
+  def handle_bad_comment_author(mt_comment, author)
+    mt_comment.comment_author = author
+  end
+  
+  def handle_bad_comment_content(mt_comment, content)
+    mt_comment.comment_text = content
+  end
+  
+  def find_or_create_sections(mt_article)
+    cat_name = mt_article.category.category_label rescue ""
+    sections[::Section.permalink_for(cat_name)] || site.sections.create(:name => cat_name)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/article.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/article.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/article.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/article.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,6 @@
 module Typo
   class Article < Content
+    belongs_to :user
     has_many :comments, :dependent => true, :order => "created_at ASC", :class_name => 'Typo::Comment'
     has_and_belongs_to_many :tags, :class_name => 'Typo::Tag'
     has_and_belongs_to_many :categories, :class_name => 'Typo::Category'
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/content.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/content.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/content.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/content.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,5 +2,9 @@
   class Content < ActiveRecord::Base
     establish_connection configurations['typo']
     set_table_name 'contents'
+    belongs_to :text_filter, :class_name => 'Typo::TextFilter'
+    def filter
+      self.text_filter ? self.text_filter.name : nil
+    end
   end
 end
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/page.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/page.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/page.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/page.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,9 @@
 module Typo
   class Page < Content
     establish_connection configurations['typo']
+    belongs_to :user
+    def comments
+      []
+    end
   end
 end
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/text_filter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/text_filter.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo/text_filter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo/text_filter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+module Typo
+  class TextFilter < ActiveRecord::Base
+    establish_connection configurations['typo']
+    has_and_belongs_to_many :articles, :class_name => 'Typo::Filter'
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/typo.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/typo.rb	2008-03-31 02:18:56.000000000 -0400
@@ -5,42 +5,55 @@
 require 'converters/typo/category'
 require 'converters/typo/user'
 require 'converters/typo/tag'
+require 'converters/typo/text_filter'
 
 class TypoConverter < BaseConverter
   def self.convert(options = {})
     converter = new(options)
     converter.import_users do |typo_user|
-      ::User.new \
+      new_user = ::User.new \
         :email => typo_user.email || "#{typo_user.login}@notfound.com",
         :login                    => typo_user.login,
         :password                 => new_user_password,
         :password_confirmation    => new_user_password
+      converter.users[typo_user.login] = new_user
     end
     converter.import_articles do |typo_article|
       unless typo_article.body.blank? || typo_article.title.blank?
-        user = typo_article.user_id.nil? ? nil : converter.users[Typo::User.find(typo_article.user_id).login]
+        user = typo_article.user_id.nil? ? nil : converter.users[typo_article.user.login]
         
         excerpt, body = !typo_article.extended.blank? ?
           [typo_article.body, typo_article.extended] :
           [nil, typo_article.body]
         
+        if typo_article.is_a?(Typo::Page)
+          sec_ids = [converter.find_or_create_section("pages", "pages", true).id]
+          tag_string = ""
+        else # standard Article
+          sec_ids = converter.find_or_create_sections(typo_article)
+          tag_string = typo_article.tags.collect(&:name) * ', '
+        end
         ::Article.new \
           :title        => typo_article.title, 
           :excerpt      => excerpt,
           :body         => body,
+          :filter       => typo_article.filter ? typo_article.filter + "_filter" : (user.filter || converter.site.filter),
+          :permalink    => typo_article.permalink,
           :created_at   => typo_article.created_at,
           :published_at => typo_article.created_at,
           :updated_at   => typo_article.updated_at,
           :user         => user,
           :updater      => user,
-          :section_ids  => converter.find_or_create_sections(typo_article),
-          :tag          => typo_article.tags.collect(&:name) * ','
+          :section_ids  => sec_ids,
+          :tag          => tag_string,
+          :filter       => converter.old_filters
       end
     end
     
     converter.import_comments do |typo_comment|
       ::Comment.new \
         :body         => typo_comment.body,
+        :filter       => typo_comment.filter ? typo_comment.filter + "_filter" : converter.site.filter,
         :created_at   => typo_comment.created_at,
         :updated_at   => typo_comment.updated_at,
         :published_at => typo_comment.created_at,
@@ -51,12 +64,19 @@
     end
   end
 
+  def old_filters
+    @old_filters ||= {
+      Typo::TextFilter.find_by_name("markdown").id             => "markdown_filter",
+      Typo::TextFilter.find_by_name("markdown smartypants").id => "smartypants_filter",
+      Typo::TextFilter.find_by_name("textile").id              => "textile_filter" }
+  end
+
   def old_articles
-    @old_articles ||= Typo::Article.find_all_by_type('Article')
+    @old_articles ||= ( Typo::Page.find(:all) + Typo::Article.find(:all) )
   end
 
   def old_users
-    @old_users ||= Typo::User.find(:all).index_by &:login
+    @old_users ||= Typo::User.find(:all).index_by(&:login)
   end
 
   def handle_bad_comment_author_email(typo_comment, email)
@@ -74,7 +94,17 @@
   def find_or_create_sections(typo_article)
     home_section = sections['']
     typo_article.categories.inject([home_section.id]) do |memo, cat|
-      memo << (sections[::Section.permalink_for(cat.name)] || site.sections.create(:name => cat.name)).id
+      memo << find_or_create_section(cat.name, cat.permalink).id
+    end
+  end
+
+  def find_or_create_section(name, permalink, paged = false)
+    unless sec = sections[permalink]
+      sec = site.sections.create(:name => name, :path => permalink, :show_paged_articles => paged)
+      sec.save!
+      sections[permalink] = sec
     end
+    sec
   end
+
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/category.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/category.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/category.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/category.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,10 +0,0 @@
-module WordPress
-  class Category < ActiveRecord::Base
-    set_table_name 'wp_categories'
-    set_primary_key 'cat_ID'
-    establish_connection configurations['wp']
-    #has_many :posts, :through => :post_categories, :class_name => 'WordPress::Post'
-    # user WordPress::Post.find_by_category since hasmanythrough didn't work
-    # for some reason. beats me why. gotta check it out later on...
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/post.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/post.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/post.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/post.rb	2008-03-31 02:18:56.000000000 -0400
@@ -4,11 +4,26 @@
     set_primary_key 'ID'
     establish_connection configurations['wp']
     has_many :comments, :foreign_key => 'comment_parent', :class_name => 'WordPress::Comment'
-   
+    has_many :term_relationships, :foreign_key => 'object_id'
+    has_many :term_taxonomies, :through => :term_relationships,
+             :class_name => 'WordPress::TermTaxonomy'
+
     def categories
-      category_ids = WordPress::PostCategory.find_all_by_post_id(self.ID)
-      categories = category_ids.inject([]) {|categories, postcat| categories << WordPress::Category.find_by_cat_ID(postcat.category_id) }
-      categories
+      term_taxonomies.inject([]) do |list, taxonomy|
+        if taxonomy.taxonomy.eql?('category')
+          list << taxonomy.term.name
+        end
+        list
+      end
+    end
+
+    def tags
+      term_taxonomies.inject([]) do |list, taxonomy|
+        if taxonomy.taxonomy.eql?('post_tag')
+          list << taxonomy.term.name
+        end
+        list
+      end
     end
 
     def comments
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/post_category.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/post_category.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/post_category.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/post_category.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,9 +0,0 @@
-module WordPress
-  class PostCategory < ActiveRecord::Base
-    set_table_name 'wp_post2cat'
-    set_primary_key 'rel_id'
-    establish_connection configurations['wp']
-    belongs_to :category, :class_name => 'WordPress::Category', :foreign_key => 'category_id'
-    belongs_to :post, :class_name => 'WordPress::Post', :foreign_key => 'post_id'
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/term.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/term.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/term.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/term.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+module WordPress
+  class Term < ActiveRecord::Base
+    set_table_name 'wp_terms'
+    set_primary_key 'term_id'
+    establish_connection configurations['wp']
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/term_relationship.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/term_relationship.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/term_relationship.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/term_relationship.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+module WordPress
+  class TermRelationship < ActiveRecord::Base
+    set_table_name 'wp_term_relationships'
+    establish_connection configurations['wp']
+    
+    belongs_to :post
+    belongs_to :term_taxonomy
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/term_taxonomy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/term_taxonomy.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press/term_taxonomy.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press/term_taxonomy.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,15 @@
+module WordPress
+  class TermTaxonomy < ActiveRecord::Base
+    set_table_name 'wp_term_taxonomy'
+    set_primary_key 'term_taxonomy_id'
+    establish_connection configurations['wp']
+        
+    has_many :term_relationships, :foreign_key => 'term_taxonomy_id'
+    has_many :posts, :through => :term_relationships,
+             :class_name => 'WordPress::Post'
+    
+    def term
+      WordPress::Term.find_by_term_id(term_id)
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press.rb
--- mephisto-0.7.3/vendor/plugins/mephisto_converters/lib/converters/word_press.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mephisto_converters/lib/converters/word_press.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,8 +1,9 @@
 require 'converters/word_press/post'
 require 'converters/word_press/comment'
-require 'converters/word_press/category'
-require 'converters/word_press/post_category'
 require 'converters/word_press/user'
+require 'converters/word_press/term'
+require 'converters/word_press/term_relationship'
+require 'converters/word_press/term_taxonomy'
 class WordPressConverter < BaseConverter
   def self.convert(options = {})
     converter = new(options)
@@ -32,7 +33,8 @@
           :user         => user,
           :updater      => user,
           :tag          => converter.tagging_from_sections(wp_article),
-          :section_ids  => converter.find_or_create_sections(wp_article)
+          :section_ids  => converter.find_or_create_sections(wp_article),
+          :filter       => ''
       end
     end
     
@@ -82,16 +84,20 @@
   end
   
   def tagging_from_sections(wp_article)
-    tags = wp_article.categories.inject([]) do |memo, cat|
-      memo << cat.category_nicename
-    end
-    tags.join(',')
+    wp_article.tags.join(',')
   end
 
   def find_or_create_sections(wp_article)
     home_section = sections['']
     wp_article.categories.inject([home_section.id]) do |memo, cat|
-      memo << (sections[::Section.permalink_for(cat.cat_name)] || site.sections.create(:name => cat.cat_name)).id
+      existing = Section.find_by_name(cat)
+      if (existing)
+        memo << existing.id
+      else
+        new = site.sections.create(:name => cat)
+        new.save!
+        memo << new.id
+      end
     end
   end
 end
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/README
--- mephisto-0.7.3/vendor/plugins/mocha/README	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/README	2008-03-31 02:18:56.000000000 -0400
@@ -1,12 +1,12 @@
 = Mocha
 
-Mocha is a library for mocking and stubbing within a TestCase[http://www.ruby-doc.org/core/classes/Test/Unit.html] using a syntax like that of JMock[http://www.jmock.org], and SchMock[http://rubyforge.org/projects/schmock].
+Mocha is a library for mocking and stubbing using a syntax like that of JMock[http://www.jmock.org], and SchMock[http://rubyforge.org/projects/schmock]. Most commonly Mocha is used in conjunction with Test::Unit[http://www.ruby-doc.org/core/classes/Test/Unit.html], but it can be used in other contexts.
 
-One of its main advantages is that it allows you to mock and stub methods on _real_ (non-mock) classes and instances. You can for example stub ActiveRecord[http://api.rubyonrails.com/classes/ActiveRecord/Base.html] instance methods like +create+, +save+, +destroy+ and even class methods like +find+ to avoid hitting the database in unit tests. This is a feature that is not currently offered by other Ruby[http://www.ruby-doc.org/] mocking libraries like FlexMock[http://onestepback.org/software/flexmock] and RSpec[http://rspec.rubyforge.org].
+One of its main advantages is that it allows you to mock and stub methods on _real_ (non-mock) classes and instances. You can for example stub ActiveRecord[http://api.rubyonrails.com/classes/ActiveRecord/Base.html] instance methods like +create+, +save+, +destroy+ and even class methods like +find+ to avoid hitting the database in unit tests.
 
-Mocha provides a unified, simple and readable syntax for both traditional mocking and for mocking with non-mock objects.
+Mocha provides a unified, simple and readable syntax for both traditional mocking and for mocking with _real_ objects.
 
-Mocha has been harvested from projects at Reevoo[http://www.reevoo.com] by me (James[http://blog.floehopper.org]) and my colleagues Ben[http://www.reevoo.com/blogs/bengriffiths/], Chris[http://blog.seagul.co.uk] and Paul[http://po-ru.com]. Mocha is in use on real-world Rails[http://www.rubyonrails.org] projects.
+Mocha has been harvested from projects at Reevoo[http://www.reevoo.com] by me (James[http://blog.floehopper.org]) and my colleagues Ben[http://www.reevoo.com/blogs/bengriffiths], Chris[http://blog.seagul.co.uk] and Paul[http://po-ru.com]. Mocha is in use on real-world Rails[http://www.rubyonrails.org] projects.
 
 == Download and Installation
 
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/RELEASE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/RELEASE
--- mephisto-0.7.3/vendor/plugins/mocha/RELEASE	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/RELEASE	2008-03-31 02:18:56.000000000 -0400
@@ -1,3 +1,35 @@
+= 0.4.0
+
+- Allow naming of mocks (patch from Chris Roos).
+- Specify multiple return values for consecutive calls.
+- Improved consistency of expectation error messages.
+- Allow mocking of Object instance methods e.g. kind_of?, type.
+- Provide aliased versions of #expects and #stubs to allow mocking of these methods.
+- Added at_least, at_most, at_most_once methods to expectation.
+- Allow expects and stubs to take a hash of method and return values.
+- Eliminate warning: "instance variable @yield not initialized" (patch from Xavier Shay).
+- Restore instance methods on partial mocks (patch from Chris Roos).
+- Allow stubbing of a method with non-word characters in its name (patch from Paul Battley).
+- Removed coupling to Test::Unit.
+- Allow specified exception instance to be raised (patch from Chris Roos).
+- Make mock object_id appear in hex like normal Ruby inspect (patch from Paul Battley).
+- Fix path to object.rb in rdoc rake task (patch from Tomas Pospisek).
+- Reverse order in which expectations are matched, so that last expectation is matched first. This allows e.g. a call to #stubs to be effectively overridden by a call to #expects (patch from Tobias Lutke).
+- Stubba & SmartTestCase modules incorporated into Mocha module so only need to require 'mocha' - no longer need to require 'stubba'.
+- AutoMocha removed.
+
+= 0.3.3
+
+- Quick bug fix to restore instance methods on partial mocks (for Kevin Clark).
+
+= 0.3.2
+
+- Examples added.
+
+= 0.3.1
+
+- Dual licensing with MIT license added.
+
 = 0.3.0
 
 * Rails plugin.
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/Rakefile
--- mephisto-0.7.3/vendor/plugins/mocha/Rakefile	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -4,7 +4,7 @@
 require 'rake/contrib/sshpublisher'
 
 module Mocha
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end
 
 desc "Default task is currently to run all tests"
@@ -23,7 +23,7 @@
   task.rdoc_dir = 'doc'
   task.template = "html_with_google_analytics"
   task.options << "--line-numbers" << "--inline-source"
-  task.rdoc_files.include('README', 'RELEASE', 'COPYING', 'MIT-LICENSE', 'agiledox.txt', 'lib/mocha/auto_verify.rb', 'lib/mocha/mock_methods.rb', 'lib/mocha/expectation.rb', 'lib/stubba/object.rb')
+  task.rdoc_files.include('README', 'RELEASE', 'COPYING', 'MIT-LICENSE', 'agiledox.txt', 'lib/mocha/auto_verify.rb', 'lib/mocha/mock_methods.rb', 'lib/mocha/expectation.rb', 'lib/mocha/object.rb')
 end
 task :rdoc => :examples
 
@@ -88,7 +88,7 @@
   s.rdoc_options << '--title' << 'Mocha' << '--main' << 'README' << '--line-numbers'
                          
   s.autorequire = 'mocha'
-  s.files = FileList['{lib,test}/**/*.rb', '[A-Z]*'].exclude('TODO').to_a
+  s.files = FileList['{lib,test,examples}/**/*.rb', '[A-Z]*'].exclude('TODO').to_a
 	s.test_file = "test/all_tests.rb"
 end
 
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/TODO technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/TODO
--- mephisto-0.7.3/vendor/plugins/mocha/TODO	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/TODO	2008-03-31 02:18:56.000000000 -0400
@@ -1,30 +1,57 @@
-- provide test::unit agnostic api - mockery/context type objects on which the user must call setup/teardown?
+=> plugin
+- maybe remove redundant require 'test_help' from init.rb - see mocha mailing list thread with subject "SslRequirements plugin and mocha"
+
+=> release management
+- update RELEASE file for all releases after 0.3.0
+- why does gem rdoc include all source files? what about other package types?
+- why does zip include Rakefile? what about other package types?
+- tags for repos
+- automate releases cf rspec
+- continuous integration build
+- trac?
+
+=> restrict partial mocks to existing public methods?
+- allow specification of class to be mocked, so we can check for existence of methods
+- investigate where/why check for existence of stubbed method has gone.
+- allow stubbing of private/protected methods? - force_stub?
+
+=> multiple expectations for same method
+- look at JMock for examples of when multiple expectations match
 - increment actual count for ANY expectation that matches - see email from Bryan Helmkamp
-- add multiyield - see email from Jay Fields
 - think about allowing a stubbing expectation to be converted to an asserting expectation and vice versa
 - fail fast if expectation count exceeded during test...? c.f. JMock?
-- object methods needed for mocha itself should be aliased to __xx__ versions
-- maybe introduce blank_mock() and blank_stub() methods or make Stub include Object methods and Mock not...?
-- tags for repos
-- read and improve tutorial emailed by user
+- think about behaviour when more than one expectation/stubbed method match c.f. JMock?
+
+=> reduce footprint of mocha in terms of visible methods
+- do away with __is_a__ method if possible - Proc param may no longer be needed
+- add similar test to test_should_be_able_to_mock_standard_object_methods for partial mocks - rename non-public method with underscores e.g. mocha, reset_mocha, stubba_method, stubba_object, etc.
 - reduce number of methods added to Object, Class etc to bare minimum
 - reduce number of methods excluded from undef in mock_methods (maybe use blank_slate as mocha parent class to allow mocking of standard object methods?)
-- should we get two errors when unexpected method is called and similar expectation is not fulfilled? i.e. should we raise error in teardown if one has already been raised in test?
+- perhaps only add methods to particular class at point where expects or stubs gets called
+- provide some means to un-stubba an object - ideally should restore any methods with same names as stubba methods c.f. dealing with expectations for methods called :expects, :stubs, etc.
+- use Object#inspect(:mocha) or Object#__inspect__ instead of Object#mocha_inspect?
+
+=> improve design
+- use builder object c.f. JMock
+- possibly simplify by making mock the same as a partial mock of Object
+- provide test::unit agnostic api - mockery/context type objects on which the user must call setup/teardown?
+- allow stubs/expects methods to accept method names as strings and symbols to retain similarity to define_method() et al
+
+=> documentation
+- read and improve tutorial emailed by user
+
+=> naming
 - default mock names to mock1, mock2, etc or something similar
 - stubba mocks should named according to parent stubbee
-- allow specification of class to be mocked so we can check for existence of methods
-- oomatron type ideas
-- allow stubbing of private/protected methods? - force_stub?
-- allow hash parameter for stubs and expects methods particularly for stubba
+
+=> improve tests
 - use real activerecord as svn external to for testing instead of active_record_test_case
-- provide some means to un-stubba an object - ideally should restore any methods with same names as stubba methods c.f. dealing with expectations for methods called :expects, :stubs, etc.
-- automate releases cf rspec
-- think about behaviour when more than one expectation/stubbed method match c.f. JMock?
-- make verify method private (makes this unnecessary - fail if attempt to verify stub)
 - test for setting expectations on class methods (and instance methods?) from within TestCase#setup
-- use Object#inspect(:mocha) or Object#__inspect__ instead of Object#mocha_inspect?
-- should all instances share expectations for any_instance or should each instance have their own - in which case how do we provide access to the instances
-- detect existing or added definition of mocha methods e.g. expects and alias to __expects?
+
+=> possible extra functionality
+- add multiyield - see email from Jay Fields
+- allow hash parameter for stubs and expects methods particularly for stubba
 - more jmock style stuff - e.g. labels/required order, more sophisticated param matching?
-- stubs should only return a fixed value - no blocks allowed for return values and no parameter expectations allowed?
-- maybe allow unstubbing of a specific method from within a test...?
\ No newline at end of file
+- maybe allow unstubbing of a specific method from within a test...?
+- oomatron type ideas
+- should all instances share expectations for any_instance or should each instance have their own - in which case how do we provide access to the instances
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/auto_verify.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/auto_verify.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/auto_verify.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/auto_verify.rb	2008-03-31 02:18:56.000000000 -0400
@@ -94,7 +94,7 @@
       expectation_type = :stubs if expectation_type == :stub_everything
       mock = Mocha::Mock.new(stub_everything, name)
       expectations.each do |method, result|
-        mock.send(expectation_type, method).returns(result)
+        mock.__send__(expectation_type, method).returns(result)
       end
       mocks << mock
       mock
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/central.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/central.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/central.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/central.rb	2008-03-31 02:18:56.000000000 -0400
@@ -20,7 +20,7 @@
     end
     
     def unique_mocks
-      stubba_methods.collect { |method| method.mock }.uniq
+      stubba_methods.inject({}) { |mocks, method| mocks[method.mock.__id__] = method.mock; mocks }.values
     end
   
     def unstub_all
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/class_method.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/class_method.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/class_method.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/class_method.rb	2008-03-31 02:18:56.000000000 -0400
@@ -26,19 +26,19 @@
     end
   
     def hide_original_method
-      stubbee.metaclass.class_eval "alias_method :#{hidden_method}, :#{method}" if stubbee.metaclass.method_defined?(method)
+      stubbee.__metaclass__.class_eval "alias_method :#{hidden_method}, :#{method}" if stubbee.__metaclass__.method_defined?(method)
     end
   
     def define_new_method
-      stubbee.metaclass.class_eval "def #{method}(*args, &block); mocha.method_missing(:#{method}, *args, &block); end"
+      stubbee.__metaclass__.class_eval "def #{method}(*args, &block); mocha.method_missing(:#{method}, *args, &block); end"
     end
   
     def remove_new_method
-      stubbee.metaclass.class_eval "remove_method :#{method}"
+      stubbee.__metaclass__.class_eval "remove_method :#{method}"
     end
   
     def restore_original_method
-      stubbee.metaclass.class_eval "alias_method :#{method}, :#{hidden_method}; remove_method :#{hidden_method}" if stubbee.metaclass.method_defined?(hidden_method)
+      stubbee.__metaclass__.class_eval "alias_method :#{method}, :#{hidden_method}; remove_method :#{hidden_method}" if stubbee.__metaclass__.method_defined?(hidden_method)
     end
   
     def hidden_method
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/expectation.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/expectation.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/expectation.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/expectation.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,6 +2,12 @@
 require 'mocha/pretty_parameters'
 require 'mocha/expectation_error'
 
+class Object
+
+  alias_method :__is_a__, :is_a?
+
+end
+
 module Mocha
   # Methods on expectations returned from Mocha::MockMethods#expects and Mocha::MockMethods#stubs
   class Expectation
@@ -32,11 +38,7 @@
     end
 
     def match?(method_name, *arguments)
-      if @parameter_block then
-        @parameter_block.call(*arguments)
-      else
-        (@method_name == method_name) and (@parameters == arguments)
-      end
+      (@method_name == method_name) and (@parameter_block ? @parameter_block.call(*arguments) : (@parameters == arguments))
     end
 
     # :startdoc:
@@ -219,7 +221,7 @@
     def invoke
       @invoked += 1
       yield(*@parameters_to_yield) if yield? and block_given?
-      @return_value.is_a?(Proc) ? @return_value.call : @return_value
+      @return_value.__is_a__(Proc) ? @return_value.call : @return_value
     end
 
     def verify
@@ -240,12 +242,12 @@
     end
   
     def method_signature
-      return "#{method_name}" if @parameters.is_a?(AlwaysEqual)
+      return "#{method_name}" if @parameters.__is_a__(AlwaysEqual)
       "#{@method_name}(#{PrettyParameters.new(@parameters).pretty})"
     end
     
     def error_message(expected_count, actual_count)
-      "#{@mock.mocha_inspect}.#{method_signature} - expected calls: #{expected_count}, actual calls: #{actual_count}"
+      "#{@mock.mocha_inspect}.#{method_signature} - expected calls: #{expected_count.mocha_inspect}, actual calls: #{actual_count}"
     end
   
     # :startdoc:
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/infinite_range.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/infinite_range.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/infinite_range.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/infinite_range.rb	2008-03-31 02:18:56.000000000 -0400
@@ -12,15 +12,13 @@
     1/0.0
   end
   
-  alias_method :__to_s__, :to_s
-
-  def to_s
-    if first.to_f.infinite? then
+  def mocha_inspect
+    if first.respond_to?(:to_f) and first.to_f.infinite? then
       return "at most #{last}"
-    elsif last.to_f.infinite? then
+    elsif last.respond_to?(:to_f) and last.to_f.infinite? then
       return "at least #{first}"
     else
-      __to_s__
+      to_s
     end
   end
   
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/inspect.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/inspect.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/inspect.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/inspect.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,7 +2,7 @@
 
 class Object
   def mocha_inspect
-    inspect =~ /#</ ? "#<#{self.class}: #{self.object_id}>" : inspect
+    inspect =~ /#</ ? "#<#{self.class}:0x#{self.__id__.to_s(16)}>" : inspect
   end
 end
 
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/metaclass.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/metaclass.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/metaclass.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/metaclass.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,6 +1,6 @@
 class Object
   
-  def metaclass
+  def __metaclass__
     class << self; self; end
   end
 
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/mock.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/mock.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/mock.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/mock.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,37 +1,20 @@
 require 'mocha/mock_methods'
 
 module Mocha
-  
-  module ExtraMethods
 
-    attr_reader :__mock_name
+  class Mock
+    
+    include MockMethods
+
     def initialize(stub_everything = false, name = nil)
       @stub_everything = stub_everything
-      @__mock_name = name
+      @mock_name = name
     end
-    
-    alias :mocha_inspect_before_hijacked_by_named_mocks :mocha_inspect
+
     def mocha_inspect
-      @__mock_name ? "#<Mock:#{@__mock_name}>" : mocha_inspect_before_hijacked_by_named_mocks
+      @mock_name ? "#<Mock:#{@mock_name}>" : "#<Mock:0x#{__id__.to_s(16)}>"
     end
-    
-  end
-  
-  class Mock
-    
-    include MockMethods
-    include ExtraMethods
-    
-  end
-  
-  class BlankMock
-
-    methods_to_keep = /^__.*__$|respond_to?|mocha_inspect|inspect|class|object_id|send|is_a\?|==|hash|nil\?|extend|eql\?/
-    instance_methods.each { |method_to_remove| eval("undef :#{method_to_remove}") unless method_to_remove =~ methods_to_keep }
-  
-    include MockMethods
-    include ExtraMethods
 
   end
-  
+
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/mock_methods.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/mock_methods.rb
--- mephisto-0.7.3/vendor/plugins/mocha/lib/mocha/mock_methods.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/lib/mocha/mock_methods.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,4 +1,5 @@
 require 'mocha/expectation'
+require 'mocha/metaclass'
 
 module Mocha
   # Methods added to mock objects.
@@ -41,12 +42,15 @@
       method_names = method_names.is_a?(Hash) ? method_names : { method_names => nil }
       method_names.each do |method_name, return_value|
         expectations << Expectation.new(self, method_name, backtrace).returns(return_value)
+        self.__metaclass__.send(:undef_method, method_name) if self.__metaclass__.method_defined?(method_name)
       end
       expectations.last
     end
 
-    # :call-seq: expects(method_name) -> expectation
-    #            expects(method_names) -> last expectation
+    alias_method :__expects__, :expects
+
+    # :call-seq: stubs(method_name) -> expectation
+    #            stubs(method_names) -> last expectation
     #
     # Adds an expectation that a method identified by +method_name+ symbol may be called any number of times with any parameters.
     # Returns the new expectation which can be further modified by methods on Mocha::Expectation.
@@ -68,10 +72,13 @@
       method_names = method_names.is_a?(Hash) ? method_names : { method_names => nil }
       method_names.each do |method_name, return_value|
         expectations << Stub.new(self, method_name, backtrace).returns(return_value)
+        self.__metaclass__.send(:undef_method, method_name) if self.__metaclass__.method_defined?(method_name)
       end
       expectations.last
     end
     
+    alias_method :__stubs__, :stubs
+
     # :stopdoc:
 
     def method_missing(symbol, *arguments, &block)
@@ -102,7 +109,7 @@
     end
 	
   	def matching_expectation(symbol, *arguments)
-      expectations.detect { |expectation| expectation.match?(symbol, *arguments) }
+      expectations.reverse.detect { |expectation| expectation.match?(symbol, *arguments) }
     end
   
     def verify(&block)
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/all_tests.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/all_tests.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/all_tests.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/all_tests.rb	2008-03-31 02:18:56.000000000 -0400
@@ -13,6 +13,7 @@
 require 'mocha/any_instance_method_test'
 require 'mocha/setup_and_teardown_test'
 require 'mocha/object_test'
+require 'mocha/metaclass_test'
 
 class UnitTests
   
@@ -30,6 +31,7 @@
     suite << AnyInstanceMethodTest.suite
     suite << SetupAndTeardownTest.suite
     suite << ObjectTest.suite
+    suite << MetaclassTest.suite
     suite
   end
   
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/method_definer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/method_definer.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/method_definer.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/method_definer.rb	2008-03-31 02:18:56.000000000 -0400
@@ -3,7 +3,7 @@
 class Object
   
   def define_instance_method(method_symbol, &block)
-    metaclass.send(:define_method, method_symbol, block)
+    __metaclass__.send(:define_method, method_symbol, block)
   end
 
   def replace_instance_method(method_symbol, &block)
@@ -12,7 +12,7 @@
   end
 
   def define_instance_accessor(*symbols)
-    symbols.each { |symbol| metaclass.send(:attr_accessor, symbol) }
+    symbols.each { |symbol| __metaclass__.send(:attr_accessor, symbol) }
   end
 
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/auto_verify_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/auto_verify_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/auto_verify_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/auto_verify_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -147,17 +147,17 @@
   
   def test_should_create_mock_with_name
     mock = test_case.mock('named_mock')
-    assert_equal 'named_mock', mock.__mock_name
+    assert_equal '#<Mock:named_mock>', mock.mocha_inspect
   end
   
   def test_should_create_stub_with_name
     stub = test_case.stub('named_stub')
-    assert_equal 'named_stub', stub.__mock_name
+    assert_equal '#<Mock:named_stub>', stub.mocha_inspect
   end
   
   def test_should_create_greedy_stub_with_name
     greedy_stub = test_case.stub_everything('named_greedy_stub')
-    assert_equal 'named_greedy_stub', greedy_stub.__mock_name
+    assert_equal '#<Mock:named_greedy_stub>', greedy_stub.mocha_inspect
   end
   
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/central_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/central_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/central_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/central_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -62,7 +62,7 @@
     method_2.verify
   end
   
-  def test_should_collect_mock_from_all_methods
+  def test_should_collect_mocks_from_all_methods
     method_1 = Mock.new
     method_1.stubs(:mock).returns(:mock_1)
 
@@ -72,7 +72,9 @@
     stubba = Central.new
     stubba.stubba_methods = [method_1, method_2]
     
-    assert_equal [:mock_1, :mock_2], stubba.unique_mocks
+    assert_equal 2, stubba.unique_mocks.size
+    assert stubba.unique_mocks.include?(:mock_1)
+    assert stubba.unique_mocks.include?(:mock_2)
   end
 
   def test_should_return_unique_mochas
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/expectation_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/expectation_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/expectation_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/expectation_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -35,6 +35,11 @@
     assert expectation.match?(:expected_method, 1, 2, 3)
   end
   
+  def test_should_not_match_calls_to_different_method_with_parameters_constrained_as_expected
+    expectation = new_expectation.with() {|x, y, z| x + y == z}
+    assert !expectation.match?(:different_method, 1, 2, 3)
+  end
+  
   def test_should_not_match_calls_to_different_methods_with_no_parameters
     assert !new_expectation.match?(:unexpected_method)
   end
@@ -128,10 +133,21 @@
   end
   
   def test_should_return_evaluated_proc
-    expectation = new_expectation.returns(lambda { 99 })
+    proc = lambda { 99 }
+    expectation = new_expectation.returns(proc)
     assert_equal 99, expectation.invoke
   end
   
+  def test_should_return_evaluated_proc_without_using_is_a_method
+    proc = lambda { 99 }
+    proc.define_instance_accessor(:called)
+    proc.called = false
+    proc.replace_instance_method(:is_a?) { self.called = true; true}
+    expectation = new_expectation.returns(proc)
+    expectation.invoke
+    assert_equal false, proc.called
+  end
+  
   def test_should_raise_runtime_exception
     expectation = new_expectation.raises
     assert_raise(RuntimeError) { expectation.invoke }
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/infinite_range_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/infinite_range_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/infinite_range_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/infinite_range_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha/infinite_range'
+require 'date'
 
 class InfiniteRangeTest < Test::Unit::TestCase
   
@@ -18,7 +19,7 @@
   end
   
   def test_should_be_human_readable_description_for_at_least
-    assert_equal "at least 10", Range.at_least(10).to_s
+    assert_equal "at least 10", Range.at_least(10).mocha_inspect
   end
   
   def test_should_include_values_at_or_below_maximum
@@ -35,12 +36,14 @@
   end
   
   def test_should_be_human_readable_description_for_at_most
-    assert_equal "at most 10", Range.at_most(10).to_s
+    assert_equal "at most 10", Range.at_most(10).mocha_inspect
   end
   
-  def test_should_not_break_original_description
-    assert_equal "1..10", (1..10).to_s
-    assert_equal "1...10", (1...10).to_s
+  def test_should_be_same_as_standard_to_string
+    assert_equal (1..10).to_s, (1..10).mocha_inspect
+    assert_equal (1...10).to_s, (1...10).mocha_inspect
+    date_range = Range.new(Date.parse('2006-01-01'), Date.parse('2007-01-01'))
+    assert_equal date_range.to_s, date_range.mocha_inspect
   end
   
   def assert_false(condition)
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/inspect_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/inspect_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/inspect_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/inspect_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), "..", "test_helper")
 require 'mocha/inspect'
+require 'method_definer'
 
 class InspectTest
   def self.suite
@@ -17,7 +18,17 @@
   
   def test_should_provide_custom_representation_of_object
     object = Object.new
-    assert_equal "#<#{object.class}: #{object.object_id}>", object.mocha_inspect
+    assert_equal "#<#{object.class}:#{"0x%x" % object.__id__}>", object.mocha_inspect
+  end
+  
+  def test_should_use_underscored_id_instead_of_object_id_or_id_so_that_they_can_be_stubbed
+    object = Object.new
+    object.define_instance_accessor(:called)
+    object.called = false
+    object.replace_instance_method(:object_id) { self.called = true; 1 }
+    object.replace_instance_method(:id) { self.called = true; 1 }
+    object.mocha_inspect
+    assert_equal false, object.called
   end
   
 end
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/metaclass_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/metaclass_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/metaclass_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/metaclass_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), "..", "test_helper")
+require 'mocha/metaclass'
+
+class MetaclassTest < Test::Unit::TestCase
+  
+  def test_should_return_objects_singleton_class
+    object = Object.new
+    assert_raises(NoMethodError) { object.success? }
+
+    object = Object.new
+    assert object.__metaclass__.ancestors.include?(Object)
+    assert object.__metaclass__.ancestors.include?(Kernel)
+    assert object.__metaclass__.is_a?(Class)
+
+    object.__metaclass__.class_eval { def success?; true; end }
+    assert object.success?
+    
+    object = Object.new
+    assert_raises(NoMethodError) { object.success? }
+  end
+  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/mock_methods_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/mock_methods_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/mock_methods_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/mock_methods_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -49,7 +49,17 @@
     expectation1 = mock.expects(:my_method).with(:argument1, :argument2)
     expectation2 = mock.expects(:my_method).with(:argument3, :argument4)
     
-    assert_equal expectation2, mock.matching_expectation(:my_method, :argument3, :argument4)
+    assert_same expectation2, mock.matching_expectation(:my_method, :argument3, :argument4)
+  end
+  
+  def test_should_find_most_recent_matching_expectation
+    mock = Object.new
+    mock.extend(MockMethods)
+
+    expectation1 = mock.expects(:my_method).with(:argument1, :argument2)
+    expectation2 = mock.expects(:my_method).with(:argument1, :argument2)
+    
+    assert_same expectation2, mock.matching_expectation(:my_method, :argument1, :argument2)
   end
   
   def test_should_invoke_expectation_and_return_result
@@ -190,4 +200,36 @@
     assert_equal :result2, mock.method2
   end
   
+  def test_should_match_most_recent_call_to_expects
+    mock = Object.new
+    mock.extend(MockMethods)
+    mock.expects(:method1).returns(0)
+    mock.expects(:method1).returns(1)
+    assert_equal 1, mock.method1
+  end
+
+  def test_should_match_most_recent_call_to_stubs
+    mock = Object.new
+    mock.extend(MockMethods)
+    mock.stubs(:method1).returns(0)
+    mock.stubs(:method1).returns(1)
+    assert_equal 1, mock.method1
+  end
+
+  def test_should_match_call_to_expects_with_previous_call_to_stubs
+    mock = Object.new
+    mock.extend(MockMethods)
+    mock.stubs(:method1).returns(0)
+    mock.expects(:method1).returns(1)
+    assert_equal 1, mock.method1
+  end
+
+  def test_should_match_call_to_stubs_with_previous_call_to_expects
+    mock = Object.new
+    mock.extend(MockMethods)
+    mock.expects(:method1).returns(0)
+    mock.stubs(:method1).returns(1)
+    assert_equal 1, mock.method1
+  end
+
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/mocha/mock_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/mock_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/mocha/mock_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/mocha/mock_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -35,23 +35,19 @@
     assert_equal true, mock.stub_everything
   end
   
-  def test_should_use_default_inspect_message
+  def test_should_display_object_id_for_inspect_if_mock_has_no_name
     mock = Mock.new
-    assert_equal mock.mocha_inspect_before_hijacked_by_named_mocks, mock.mocha_inspect
+    assert_match Regexp.new("#<Mock:0x[0-9A-Fa-f]{6}>"), mock.mocha_inspect
   end
   
-  def test_should_give_name_in_inspect_message
+  def test_should_display_name_for_inspect_if_mock_has_name
     mock = Mock.new(false, 'named_mock')
     assert_equal "#<Mock:named_mock>", mock.mocha_inspect
   end
-  
-  def test_should_be_able_to_mock_some_standard_object_methods_on_blank_mock
-    mock = BlankMock.new
-    mock.expects(:type)
-    mock.expects(:kind_of?)
-    mock.type
-    mock.kind_of?
-    assert_nothing_raised(ExpectationError) { mock.verify }
+
+  def test_should_give_name_in_inspect_message
+    mock = Mock.new(false, 'named_mock')
+    assert_equal "#<Mock:named_mock>", mock.mocha_inspect
   end
   
   def test_should_be_able_to_extend_mock_object_with_module
@@ -59,9 +55,30 @@
     assert_nothing_raised(ExpectationError) { mock.extend(Module.new) }
   end
   
-  def test_should_be_equal_to_avoid_strange_breakage_of_published_review_list_test_in_revieworld
+  def test_should_be_equal
     mock = Mock.new
     assert_equal true, mock.eql?(mock)
   end
     
+  def test_should_be_able_to_mock_standard_object_methods
+    mock = Mock.new
+    object_methods = Object.public_instance_methods.reject { |m| m =~ /^__.*__$/ }.sort
+    object_methods.each { |method| mock.__expects__(method.to_sym).returns(method) }
+    object_methods.each { |method| assert_equal method, mock.__send__(method.to_sym) }
+    assert_nothing_raised(ExpectationError) { mock.verify }
+  end
+
+  def test_should_be_able_to_stub_standard_object_methods
+    mock = Mock.new
+    object_methods = Object.public_instance_methods.reject { |m| m =~ /^__.*__$/ }.sort
+    object_methods.each { |method| mock.__stubs__(method.to_sym).returns(method) }
+    object_methods.each { |method| assert_equal method, mock.__send__(method.to_sym) }
+  end
+  
+  def test_should_respond_to_expected_methods
+    mock = Mock.new
+    mock.expects(:method1)
+    assert_equal true, mock.respond_to?(:method1)
+  end
+  
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/stubba_acceptance_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/stubba_acceptance_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/stubba_acceptance_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/stubba_acceptance_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -31,15 +31,6 @@
 
 class StubbaAcceptanceTest < Test::Unit::TestCase
   
-  def test_should_allow_object_instance_pointed_to_from_constant_to_be_unstubbed
-    self.class.const_set(:Foo, [:array, :of, :things])
-    Foo.stubs(:size).returns(6)
-    assert_equal 6, Foo.size
-    $stubba.unstub_all
-    assert_equal 3, Foo.size
-    self.class.__send__(:remove_const, :Foo)
-  end
-  
   def test_should_stub_instance_method
     widget = Widget.new
     widget.expects(:model).returns('different_model')
diff -Nur mephisto-0.7.3/vendor/plugins/mocha/test/stubba_integration_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/stubba_integration_test.rb
--- mephisto-0.7.3/vendor/plugins/mocha/test/stubba_integration_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/mocha/test/stubba_integration_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -7,53 +7,83 @@
 class StubbaIntegrationTest < Test::Unit::TestCase
   
   class DontMessWithMe
-    def self.method_x
+    def self.my_class_method
+      :original_return_value
+    end
+    def my_instance_method
       :original_return_value
     end
   end
   
   def test_should_stub_class_method_within_test
-    test_class = Class.new(Test::Unit::TestCase) do
-      include Mocha::Standalone
-      include Mocha::TestCaseAdapter
-      define_method(:test_me) do
-        DontMessWithMe.expects(:method_x).returns(:new_return_value)
-        assert_equal :new_return_value, DontMessWithMe.method_x
-      end
+    test = build_test do
+      DontMessWithMe.expects(:my_class_method).returns(:new_return_value)
+      assert_equal :new_return_value, DontMessWithMe.my_class_method
     end
-    test = test_class.new(:test_me)
 
     test_result = Test::Unit::TestResult.new
     test.run(test_result) {}
     assert test_result.passed?
   end
 
-  def test_should_leave_stubbed_class_unchanged_after_test
-    test_class = Class.new(Test::Unit::TestCase) do
-      include Mocha::Standalone
-      include Mocha::TestCaseAdapter
-      define_method(:test_me) do
-        DontMessWithMe.expects(:method_x).returns(:new_return_value)
-      end
+  def test_should_leave_stubbed_class_method_unchanged_after_test
+    test = build_test do
+      DontMessWithMe.expects(:my_class_method).returns(:new_return_value)
     end
-    test = test_class.new(:test_me)
 
     test.run(Test::Unit::TestResult.new) {}
-    assert_equal :original_return_value, DontMessWithMe.method_x
+    assert_equal :original_return_value, DontMessWithMe.my_class_method
   end
   
-  def test_should_reset_expectations_after_test
-    test_class = Class.new(Test::Unit::TestCase) do
-      include Mocha::Standalone
-      include Mocha::TestCaseAdapter
-      define_method(:test_me) do
-        DontMessWithMe.expects(:method_x)
-      end
+  def test_should_reset_class_expectations_after_test
+    test = build_test do
+      DontMessWithMe.expects(:my_class_method)
     end
-    test = test_class.new(:test_me)
     
     test.run(Test::Unit::TestResult.new) {}
     assert_equal 0, DontMessWithMe.mocha.expectations.size
   end  
 
+  def test_should_stub_instance_method_within_test
+    instance = DontMessWithMe.new
+    test = build_test do
+      instance.expects(:my_instance_method).returns(:new_return_value)
+      assert_equal :new_return_value, instance.my_instance_method
+    end
+    test_result = Test::Unit::TestResult.new
+    test.run(test_result) {}
+    assert test_result.passed?
+  end
+  
+  def test_should_leave_stubbed_instance_method_unchanged_after_test
+    instance = DontMessWithMe.new
+    test = build_test do
+      instance.expects(:my_instance_method).returns(:new_return_value)
+    end
+
+    test.run(Test::Unit::TestResult.new) {}
+    assert_equal :original_return_value, instance.my_instance_method
+  end
+  
+  def test_should_reset_instance_expectations_after_test
+    instance = DontMessWithMe.new
+    test = build_test do
+      instance.expects(:my_instance_method).returns(:new_return_value)
+    end
+    
+    test.run(Test::Unit::TestResult.new) {}
+    assert_equal 0, instance.mocha.expectations.size
+  end  
+
+  private
+
+  def build_test(&block)
+    test_class = Class.new(Test::Unit::TestCase) do
+      include Mocha::Standalone
+      include Mocha::TestCaseAdapter
+      define_method(:test_me, &block)
+    end
+    test_class.new(:test_me)
+  end
+
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/LICENSE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/LICENSE
--- mephisto-0.7.3/vendor/plugins/model_stubbing/LICENSE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/LICENSE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+Copyright (c) 2007 Rick Olson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
+the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/README
--- mephisto-0.7.3/vendor/plugins/model_stubbing/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,71 @@
+model_stubbing
+==============
+
+Creates in-memory versions of models for testing.  This attempts to solve a
+few problems with ActiveRecord Fixtures:
+
+Speed - There's no hit to the database and no cleanup between tests.
+Flexibility - You can define a global set of stubs, or define custom ones
+  for specific tests/specs
+
+A lot of these ideas were taken from various approaches to fixtures and mocking
+that I've seen:
+
+fixture scenarios (http://errtheblog.com/post/7708)
+unit_record (http://www.dcmanges.com/blog/rails-unit-record-test-without-the-database)
+Rspec and #mock_model
+
+Exemplar (http://www.bofh.org.uk/articles/2007/08/05/doing-the-fixture-thing)
+I actually saw Exemplar after I wrote the initial version, but they do seem similar.
+
+I honestly don't know if this is a better way or anything, I'm just experimenting with
+a different approach.  Oh, and apparently this is an implementation of the ObjectMother 
+(http://www.martinfowler.com/bliki/ObjectMother.html) pattern?
+
+  # test/unit example
+  # test/unit support not fully implemented yet
+  require 'model_stubbing/test_case'
+
+  class FooTest < Test::Unit::TestCase
+    define_models do
+      time 2007, 6, 1
+    
+      model User do
+        stub :name => 'bob', :admin => false
+        stub :admin, :admin => true # inherits from default fixture
+      end
+    
+      model Post do
+        # uses admin user fixture above
+        stub :title => 'initial', :user => all_stubs(:admin_user), 
+          :published_at => current_time + 5.days
+      end
+    end
+    
+    def test_foo
+      @user   = users(:default) # default user stub
+      @admin  = users(:admin)
+      @custom = users(:default, :age => 25) # custom attributes, 
+                                            #but not equal to @user any more
+                                            
+      @post   = posts(:default)
+      @post.user # equal to @admin above
+      
+      current_time # stubbed to be 6/1/2007 using mocha or rspec
+    end
+  end
+
+  # rspec example
+  require 'model_stubbing/spec'
+
+  describe Foo do
+    ...
+  end
+
+TODO
+====
+
+* Support other mocking frameworks besides rspec and mocha?
+
+* Support Sequel, DataMapper, etc?  I use AR, but I'm willing to abstract
+  some of that out in case someone wants to support another ORM.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/definition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/definition.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/definition.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/definition.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,118 @@
+module ModelStubbing
+  # A Definition holds an array of models with their own stubs.  Also, a definition
+  # can set the current time for your tests.  You typically create one per test case or
+  # rspec example.
+  class Definition
+    attr_writer :insert
+    attr_writer :current_time
+    attr_reader :models
+    attr_reader :stubs
+
+    # Sets the time that Time.now is mocked to (in UTC)
+    def time(*args)
+      @current_time = Time.utc(*args)
+    end
+    
+    def current_time
+      @current_time ||= Time.now.utc
+    end
+    
+    # Creates a new ModelStubbing::Model to hold one or more stubs.  Multiple calls will append
+    # any added stubs to the same model instance.
+    def model(klass, options = {}, &block)
+      m = Model.new(self, klass, options)
+      @models[m.name] ||= m
+      @models[m.name].instance_eval(&block) if block
+      @models[m.name]
+    end
+    
+    def initialize(&block)
+      @models = {}
+      @stubs  = {}
+      instance_eval &block if block
+    end
+    
+    def dup
+      copy = self.class.new
+      copy.current_time = @current_time
+      models.each do |name, model|
+        copy.models[name] = model.dup(copy)
+      end
+      stubs.each do |name, stub|
+        copy.stubs[name] = copy.models[stub.model.name].stubs[stub.name]
+      end
+      copy
+    end
+    
+    def ==(defn)
+      (defn.object_id == object_id) ||
+        (defn.is_a?(Definition) && defn.models == @models && defn.stubs == @stubs)
+    end
+    
+    # Sets up the given class for this definition.  Adds a few helper methods:
+    #
+    # * #stubs: Lets you access all stubs with a global key, which combines the model
+    #   name with the stub name.  stubs(:user) gets the default user stub, and stubs(:admin_user)
+    #   gets the 'admin' user stub.
+    #
+    # * #current_time: Accesses the current mocked time for a test or spec.
+    #
+    # Shortcut methods for each model are generated as well.  users(:default) accesses
+    # the default user stub, and users(:admin) accesses the 'admin' user stub.
+    def setup_on(klass)
+      unless klass.respond_to?(:definition) && klass.definition
+        klass.class_eval do
+          if klass.is_a?(Class)
+            if defined?(Spec::DSL::ExampleGroup) && !klass.ancestors.include?(RspecExtension) && klass.ancestors.include?(Spec::DSL::ExampleGroup)
+              include RspecExtension
+            elsif defined?(Test::Spec) && !klass.ancestors.include?(TestSpecExtension) && klass.ancestors.include?(Test::Spec::TestCase::InstanceMethods)
+              include TestSpecExtension
+            elsif defined?(Test::Unit::TestCase) && !klass.ancestors.include?(TestUnitExtension) && klass.ancestors.include?(Test::Unit::TestCase)
+              include TestUnitExtension
+            end
+          end
+          def stubs(key)
+            self.class.definition.stubs[key]
+          end
+          
+          def current_time
+            self.class.definition.current_time
+          end
+          
+          def setup_definition_for_test_run
+            if !self.class.definition_inserted && self.class.definition.insert?
+              ActiveRecord::Base.transaction do
+                self.class.definition.models.values.each(&:insert)
+              end
+              self.class.definition_inserted = true
+            end
+            ModelStubbing.stub_current_time_with(current_time) if current_time
+          end
+        end
+        (class << klass ; self ; end).send :attr_accessor, :definition, :definition_inserted
+        klass.definition = self
+      end
+      klass.class_eval models.values.collect { |model| model.stub_method_definition }.join("\n")
+    end
+    
+    # Retrieves a record for a given stub.  The optional attributes hash let's you specify
+    # custom attributes.  If no custom attributes are passed, then each call to the same
+    # stub will return the same object.  Custom attributes result in a new instantiated object
+    # each time.
+    def retrieve_record(key, attributes = {})
+      @stubs[key].record(attributes)
+    end
+    
+    def insert?
+      @insert != false && database?
+    end
+    
+    def database?
+      defined?(ActiveRecord)
+    end
+    
+    def inspect
+      "(ModelStubbing::Definition(:models => [#{@models.keys.collect { |k| k.to_s }.sort.join(", ")}]))"
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/model.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/model.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/model.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/model.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,95 @@
+module ModelStubbing
+  # Models hold one or more stubs.
+  class Model
+    attr_reader   :definition
+    attr_accessor :name
+    attr_accessor :plural
+    attr_accessor :singular
+    attr_reader   :stubs
+    attr_reader   :model_class
+
+    # Creates a stub for this model.  A stub with no name is assumed to be the default
+    # stub.  A global key for the definition is also created based on the singular
+    # form of the stub name.  
+    def stub(name = nil, options = {})
+      if name.is_a?(Hash)
+        options = name
+        name    = :default
+      end
+
+      Stub.new(self, name, options)
+    end
+
+    def initialize(definition, klass, options = {}, &block)
+      @definition  = definition
+      @model_class = klass
+      @name        = options[:name]     || klass.table_name.to_sym
+      @plural      = options[:plural]   || name
+      @singular    = options[:singular] || name.to_s.singularize
+      @stubs       = {}
+      unless @model_class.respond_to?(:mock_id)
+        class << @model_class
+          define_method :mock_id do
+            @mock_id ||= 999
+            @mock_id  += 1
+          end
+        end
+      end
+      instance_eval &block if block
+    end
+    
+    def dup(definition = nil)
+      copy = self.class.new(definition || @definition, @model_class, :name => @name, :plural => @plural, :singular => @singular)
+      stubs.each do |key, value|
+        copy.stubs[key] = value.dup(copy)
+      end
+      copy
+    end
+    
+    def ==(model)
+      (model.object_id == object_id) ||
+        (model.is_a?(Model) && model.name == @name && model.model_class == @model_class)
+    end
+    
+    # References the default stub for this model.
+    def default
+      @stubs[:default]
+    end
+    
+    # Accesses the current mocked time for this definition.
+    def current_time
+      @definition.current_time
+    end
+    
+    # Shortcut to all the stubs for the definition.
+    def all_stubs(key = nil)
+      key ? @definition.stubs[key] : @definition.stubs
+    end
+
+    # Instantiates a stub into a new record.
+    def retrieve_record(key, attributes = {})
+      @stubs[key].record(attributes)
+    end
+    
+    def stub_method_definition
+      "def #{@plural}(key, attributes = {}) self.class.definition.models[#{@plural.inspect}].retrieve_record(key, attributes) end"
+    end
+
+    def inspect
+      "(ModelStubbing::Model(#{@name.inspect} => [#{@stubs.keys.collect { |k| k.to_s }.sort.join(", ")}]))"
+    end
+    
+    def insert
+      purge
+      @stubs.values.each &:insert
+    end
+    
+    def purge
+      model_class.connection.execute "TRUNCATE TABLE #{connection.quote_column_name model_class.table_name}"
+    end
+    
+    def connection
+      @connection ||= model_class.connection
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+require 'model_stubbing'
+require 'spec' unless Object.const_defined?(:Spec)
+base_spec_class = \
+  if defined?(Test::Unit::TestCase::ExampleGroup)
+    Test::Unit::TestCase::ExampleGroup
+  elsif defined?(Spec::ExampleGroup)
+    Spec::ExampleGroup
+  elsif defined?(Spec::Example)
+    Spec::Example
+  else
+    raise "rspec doesn't seem to be loaded."
+  end
+base_spec_class.extend ModelStubbing
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/stub.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/stub.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/stub.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/stub.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,179 @@
+module ModelStubbing
+  # Stubs hold custom attributes that are applied to models when
+  # instantiated.  By default, accessing the same stub twice
+  # will return the exact same instance.  However, custom attributes
+  # will create unique stub instances.
+  class Stub
+    attr_reader   :model
+    attr_reader   :attributes
+    attr_reader   :global_key
+    attr_accessor :name
+    
+    # Creates a new stub.  If it's not the default, it inherits the default 
+    # stub's attributes.
+    def initialize(model, name, attributes)
+      @model      = model
+      @name       = name
+      @attributes = 
+        if default? || model.default.nil?
+          attributes
+        else
+          model.default.attributes.merge(attributes)
+        end
+
+      @global_key = (name == :default ? @model.singular : "#{name}_#{@model.singular}").to_sym
+      @model.all_stubs[@global_key] = @model.stubs[name] = self
+    end
+    
+    def dup(model = nil)
+      Stub.new(model || @model, @name, @attributes)
+    end
+    
+    def ==(stub)
+      (stub.object_id == object_id) ||
+        (stub.is_a?(Stub) && stub.model.name == @model.name && stub.global_key == @global_key && stub.name == @name && stub.attributes == @attributes)
+    end
+    
+    def default?
+      @name == :default
+    end
+    
+    # Retrieves or creates a record based on the stub's set attributes and the given custom attributes.
+    def record(attributes = {})
+      attributes.empty? && ModelStubbing.records.key?(record_key(attributes)) ? retrieve(attributes) : instantiate(attributes)
+    end
+    
+    def inspect
+      "(ModelStubbing::Stub(#{@name.inspect} => #{attributes.inspect}))"
+    end
+    
+    def insert(attributes = {})
+      object = record(attributes)
+      connection.insert_fixture(object.stubbed_attributes, model.model_class.table_name)
+    end
+    
+    def with(attributes)
+      @attributes.inject({}) do |attr, (key, value)|
+        attr_value = attributes[key] || value
+        attr_value = attr_value.record if attr_value.is_a?(Stub)
+        attr.update key => attr_value
+      end
+    end
+    
+    def only(*keys)
+      keys = Set.new Array(keys)
+      @attributes.inject({}) do |attr, (key, value)|
+        if keys.include?(key)
+          attr.update key => (value.is_a?(Stub) ? value.record : value)
+        else
+          attr
+        end
+      end
+    end
+    
+    def except(*keys)
+      keys = Set.new Array(keys)
+      @attributes.inject({}) do |attr, (key, value)|
+        if keys.include?(key)
+          attr
+        else
+          attr.update key => (value.is_a?(Stub) ? value.record : value)
+        end
+      end
+    end
+    
+    def connection
+      @connection ||= @model.connection
+    end
+  
+  private
+    def instantiate(attributes)
+      default_record     = attributes.empty?
+      stubbed_attributes = stubbed_attributes(@attributes.merge(attributes))
+
+      record = @model.model_class.new
+      meta   = class << record
+        attr_accessor :stubbed_attributes
+        def new_record?() false end
+        self
+      end
+      
+      record.id = @model.model_class.mock_id
+      record.stubbed_attributes = stubbed_attributes.merge(:id => record.id)
+      stubbed_attributes.each do |key, value|
+        if value.is_a? Stub
+          # set foreign key
+          record[stubbed_attributes.column_name_for(key)] = value.record.id
+          # set association
+          meta.send :attr_accessor, key unless record.respond_to?("#{key}=")
+          record.send("#{key}=", value.is_a?(Stub) ? value.record : value)
+        else
+          record[key] = value
+        end
+      end
+   
+      ModelStubbing.records[record_key(attributes)] = record if default_record
+      record
+    end
+    
+    def stubbed_attributes(attributes)
+      attributes.inject FixtureHash.new(self) do |stubbed, (key, value)|
+        stubbed.update key => value
+      end
+    end
+    
+    def retrieve(attributes = {})
+      ModelStubbing.records[record_key(attributes)]
+    end
+    
+    # so that duped stubs with duplicate attributes reuse the same record
+    def record_key(attributes)
+      @record_key ||= [model.model_class.name, @global_key, @attributes.merge(attributes).inspect] * ":"
+    end
+  end
+  
+  class FixtureHash < Hash
+    def initialize(stub)
+      super()
+      @stub = stub
+    end
+
+    def key_list
+      keys.collect { |key| @stub.connection.quote_column_name(column_name_for(key)) } * ", "
+    end
+
+    def value_list
+      list = inject([]) do |fixtures, (key, value)|
+        column_name = column_name_for key
+        column      = column_for column_name
+        value       = value.record.id if value.is_a?(Stub)
+        fixtures << @stub.connection.quote(value, column).gsub('[^\]\\n', "\n").gsub('[^\]\\r', "\r")
+      end.join(", ")
+    end
+
+    def column_name_for(key)
+      (@keys ||= {})[key] ||= begin
+        value = self[key]
+        if value.is_a? Stub
+          if defined?(ActiveRecord)
+            reflection = model_class.reflect_on_association(key)
+            reflection.primary_key_name
+          else
+            "#{key}_id"
+          end
+        else
+          key
+        end
+      end
+    end
+  
+    def column_for(name)
+      model_class.columns_hash[name] if defined?(ActiveRecord) && model_class.ancestors.include?(ActiveRecord::Base)
+    end
+  
+  private
+    def model_class
+      @stub.model.model_class
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/test_case.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/test_case.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/test_case.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/test_case.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+require 'model_stubbing'
+require 'test/unit/test_case' unless Object.const_defined?(:Test)
+Test::Unit::TestCase.extend ModelStubbing
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/test_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/test_spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing/test_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing/test_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+require 'model_stubbing'
+require 'test/spec' unless Object.const_defined?(:Test)
+Test::Unit::TestCase.extend ModelStubbing
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/lib/model_stubbing.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/lib/model_stubbing.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,91 @@
+require 'model_stubbing/definition'
+require 'model_stubbing/model'
+require 'model_stubbing/stub'
+
+module ModelStubbing
+  extend self
+  # Gets a hash of all current definitions.
+  def self.definitions() @definitions ||= {} end
+  def self.records()     @records     ||= {} end
+
+  # Creates a new ModelStubbing::Definition.  If called from within a class,
+  # it is automatically setup (See Definition#setup_on).
+  #
+  # Creates or updates a definition going by the given name as a key.  If
+  # no name is given, it defaults to the current class or :default.  Multiple
+  # #define_models calls with the same name will modify the definition.
+  # 
+  # Options:
+  # * :copy - set to false if you don't want this definition to be a dup of
+  #   the :default definition
+  # * :insert - set to false if you don't want to insert this definition
+  #   into the database.
+  def define_models(name = nil, options = {}, &block)
+    if name.is_a? Hash
+      options = name
+      name    = nil
+    end
+    name    ||= is_a?(Class) ? self : :default
+    base_name = options[:copy] || :default
+    base      = name == base_name ? nil : ModelStubbing.definitions[base_name]
+    defn      = ModelStubbing.definitions[name] ||= (base && options[:copy] != false) ? base.dup : ModelStubbing::Definition.new
+    defn.insert = false if options[:insert] == false
+    defn.instance_eval(&block) if block
+    defn.setup_on self
+  end
+
+protected
+  @@mock_framework = nil
+  def self.stub_current_time_with(time)
+    guess_mock_framework!
+    case @@mock_framework
+      when :rspec then Time.stub!(:now).and_return(time)
+      when :mocha then Time.stubs(:now).returns(time)
+    end
+  end
+  
+  def self.guess_mock_framework!
+    if @@mock_framework.nil?
+      @@mock_framework = 
+        if Time.respond_to?(:stub!)
+          :rspec
+        elsif Time.respond_to?(:stubs)
+          :mocha
+        else
+          raise "Unknown mock framework."
+        end
+    end
+  end
+
+  # Included into the current rspec example when #define_models is called.
+  module RspecExtension
+    def self.included(base)
+      base.prepend_before :each do
+        setup_definition_for_test_run
+      end
+    end
+  end
+
+  # Included into the current test/spec example when #define_models is called.
+  module TestSpecExtension
+    def self.included(base)
+      base.before :each do
+        setup_definition_for_test_run
+      end
+    end
+  end
+  
+  # Included into Test::Unit::TestCase when #define_models is called.
+  module TestUnitExtension
+    def self.included(base)
+      base.class_eval do
+        alias setup_without_model_stubbing setup
+        alias setup setup_with_model_stubbing
+      end
+    end
+    
+    def setup_with_model_stubbing
+      setup_definition_for_test_run
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/definition_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/definition_spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/definition_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/definition_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,95 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+include ModelStubbing
+
+describe Definition do
+  before :all do
+    @definition = ModelStubbing.definitions[:default]
+  end
+  
+  it "defines as default definition" do
+    @definition.should be_kind_of(Definition)
+  end
+  
+  it "sets #current_time" do
+    @definition.current_time.should == Time.utc(2007, 6, 1)
+  end
+  
+  it "creates model instances" do
+    @definition.models[:users].should be_kind_of(Model)
+  end
+  
+  it "retrieves default stubs" do
+    @definition.retrieve_record(:user).should       == @definition.models[:users].default.record
+  end
+  
+  it "retrieves stubs" do
+    @definition.retrieve_record(:admin_user).should == @definition.models[:users].stubs[:admin].record
+  end
+end
+
+describe Definition, "setup" do
+  before :all do
+    @definition = ModelStubbing.definitions[:default]
+    @tester = FakeTester.new
+  end
+  
+  it "sets definition value" do
+    FakeTester.definition.should == @definition
+  end
+  
+  it "retrieves default stubs" do
+    @tester.stubs(:user).should == @definition.models[:users].default
+  end
+  
+  it "retrieves stubs" do
+    @tester.stubs(:admin_user).should == @definition.models[:users].stubs[:admin]
+  end
+  
+  it "retrieves default stubs with stub model method" do
+    @tester.users(:default).should       == @definition.models[:users].default.record
+  end
+  
+  it "retrieves stubs with stub model method" do
+    @tester.users(:admin).should == @definition.models[:users].stubs[:admin].record
+  end
+end
+
+describe Definition, "duping itself" do
+  before :all do
+    @defn = ModelStubbing.definitions[:default]
+    @copy = @defn.dup
+  end
+  
+  it "dups @current_time" do
+    @defn.current_time.should == @copy.current_time
+  end
+  
+  it "dups each model" do
+    @defn.models.each do |name, model|
+      duped_model = @copy.models[name]
+      model.should == duped_model
+      model.should_not be_equal(duped_model)
+      model.stubs.each do |key, stub|
+        duped_stub = @copy.models[name].stubs[key]
+        stub.should == duped_stub
+        stub.should_not be_equal(duped_stub)
+      end
+    end
+  end
+
+  it "dups each stub" do
+    @defn.stubs.each do |name, stub|
+      duped_stub = @copy.stubs[name]
+      stub.should == duped_stub
+      stub.should_not be_equal(duped_stub)
+    end
+  end
+
+  it "is not the same instance" do
+    @defn.object_id.should_not == @copy.object_id
+  end
+  
+  it "is still be equal" do
+    @defn.should == @copy
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/fixture_hash_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/fixture_hash_spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/fixture_hash_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/fixture_hash_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+module ModelStubbing
+  describe FixtureHash do
+    before :all do
+      @definition = ModelStubbing.definitions[:default]
+      @users      = @definition.models[:users]
+      @user       = @users.default
+      @user.stub!(:connection).and_return(FakeConnection.new)
+      @fixture    = FixtureHash.new(@user).update :foo => 1, :bar => :baz
+    end
+    
+    it "creates key list" do
+      keys = @fixture.key_list
+      keys.index("`foo`").should_not be_nil
+      keys.index("`bar`").should_not be_nil
+    end
+    
+    it "creates value list" do
+      values = @fixture.value_list
+      values.index(%("1")).should_not be_nil
+      values.index(%("baz")).should_not be_nil
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,110 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+include ModelStubbing
+
+describe Model do
+  before :all do
+    @model = ModelStubbing.definitions[:default].models[:users]
+  end
+  
+  it "is defined in stub file" do
+    @model.should be_kind_of(Model)
+  end
+
+  it "retrieves stubs" do
+    @model.retrieve_record(:default).should == @model.default.record
+    @model.retrieve_record(:admin).should   == @model.stubs[:admin].record
+  end
+end
+
+describe Model, "initialization with default options" do
+  before :all do
+    pending "Can't use default options without ActiveSupport" unless Object.const_defined?(:ActiveSupport)
+    @default = Model.new(nil, Post)
+  end
+  
+  it "sets Model#name" do
+    @default.name.should == :posts
+  end
+  
+  it "sets class" do
+    @default.model_class.should == Post
+  end
+  
+  it "sets plural value" do
+    @default.plural.should == :posts
+  end
+  
+  it "sets singular value" do
+    @default.singular.should == 'post'
+  end
+end
+
+describe Model, "initialization with custom options" do
+  before :all do
+    @custom  = Model.new(nil, Post, :name => :customs, :plural => :many_customs, :singular => :one_custom)
+  end
+  
+  it "sets Model#name" do
+    @custom.name.should == :customs
+  end
+  
+  it "sets class" do
+    @custom.model_class.should == Post
+  end
+  
+  it "sets plural value" do
+    @custom.plural.should == :many_customs
+  end
+  
+  it "sets singular value" do
+    @custom.singular.should == :one_custom
+  end
+end
+
+describe Model, "duping itself" do
+  before :all do
+    @model = ModelStubbing.definitions[:default].models[:users]
+    @copy  = @model.dup
+  end
+  
+  it "references same definition" do
+    @model.definition.should == @copy.definition
+  end
+  
+  %w(model_class name plural singular).each do |attr|
+    it "keeps @#{attr} intact" do
+      @model.send(attr).should == @copy.send(attr)
+    end
+  end
+  
+  it "has the same number of stubs" do
+    @model.stubs.size.should == @copy.stubs.size
+  end
+
+  it "has equal stubs" do
+    @model.stubs.each do |key, stub|
+      @model.stubs[key].should == @copy.stubs[key]
+      @model.stubs[key].model.should == @copy.stubs[key].model
+    end
+  end
+
+  it "has equal stubs with duped models" do
+    @model.stubs.each do |key, stub|
+      @model.stubs[key].model.should_not be_equal(@copy.stubs[key].model)
+    end
+  end
+
+  it "has duped stubs" do
+    @model.stubs.each do |key, stub|
+      @model.stubs[key].should_not be_equal(@copy.stubs[key])
+    end
+  end
+  
+  it "is not the same instance" do
+    @model.object_id.should_not == @copy.object_id
+  end
+  
+  it "is still be equal" do
+    @model.should == @copy
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_stubbing_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_stubbing_spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_stubbing_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_stubbing_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+# support rspec 1.0.8 and edge
+(Spec::DSL.const_defined?(:ExampleGroup) ? Spec::DSL::ExampleGroup : Spec::DSL::Example).extend ModelStubbing
+
+describe "Sample Stub Usage" do
+  define_models do
+    time 2007, 6, 1
+  
+    model User do
+      stub :name => 'fred', :admin => false
+      stub :admin, :admin => true
+    end
+  
+    model Post do
+      stub :title => 'first', :user => all_stubs(:admin_user), :published_at => current_time + 5.days
+    end
+  end
+  
+  it "should retrieve stubs" do
+    users(:default).name.should == 'fred'
+    users(:default).admin.should == false
+    
+    users(:admin).name.should == 'fred'
+    users(:admin).admin.should == true
+  end
+  
+  it "should retrieve instantiated stubs" do
+    users(:default).id.should == users(:default).id
+  end
+  
+  it "should generate custom stubs" do
+    custom = users(:default, :admin => true)
+    custom.id.should_not == users(:default).id
+    users(:default, :admin => true).id.should_not == custom.id
+  end
+  
+  it "should associate stubs" do
+    posts(:default).user.should == users(:admin)
+  end
+  
+  it "should stub current time" do
+    current_time.should == Time.utc(2007, 6, 1)
+    posts(:default).published_at.should == Time.utc(2007, 6, 6)
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_stubbing_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_stubbing_test.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_stubbing_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_stubbing_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), 'models')
+require 'test/unit'
+require 'mocha'
+
+Test::Unit::TestCase.extend ModelStubbing
+
+class SampleTest < Test::Unit::TestCase
+  define_models do
+    time 2007, 6, 1
+  
+    model User do
+      stub :name => 'fred', :admin => false
+      stub :admin, :admin => true
+    end
+  
+    model Post do
+      stub :title => 'first', :user => all_stubs(:admin_user), :published_at => current_time + 5.days
+    end
+  end
+  
+  def test_should_retrieve_stubs
+    assert_equal 'fred', users(:default).name
+    assert_equal false,  users(:default).admin
+    
+    assert_equal 'fred', users(:admin).name
+    assert users(:admin).admin
+  end
+  
+  def test_should_retrieve_instantiated_stubs
+    assert_equal users(:default).id, users(:default).id
+  end
+  
+  def test_should_generate_custom_stubs
+    custom = users(:default, :admin => true)
+    assert_not_equal users(:default).id, custom.id
+    assert_not_equal custom.id, users(:default, :admin => true).id
+  end
+  
+  def test_should_associate_stubs
+    assert_equal users(:admin), posts(:default).user
+  end
+  
+  def test_should_stub_current_time
+    assert_equal Time.utc(2007, 6, 1), current_time
+    assert_equal Time.utc(2007, 6, 6), posts(:default).published_at
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_stubbing_test_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_stubbing_test_spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/model_stubbing_test_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/model_stubbing_test_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,47 @@
+require File.join(File.dirname(__FILE__), 'models')
+require 'test/spec'
+require 'mocha'
+
+Test::Unit::TestCase.extend ModelStubbing
+
+describe "Sample" do
+  define_models do
+    time 2007, 6, 1
+  
+    model User do
+      stub :name => 'fred', :admin => false
+      stub :admin, :admin => true
+    end
+  
+    model Post do
+      stub :title => 'first', :user => all_stubs(:admin_user), :published_at => current_time + 5.days
+    end
+  end
+  
+  def test_should_retrieve_stubs
+    assert_equal 'fred', users(:default).name
+    assert_equal false,  users(:default).admin
+    
+    assert_equal 'fred', users(:admin).name
+    assert users(:admin).admin
+  end
+  
+  def test_should_retrieve_instantiated_stubs
+    assert_equal users(:default).id, users(:default).id
+  end
+  
+  def test_should_generate_custom_stubs
+    custom = users(:default, :admin => true)
+    assert_not_equal users(:default).id, custom.id
+    assert_not_equal custom.id, users(:default, :admin => true).id
+  end
+  
+  def test_should_associate_stubs
+    assert_equal users(:admin), posts(:default).user
+  end
+  
+  def test_should_stub_current_time
+    assert_equal Time.utc(2007, 6, 1), current_time
+    assert_equal Time.utc(2007, 6, 6), posts(:default).published_at
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/models.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/models.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/models.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/models.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,95 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems'
+require 'ruby-debug'
+require 'model_stubbing'
+begin
+  require 'active_support'
+rescue LoadError
+  puts $!.to_s
+end
+
+class FakeTester
+end
+
+class FakeConnection
+  def quote_column_name(name)
+    "`#{name}`"
+  end
+  
+  def quote(value, whatever)
+    value.to_s.inspect
+  end
+end
+
+class BlankModel
+  attr_accessor :id
+  attr_reader :attributes
+  
+  def initialize(attributes = {})
+    @attributes = attributes
+    attributes.each do |key, value|
+      set_attribute key, value
+    end
+  end
+  
+  def []=(key, value)
+    set_attribute key, value
+  end
+  
+  def ==(other_model)
+    self.class == other_model.class && id == other_model.id
+  end
+  
+  def inspect
+    "#{self.class.name} ##{id} => #{@attributes.inspect}"
+  end
+
+private
+  def meta_class
+    @meta_class ||= class << self; self end
+  end
+
+  def set_attribute(key, value)
+    meta_class.send :attr_accessor, key
+    send "#{key}=", value
+  end
+end
+
+User = Class.new BlankModel do
+  def self.table_name() @table_name ||= 'users' end
+end
+Post = Class.new BlankModel do
+  def self.table_name() @table_name ||= 'posts' end
+end
+module Foo
+  Bar = Class.new BlankModel do
+    def self.table_name() @table_name ||= 'foo_bars' end
+  end
+end
+
+ModelStubbing.define_models do
+  time 2007, 6, 1
+  
+  model User do
+    stub :name => 'bob', :admin => false
+  end
+  
+  model Foo::Bar do
+    stub :blah => 'foo'
+  end
+end
+
+ModelStubbing.define_models do
+  model User do
+    stub :admin, :admin => true # inherits from default fixture
+  end
+  
+  model Post do
+    # uses admin user fixture above
+    stub :title => 'initial', :user => all_stubs(:admin_user), :published_at => current_time + 5.days
+  end
+end
+
+ModelStubbing.definitions[:default].setup_on FakeTester
+
+Debugger.start
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/spec_helper.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+dir = File.dirname(__FILE__)
+
+# look for spec as plugin, in lib, or as a gem
+$LOAD_PATH << File.join(dir, '..', '..', 'rspec', 'lib')
+$LOAD_PATH << File.join(dir, '..', '..', '..', 'rspec', 'lib')
+begin
+  require 'spec'
+rescue LoadError
+  # doh, get it from a gem then
+  require 'rubygems'
+  require 'spec'
+end
+
+require File.join(File.dirname(__FILE__), 'models')
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/model_stubbing/spec/stub_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/stub_spec.rb
--- mephisto-0.7.3/vendor/plugins/model_stubbing/spec/stub_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/model_stubbing/spec/stub_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,166 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+include ModelStubbing
+
+describe Stub do
+  before :all do
+    @definition = ModelStubbing.definitions[:default]
+    @users      = @definition.models[:users]
+    @posts      = @definition.models[:posts]
+    @user       = @users.default
+    @post       = @posts.default
+  end
+
+  it "is defined in stub file" do
+    @user.should be_kind_of(Stub)
+  end
+  
+  it "has the default stub's attributes" do
+    @user.attributes.should == {:name => 'bob', :admin => false}
+    @post.attributes.should == {:title => 'initial', :user => @users.stubs[:admin], :published_at => @definition.current_time + 5.days}
+  end
+  
+  it "#with returns merged attributes" do
+    @post.with(:title => 'fred').should == {:title => 'fred', :user => @users.stubs[:admin].record, :published_at => @definition.current_time + 5.days}
+  end
+  
+  it "#only returns only given keys" do
+    @post.only(:title).should == {:title => 'initial'}
+  end
+  
+  it "#except returns other keys" do
+    @post.except(:published_at).should == {:title => 'initial', :user => @users.stubs[:admin].record}
+  end
+  
+  it "merges named stub attributes with default attributes" do
+    @users.stubs[:admin].attributes.should == {:name => 'bob', :admin => true}
+  end
+  
+  it "sets default model stubs in the definition's global stubs" do
+    @definition.stubs[:user].should == @user
+  end
+  
+  it "sets custom model stubs in the defintion's global stub with stub name prefix" do
+    @definition.stubs[:admin_user].should == @users.stubs[:admin]
+  end
+end
+
+describe Stub, "duping itself" do
+  before :all do
+    @stub = ModelStubbing.definitions[:default].models[:users].default
+    @copy = @stub.dup
+  end 
+  
+  %w(name model attributes global_key).each do |attr|
+    it "keeps @#{attr} intact" do
+      @stub.send(attr).should == @copy.send(attr)
+    end
+  end
+  
+  it "is not the same instance" do
+    @stub.object_id.should_not == @copy.object_id
+  end
+  
+  it "is still be equal" do
+    @stub.should == @copy
+  end
+end
+
+describe Stub, "duping itself with duped model" do
+  before :all do
+    @stub = ModelStubbing.definitions[:default].models[:users].default
+    @copy = @stub.dup @stub.model.dup
+  end 
+  
+  %w(name model attributes global_key).each do |attr|
+    it "keeps @#{attr} intact" do
+      @stub.send(attr).should == @copy.send(attr)
+    end
+  end
+  
+  it "is not the same instance" do
+    @stub.object_id.should_not == @copy.object_id
+  end
+  
+  it "is still be equal" do
+    @stub.should == @copy
+  end
+end
+
+describe Stub, "duping itself with different model" do
+  before :all do
+    @defn = ModelStubbing.definitions[:default]
+    @stub = @defn.models[:users].default
+    @copy = @stub.dup @defn.models[:posts].dup
+  end
+  
+  %w(name attributes).each do |attr|
+    it "keeps @#{attr} intact" do
+      @stub.send(attr).should == @copy.send(attr)
+    end
+  end
+  
+  it "creates global key from new model" do
+    @copy.global_key.should == :post
+  end
+  
+  it "is not the same instance" do
+    @stub.object_id.should_not == @copy.object_id
+  end
+  
+  it "is not equal" do
+    @stub.should_not == @copy
+  end
+end
+
+describe Stub, "instantiating a record" do
+  before :all do
+    @model   = ModelStubbing.definitions[:default].models[:users]
+    @stub = @model.default
+  end
+  
+  before do
+    ModelStubbing.records.clear
+  end
+  
+  it "sets id" do
+    @stub.record.id.should >= 1000
+  end
+  
+  it "is one of the model's model class" do
+    @record  = @stub.record
+    @record.should be_kind_of(@model.model_class)
+  end
+  
+  it "sets correct attributes" do
+    @record  = @stub.record
+    @record.name.should  == 'bob'
+    @record.admin.should == false
+  end
+  
+  it "allows custom attributes during instantiation" do
+    @record  = @stub.record :admin => true
+    @record.admin.should == true
+  end
+  
+  it "allows use of #current_time in a stub" do
+    ModelStubbing.definitions[:default].models[:posts].default.record.published_at.should == Time.utc(2007, 6, 6)
+  end
+end
+
+describe Stub, "instantiating a record with an association" do
+  before :all do
+    @definition = ModelStubbing.definitions[:default]
+    @users      = @definition.models[:users]
+    @posts      = @definition.models[:posts]
+    @user       = @users.stubs[:admin]
+    @post       = @posts.default
+  end
+  
+  before do
+    ModelStubbing.records.clear
+  end
+  
+  it "stubs associated records" do
+    @post.record.user.should == @user.record
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/permalink_fu/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/README
--- mephisto-0.7.3/vendor/plugins/permalink_fu/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+PermalinkFu
+
+This is a simple plugin extracted from Mephisto for creating permalinks from attributes.
+
+  class Article < ActiveRecord::Base
+    has_permalink :title
+  end
+
+This will escape the title, making it fit to use in a URL in the after_validation callback.
+
+Use PermalinkFu.escape to escape a string manually if you like.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/permalink_fu/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/init.rb
--- mephisto-0.7.3/vendor/plugins/permalink_fu/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+ActiveRecord::Base.send :include, PermalinkFu
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/permalink_fu/lib/permalink_fu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/lib/permalink_fu.rb
--- mephisto-0.7.3/vendor/plugins/permalink_fu/lib/permalink_fu.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/lib/permalink_fu.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,91 @@
+require 'iconv'
+require 'digest/sha1'
+module PermalinkFu
+  class << self
+    attr_accessor :translation_to
+    attr_accessor :translation_from
+    
+    def escape(str)
+      s = Iconv.iconv(translation_to + '//IGNORE', translation_from, str).to_s
+      s.gsub!(/\W+/, ' ') # all non-word chars to spaces
+      s.strip!            # ohh la la
+      s.downcase!         #
+      s.gsub!(/\ +/, '-') # spaces to dashes, preferred separator char everywhere
+      s
+    end
+  end
+  
+  def self.included(base)
+    base.extend ClassMethods
+    class << base
+      attr_accessor :permalink_options
+      attr_accessor :permalink_attributes
+      attr_accessor :permalink_field
+    end
+  end
+  
+  module ClassMethods
+    # Specifies the given field(s) as a permalink, meaning it is passed through PermalinkFu.escape and set to the permalink_field.  This
+    # is done
+    #
+    #   class Foo < ActiveRecord::Base
+    #     # stores permalink form of #title to the #permalink attribute
+    #     has_permalink :title
+    #   
+    #     # stores a permalink form of "#{category}-#{title}" to the #permalink attribute
+    #   
+    #     has_permalink [:category, :title]
+    #   
+    #     # stores permalink form of #title to the #category_permalink attribute
+    #     has_permalink [:category, :title], :category_permalink
+    #
+    #     # add a scope
+    #     has_permalink :title, :scope => :blog_id
+    #
+    #     # add a scope and specify the permalink field name
+    #     has_permalink :title, :slug, :scope => :blog_id
+    #   end
+    #
+    def has_permalink(attr_names = [], permalink_field = nil, options = {})
+      if permalink_field.is_a?(Hash)
+        options = permalink_field
+        permalink_field = nil
+      end
+      self.permalink_attributes = Array(attr_names)
+      self.permalink_field      = permalink_field || :permalink
+      self.permalink_options    = options
+      before_validation :create_unique_permalink
+      evaluate_attribute_method permalink_field, "def #{self.permalink_field}=(new_value);write_attribute(:#{self.permalink_field}, PermalinkFu.escape(new_value));end", "#{self.permalink_field}="
+    end
+  end
+  
+protected
+  def create_unique_permalink
+    if send(self.class.permalink_field).to_s.empty?
+      send("#{self.class.permalink_field}=", create_permalink_for(self.class.permalink_attributes))
+    end
+    base       = send(self.class.permalink_field)
+    counter    = 1
+    # oh how i wish i could use a hash for conditions
+    conditions = ["#{self.class.permalink_field} = ?", base]
+    unless new_record?
+      conditions.first << " and id != ?"
+      conditions       << id
+    end
+    if self.class.permalink_options[:scope]
+      conditions.first << " and #{self.class.permalink_options[:scope]} = ?"
+      conditions       << send(self.class.permalink_options[:scope])
+    end
+    while self.class.exists?(conditions)
+      conditions[1] = "#{base}-#{counter += 1}"
+      send("#{self.class.permalink_field}=", conditions[1])
+    end
+  end
+
+  def create_permalink_for(attr_names)
+    attr_names.collect { |attr_name| send(attr_name).to_s } * " "
+  end
+end
+
+PermalinkFu.translation_to   = 'ascii//translit'
+PermalinkFu.translation_from = 'utf-8'
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/permalink_fu/test/permalink_fu_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/test/permalink_fu_test.rb
--- mephisto-0.7.3/vendor/plugins/permalink_fu/test/permalink_fu_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/permalink_fu/test/permalink_fu_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,162 @@
+require 'test/unit'
+require File.join(File.dirname(__FILE__), '../lib/permalink_fu')
+
+class BaseModel
+  include PermalinkFu
+  attr_accessor :id
+  attr_accessor :title
+  attr_accessor :extra
+  attr_reader   :permalink
+  attr_accessor :foo
+
+  class << self
+    attr_accessor :validation
+  end
+  
+  def self.generated_methods
+    @generated_methods ||= []
+  end
+  
+  def self.primary_key
+    :id
+  end
+  
+  def self.logger
+    nil
+  end
+  
+  # ripped from AR
+  def self.evaluate_attribute_method(attr_name, method_definition, method_name=attr_name)
+
+    unless method_name.to_s == primary_key.to_s
+      generated_methods << method_name
+    end
+
+    begin
+      class_eval(method_definition, __FILE__, __LINE__)
+    rescue SyntaxError => err
+      generated_methods.delete(attr_name)
+      if logger
+        logger.warn "Exception occurred during reader method compilation."
+        logger.warn "Maybe #{attr_name} is not a valid Ruby identifier?"
+        logger.warn "#{err.message}"
+      end
+    end
+  end
+
+  def self.exists?(*args)
+    false
+  end
+
+  def self.before_validation(method)
+    self.validation = method
+  end
+
+  def validate
+    send self.class.validation
+    permalink
+  end
+  
+  def new_record?
+    @id.nil?
+  end
+  
+  def write_attribute(key, value)
+    instance_variable_set "@#{key}", value
+  end
+end
+
+class MockModel < BaseModel
+  def self.exists?(conditions)
+    if conditions[1] == 'foo'   || conditions[1] == 'bar' || 
+      (conditions[1] == 'bar-2' && conditions[2] != 2)
+      true
+    else
+      false
+    end
+  end
+
+  has_permalink :title
+end
+
+class ScopedModel < BaseModel
+  def self.exists?(conditions)
+    if conditions[1] == 'foo' && conditions[2] != 5
+      true
+    else
+      false
+    end
+  end
+
+  has_permalink :title, :scope => :foo
+end
+
+class MockModelExtra < BaseModel
+  has_permalink [:title, :extra]
+end
+
+class PermalinkFuTest < Test::Unit::TestCase
+  @@samples = {
+    'This IS a Tripped out title!!.!1  (well/ not really)' => 'this-is-a-tripped-out-title-1-well-not-really',
+    '////// meph1sto r0x ! \\\\\\' => 'meph1sto-r0x',
+    'āčēģīķļņū' => 'acegiklnu',
+    '中文測試 chinese text' => 'chinese-text'
+  }
+
+  @@extra = { 'some-)()()-ExtRa!/// .data==?>    to \/\/test' => 'some-extra-data-to-test' }
+
+  def test_should_escape_permalinks
+    @@samples.each do |from, to|
+      assert_equal to, PermalinkFu.escape(from)
+    end
+  end
+  
+  def test_should_escape_activerecord_model
+    @m = MockModel.new
+    @@samples.each do |from, to|
+      @m.title = from; @m.permalink = nil
+      assert_equal to, @m.validate
+    end
+  end
+
+  def test_multiple_attribute_permalink
+    @m = MockModelExtra.new
+    @@samples.each do |from, to|
+      @@extra.each do |from_extra, to_extra|
+        @m.title = from; @m.extra = from_extra; @m.permalink = nil
+        assert_equal "#{to}-#{to_extra}", @m.validate
+      end
+    end
+  end
+  
+  def test_should_create_unique_permalink
+    @m = MockModel.new
+    @m.permalink = 'foo'
+    @m.validate
+    assert_equal 'foo-2', @m.permalink
+    
+    @m.permalink = 'bar'
+    @m.validate
+    assert_equal 'bar-3', @m.permalink
+  end
+  
+  def test_should_not_check_itself_for_unique_permalink
+    @m = MockModel.new
+    @m.id = 2
+    @m.permalink = 'bar-2'
+    @m.validate
+    assert_equal 'bar-2', @m.permalink
+  end
+  
+  def test_should_create_unique_scoped_permalink
+    @m = ScopedModel.new
+    @m.permalink = 'foo'
+    @m.validate
+    assert_equal 'foo-2', @m.permalink
+
+    @m.foo = 5
+    @m.permalink = 'foo'
+    @m.validate
+    assert_equal 'foo', @m.permalink
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/CHANGES technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/CHANGES
--- mephisto-0.7.3/vendor/plugins/rspec/CHANGES	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/CHANGES	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,987 @@
+== Version 1.1.0 (in SVN)
+
+Textmate Bundle users - this release adds a new RSpec bundle that highlights describe, it, before and after and
+provides navigation to descriptions and examples (rather than classes and methods). When you first install this,
+it is going to try to hijack all of your .rb files. All you need to do is open a .rb file that does not end with
+'spec.rb' and change the bundle selection from RSpec to Ruby. TextMate will do the right thing from then on.
+
+Shortcuts for tab-activated snippets all follow the TextMate convention of 2 or 3 letters of the first word, followed by the first letter of each subsequent word. So "should have_at_least" would be triggered by shhal.
+
+We reduced the scope for running spec directories, files, a single file or individual spec in TextMate to source.ruby.rspec. This allowed us to restore the standard Ruby shortcuts:
+
+CMD-R runs all the specs in one file
+CMD-SHIFT-R runs an individual spec
+CMD-OPT-R runs any files or directories selected in the TextMate drawer
+
+rspec_on_rails users - don't forget to run script/generate rspec
+
+* Applied LH[#14] Adding support for by_at_least/by_at_most in Change matcher (Patch from Saimon Moore)
+* Applied LH[#12] Fix for TM when switching to alternate file (Patch from Trevor Squires)
+* Applied LH[#133] ExampleMatcher should match against before(:all) (Patch from Bob Cotton)
+* Applied LH[#134] Only load spec inside spec_helper.rb (Patch from Mark Van Holstyn)
+* RSpec now bails immediately if there are examples with identical names.
+* Applied LH[#132]  Plain Text stories should support Given and Given: (Patch from Jarkko Laine)
+* Applied LH[#16] Have SimpleMatchers expose their description for specdocs (Patch from Bryan Helmkamp)
+* Stories now support --colour
+* Changed the DSL modules to Example (i.e. Spec::Example instead of Spec::DSL)
+* Applied [#15608] Story problem if parenthesis used in Given, When, Then or And (Patch from Sinclair Bain)
+* Applied [#15659] GivenScenario fails when it is a RailsStory (Patch from Nathan Sutton)
+* Fixed [#15639] rcov exclusion configuration. (Spec::Rails projects can configure rcov with spec/rcov.opts)
+* The rdoc formatter (--format rdoc) is gone. It was buggy and noone was using it.
+* Changed Spec::DSL::Behaviour to Spec::DSL::ExampleGroup
+* Changed Spec::DSL::SharedBehaviour to Spec::DSL::SharedExampleGroup
+* Applied [#14023] Small optimization for heavily proxied objects. (Patch from Ian Leitch)
+* Applied [#13943] ProfileFormatter (Top 10 slowest examples) (Patch from Ian Leitch)
+* Fixed [#15232] heckle is not working correctly in trunk (as of r2801)
+* Applied [#14399] Show pending reasons in HTML report (Patch from Bryan Helmkamp)
+* Discovered fixed: [#10263] mock "leak" when setting an expectation in a block passed to mock#should_receive
+* Fixed [#14671] Spec::DSL::ExampleRunner gives "NO NAME because of --dry-run" for every example for 'rake spec:doc'
+* Fixed [#14543] rspec_scaffold broken with Rails 2.0
+* Removed Patch [#10577] Rails with Oracle breaks 0.9.2 - was no longer necessary since we moved describe to the Main object (instead of Object)
+* Fixed [#14527] specs run twice on rails 1.2.4 and rspec/rspec_on_rails trunk
+* Applied [#14043] Change output ordering to show pending before errors (Patch from Mike Mangino)
+* Applied [#14095] Don't have ./script/generate rspec create previous_failures.txt (Patch from Bryan Helmkamp)
+* Applied [#14254] Improved error handling for Object#should and Object#should_not (Patch from Antti Tarvainen)
+* Applied [#14186] Remove dead code from message_expecation.rb (Patch from Antti Tarvainen)
+* Applied [#14183] Tiny improvement on mock_spec.rb (Patch from Antti Tarvainen)
+* Applied [#14208] Fix to Mock#method_missing raising NameErrors instead of MockExpectationErrors (Patch from Antti Tarvainen)
+* Applied [#14255] Fixed examples in mock_spec.rb and shared_behaviour_spec.rb (Patch from Antti Tarvainen)
+* Applied [#14362] partially mocking objects that define == can blow up (Patch from Pat Maddox)
+* test_ methods with an arity of 0 defined in a describe block or Example object will be run as an Example, providing a seamless transition from Test::Unit
+* Removed BehaviourRunner
+* Fixed [#13969] Spec Failures on Trunk w/ Autotest
+* Applied [#14156] False positives with should_not (Patch from Antti Tarvainen)
+* Applied [#14170] route_for and params_from internal specs fixed (Patch from Antti Tarvainen)
+* Fixed [#14166] Cannot build trunk
+* Applied [#14142] Fix for bug #11602: Nested #have_tag specifications fails on the wrong line number (Patch from Antti Tarvainen)
+* Removed warn_if_no_files argument and feature
+* Steps (Given/When/Then) with no blocks are treated as pending
+* Applied [#13913] Scenario should treat no code block as pending (Patch from Evan Light)
+* Fixed [#13370] Weird mock expectation error (Patch from Mike Mangino)
+* Applied [#13952] Fix for performance regression introduced in r2096 (Patch from Ian Leitch)
+* Applied [#13881] Dynamically include Helpers that are included on ActionView::Base (Patch from Brandon Keepers)
+* Applied [#13833] ActionView::Helpers::JavaScriptMacrosHelper removed after 1.2.3 (Patch from Yurii Rashkovskii)
+* Applied [#13814] RSpec on Rails w/ fixture-scenarios (Patch from Shintaro Kakutani)
+* Add ability to define Example subclass instead of using describe
+* Applied Patch from James Edward Gray II to improve syntax highlighting in TextMate
+* Fixed [#13579] NoMethodError not raised for missing helper methods
+* Fixed [#13713] form helper method 'select' can not be called when calling custom helper methods from specs
+* Example subclasses Test::Unit::TestCase
+* Added stub_everything method to create a stub that will return itself for any message it doesn't understand
+* Added stories directory with stories/all.rb and stories/helper.rb when you script/generate rspec
+* Applied [#13554] Add "And" so you can say Given... And... When... Then... And...
+* Applied [#11254] RSpec syntax coloring and function pop-up integration in TextMate (Patch from Wincent Colaiuta)
+* Applied [#13143] ActionView::Helpers::RecordIdentificationHelper should be included if present (Patch from Jay Levitt)
+* Applied [#13567] patch to allow stubs to yield consecutive values (Patch from Rupert Voelcker)
+* Applied [#13559] reverse version of route_for (Patch from Rupert Voelcker)
+* Added [#13532] /lib specs should get base EvalContext
+* Applied [#13451] Add a null_object option to mock_model (Patch from James Deville)
+* Applied [#11919] Making non-implemented specs easy in textmate (Patch from Scott Taylor)
+* Applied [#13274] ThrowSymbol recognized a NameError triggered by Kernel#method_missing as a thrown Symbol
+* Applied [#12722] the alternate file command does not work in rails views due to scope (Patch from Carl Porth)
+* Behaviour is now a Module that is used by Example class methods and SharedBehaviour
+* Added ExampleDefinition
+* Added story runner framework based on rbehave [#12628]
+* Applied [#13336] Helper directory incorrect for rake stats in statsetup task (Patch from Curtis Miller)
+* Applied [#13339] Add the ability for spec_parser to parse describes with :behaviour_type set (Patch from Will Leinweber and Dav Yaginuma)
+* Fixed [#13271] incorrect behaviour with expect_render and stub_render
+* Applied [#13129] Fix failing specs in spec_distributed (Patch from Bob Cotton)
+* Applied [#13118] Rinda support for Spec::Distributed (Patch from Bob Cotton)
+* Removed BehaviourEval
+* Removed Behaviour#inherit
+* Moved implementation of install_dependencies to example_rails_app
+* Renamed RSPEC_DEPS to VENDOR_DEPS
+* Added Example#not_implemented?
+* You can now stub!(:msg).with(specific args)
+* describe("A", Hash, "with one element") will generate description "A Hash with one element" (Tip from Ola Bini)
+* Applied [#13016] [DOC] Point out that view specs render, well, a view (Patch from Jay Levitt)
+* Applied [#13078] Develop rspec with autotest (Patch from Scott Taylor)
+* Fixed [#13065] Named routes throw a NoMethodError in Helper specs (Patches from James Deville and Mike Mangino)
+* Added (back) the verbose attribute in Spec::Rake::SpecTask
+* Changed documentation to point at the new http svn URL, which is more accessible.
+
+== Version 1.0.8
+
+Another bugfix release - this time to resolve the version mismatch
+
+== Version 1.0.7
+
+Quick bugfix release to ensure that you don't have to have the rspec gem installed
+in order to use autotest with rspec_on_rails.
+
+* Fixed [#13015] autotest gives failure in 'spec_command' after upgrade 1.0.5 to 1.0.6
+
+== Version 1.0.6
+
+The "holy cow, batman, it's been a long time since we released and there are a ton of bug
+fixes, patches and even new features" release.
+
+Warning: Spec::Rails users: In fixing 11508, we've removed the raise_controller_errors method. As long as you
+follow the upgrade instructions and run 'script/generate rspec' you'll be fine, but if you skip this
+step you need to manually go into spec_helper.rb and remove the call to that method (if present - it
+might not be if you haven't upgraded in a while).
+
+Warning: Implementors of custom formatters. Formatters will now be sent an Example object instead of just a 
+String for #example_started, #example_passed and #example_failed. In certain scenarios 
+(Spec::Ui with Spec::Distributed), the formatter must ask the Example for its sequence number instead of
+keeping track of a sequence number internal to the formatter. Most of you shouldn't need to upgrade
+your formatters though - the Example#to_s method returns the example name/description, so you should be
+able to use the passed Example instance as if it were a String.
+
+* Applied [#12986] Autotest Specs + Refactoring (Patch from Scott Tayler)
+* Added a #close method to formatters, which allows them to gracefully close streams.
+* Applied [#12935] Remove requirement that mocha must be installed as a gem when used as mocking framework. (Patch from Ryan Kinderman).
+* Fixed [#12893] RSpec's Autotest should work with rspec's trunk
+* Fixed [#12865] Partial mock error when object has an @options instance var
+* Applied [#12701] Allow checking of content captured with content_for in view specs (Patch from Jens Kr�mer)
+* Applied [#12817] Cannot include same shared behaviour when required with absolute paths (Patch from Ian Leitch)
+* Applied [#12719] rspec_on_rails should not include pagination helper (Patch from Matthijs Langenberg)
+* Fixed [#12714] helper spec not finding rails core helpers
+* Applied [#12611] should_not redirect_to implementation (Patch from Yurii Rashkovskii)
+* Applied [#12682] Not correctly aliasing original 'stub!' and 'should_receive' methods for ApplicationController (Patch from Matthijs Langenberg)
+* Disabled controller.should_receive(:render) and controller.stub!(:render). Use expect_render or stub_render instead.
+* Applied [#12484] Allow a Behaviour's Description to flow through to the Formatter (Patch from Bob Cotton)
+* Fixed [#12448] The spec:plugins rake task from rspec_on_rails should ignore specs from the rspec_on_rails plugin
+* Applied [#12300] rr integration (patch from Kyle Hargraves)
+* Implemented [#12284] mock_with :rr (integration with RR mock framework: http://rubyforge.org/projects/pivotalrb/)
+* Applied [#12237] (tiny) added full path to mate in switch_command (Patch from Carl Porth)
+* Formatters will now be sent an Example object instead of just a String for certain methods
+* All Spec::Rake::SpecTask attributes can now be procs, which allows for lazy evaluation.
+* Changed the Spec::Ui interfaces slightly. See examples.
+* Applied [#12174] mishandling of paths with spaces in spec_mate switch_command (Patch from Carl Porth)
+* Implemented [#8315] File "Go to..." functionality
+* Applied [#11917] Cleaner Spec::Ui error for failed Selenium connection (Patch from Ian Dees)
+* Applied [#11888] rspec_on_rails spews out warnings when assert_select is used with an XML response (Patch from Ian Leitch)
+* Applied [#12010] Nicer failure message formatting (Patch from Wincent Colaiuta)
+* Applied [#12156] smooth open mate patch (Patch from Ienaga Eiji)
+* Applied [#10577] Rails with Oracle breaks 0.9.2. (Patch from Sinclair Bain)
+* Fixed [#12079] auto-generated example name incomplete: should have 1 error on ....]
+* Applied [#12066] Docfix for mocks/mocks.page (Patch from Kyle Hargraves)
+* Fixed [#11891] script/generate rspec_controller fails to create appropriate views (from templates) on edge rails
+* Applied [#11921] Adds the correct controller_name from derived_controller_name() to the ViewExampleController (Patch from Eloy Duran)
+* Fixed [#11903] config.include with behaviour_type 'hash' does not work
+* Examples without blocks and pending is now reported with a P instead of a *
+* Pending blocks that now pass are rendered blue
+* New behaviour for after: If an after block raises an error, the other ones will still run instead of bailing at the first. 
+* Made it possible to run spec from RSpec.tmbundle with --drb against a Rails spec_server.
+* Applied [#11868] Add ability for pending to optionally hold a failing block and to fail when it passes (Patch from Bob Cotton)
+* Fixed [#11843] watir_behaviour missing from spec_ui gem
+* Added 'switch between source and spec file' command in Spec::Mate (based on code from Ruy Asan)
+* Applied [#11509] Documentation - RSpec requires hpricot
+* Applied [#11807] Daemonize spec_server and rake tasks to manage them. (patch from Kyosuke MOROHASHI)
+* Added pending(message) method
+* Fixed [#11777] should render_template doesn't check paths correctly
+* Fixed [#11749] Use of 'rescue => e' does not catch all exceptions
+* Fixed [#11793] should raise_error('with a message') does not work correctly
+* Fixed [#11774] Mocks should respond to :kind_of? in the same way they respond to :is_a?
+* Fixed [#11508] Exceptions are not raised for Controller Specs (removed experimental raise_controller_errors)
+* Applied [#11615] Partial mock methods give ambiguous failures when given a method name as a String (Patch from Jay Phillips)
+* Fixed [#11545] Rspec doesn't handle should_receive on ActiveRecord associations (Patch from Ian White)
+* Fixed [#11514] configuration.use_transactional_fixtures is ALWAYS true, regardless of assignment
+* Improved generated RESTful controller examples to cover both successful and unsuccessful POST and PUT
+* Changed TextMate snippets for controllers to pass controller class names to #describe rather than controller_name.
+* Changed TextMate snippets for mocks to use no_args() and any_args() instead of the deprecated Symbols.
+* Applied [#11500] Documentation: no rails integration specs in 1.0
+* Renamed SpecMate's shortcuts for running all examples and focused examples to avoid conflicts (CMD-d and CMD-i)
+* Added a TextMate snippet for custom matchers, lifted from Geoffrey Grosenbach's RSpec peepcode show.
+* The translator translates mock constraints to the new matchers that were introduced in 1.0.4
+* Documented environment variables for Spec::Rake::SpecTask. Renamed SPECOPTS and RCOVOPTS to SPEC_OPTS and RCOV_OPTS.
+* Fixed [#10534] Windows: undefined method 'controller_name'
+
+== Version 1.0.5
+Bug fixes. Autotest plugin tweaks.
+
+* Fixed [#11378] fix to 10814 broke drb (re-opened #10814)
+* Fixed [#11223] Unable to access flash from rails helper specs
+* Fixed [#11337] autotest runs specs redundantly
+* Fixed [#11258] windows: autotest won't run
+* Applied [#11253] Tweaks to autotest file mappings (Patch from Wincent Colaiuta)
+* Applied [#11252] Should be able to re-load file containing shared behaviours without raising an exception (Patch from Wincent Colaiuta)
+* Fixed [#11247] standalone autotest doesn't work because of unneeded autotest.rb
+* Applied [#11221] Autotest support does not work w/o Rails Gem installed (Patch from Josh Knowles)
+
+== Version 1.0.4
+The getting ready for JRuby release.
+
+* Fixed [#11181] behaviour_type scoping of config.before(:each) is not working
+* added mock argument constraint matchers (anything(), boolean(), an_instance_of(Type)) which work with rspec or mocha
+* added mock argument constraint matchers (any_args(), no_args()) which only work with rspec
+* deprecated rspec's symbol mock argument constraint matchers (:any_args, :no_args, :anything, :boolean, :numeric, :string)
+* Added tarball of rspec_on_rails to the release build to support folks working behind a firewall that blocks svn access.
+* Fixed [#11137] rspec incorrectly handles flash after resetting the session
+* Fixed [#11143] Views code for ActionController::Base#render broke between 1.0.0 and 1.0.3 on Rails Edge r6731
+* Added raise_controller_errors for controller examples in Spec::Rails
+
+== Version 1.0.3
+Bug fixes.
+
+* Fixed [#11104] Website uses old specify notation
+* Applied [#11101] StringHelpers.starts_with?(prefix) assumes a string parameter for _prefix_
+* Removed 'rescue nil' which was hiding errors in controller examples.
+* Fixed [#11075] controller specs fail when using mocha without integrated_views
+* Fixed problem with redirect_to failing incorrectly against edge rails.
+* Fixed [#11082] RspecResourceGenerator should be RspecScaffoldGenerator
+* Fixed [#10959] Focused Examples do not work for Behaviour defined with constant with modules
+
+== Version 1.0.2
+This is just to align the version numbers in rspec and rspec_on_rails.
+
+== Version 1.0.1
+This is a maintenance release with mostly cleaning up, and one minor enhancement -
+Modules are automatically included when described directly.
+
+* Renamed Spec::Rails' rspec_resource generator to rspec_scaffold.
+* Removed Spec::Rails' be_feed matcher since it's based on assert_select_feed which is not part of Rails (despite that docs for assert_select_encoded says it is).
+* describe(SomeModule) will include that module in the examples. Like for Spec::Rails helpers, but now also in core.
+* Header in HTML report will be yellow instead of red if there is one failed example
+* Applied [#10951] Odd instance variable name in rspec_model template (patch from Kyle Hargraves)
+* Improved integration with autotest (Patches from Ryan Davis and David Goodland)
+* Some small fixes to make all specs run on JRuby.
+
+== Version 1.0.0
+The stake in the ground release. This represents a commitment to the API as it is. No significant
+backwards compatibility changes in the API are expected after this release.
+
+* Fixed [#10923] have_text matcher does not support should_not
+* Fixed [#10673] should > and should >= broken
+* Applied [#10921] Allow verify_rcov to accept greater than threshold coverage %'s via configuration
+* Applied [#10920] Added support for not implemented examples (Patch from Chad Humphries and Ken Barker)
+* Patch to allow not implemented examples.  This works by not providing a block to the example. (Patch from Chad Humphries, Ken Barker)
+* Yanked support for Rails 1.1.6 in Spec::Rails
+* RSpec.tmbundle uses CMD-SHIFT-R to run focused examples now.
+* Spec::Rails now bundles a spec:rcov task by default (suggestion from Kurt Schrader)
+* Fixed [#10814] Runner loads shared code, test cases require them again
+* Fixed [#10753] Global before and after
+* Fixed [#10774] Allow before and after to be specified in config II
+* Refactored Spec::Ui examples to use new global before and after blocks.
+* Added instructions about how to get Selenium working with Spec::Ui (spec_ui/examples/selenium/README.txt)
+* Fixed [#10805] selenium.rb missing from gem?
+* Added rdocs explaining how to deal with errors in Rails' controller actions
+* Applied [#10770] Finer grained includes.
+* Fixed [#10747] Helper methods defined in shared specs are not visible when shared spec is used
+* Fixed [#10748] Shared descriptions in separate files causes 'already exists' error
+* Applied [#10698] Running with --drb executes specs twice (patch from Ruy Asan)
+* Fixed [#10871] 0.9.4 - Focussed spec runner fails to run specs in descriptions with type and string when there is no leading space in the string
+
+== Version 0.9.4
+This release introduces massive improvements to Spec::Ui - the user interface functional testing
+extension to RSpec. There are also some minor bug fixes to the RSpec core.
+
+* Massive improvements to Spec::Ui. Complete support for all Watir's ie.xxx(how, what) methods. Inline screenshots and HTML.
+* Reactivated --timeout, which had mysteriously been deactivated in a recent release.
+* Fixed [#10669] Kernel#describe override does not cover Kernel#context
+* Applied [#10636] Added spec for OptionParser in Runner (Patch from Scott Taylor)
+* Added [#10516] should_include should be able to accept multiple items
+* Applied [#10631] redirect_to matcher doesn't respect request.host (Patch from Tim Lucas)
+* Each formatter now flushes their own IO. This is to avoid buffering of output.
+* Fixed [#10670] IVarProxy#delete raises exception when instance variable does not exist
+
+== Version 0.9.3
+This is a bugfix release.
+
+* Fixed [#10594] Failing Custom Matcher show NAME NOT GENERATED description
+* describe(SomeType, "#message") will not add a space: "SomeType#message" (likewise for '.')
+* describe(SomeType, "message") will have a decription with a space: "SomeType message"
+* Applied [#10566] prepend_before and prepend_after callbacks
+* Applied [#10567] Call setup and teardown using before and after callbacks
+
+== Version 0.9.2
+This is a quick maintenance release. 
+
+* Added some website love
+* Fixed [#10542] reverse predicate matcher syntax
+* Added a spec:translate Rake task to make 0.9 translation easier with Spec:Rails
+* Better translation of should_redirect_to
+* Fixed --colour support for Windows. This is a regression that was introduced in 0.9.1
+* Applied [#10460] Make SpecRunner easier to instantiate without using commandline args
+
+== Version 0.9.1
+
+This release introduces #describe and #it (aliased as #context and #specify for
+backwards compatibility). This allows you to express specs like this:
+
+  describe SomeClass do # Creates a Behaviour
+    it "should do something" do # Creates an Example
+    end
+  end
+
+The command line features four new options that give you more control over what specs
+are being run and in what order. This can be used to verify that your specs are
+independent (by running in opposite order with --reverse). It can also be used to cut 
+down feedback time by running the most recently modified specs first (--loadby mtime --reverse).
+
+Further, --example replaces the old --spec option, and it can now take a file name of
+spec names as an alternative to just a spec name. The --format failing_examples:file.txt 
+option allows you to output an --example compatible file, which makes it possible to only 
+rerun the specs that failed in the last run. Spec::Rails uses all of these four options 
+by default to optimise your RSpec experience.
+
+There is now a simple configuration model. For Spec::Rails, you do something like this:
+
+  Spec::Runner.configure do |config|
+    config.use_transactional_fixtures = true
+    config.use_instantiated_fixtures  = false
+    config.fixture_path = RAILS_ROOT + '/spec/fixtures'
+  end
+
+You can now use mocha or flexmock with RSpec if you prefer either to
+RSpec's own mock framework. Just put this:
+
+  Spec::Runner.configure do |config|
+    config.mock_with :mocha
+  end
+  
+or this:
+
+  Spec::Runner.configure do |config|
+    config.mock_with :flexmock
+  end
+
+in a file that is loaded before your specs. You can also
+configure included modules and predicate_matchers:
+
+  Spec::Runner.configure do |config|
+    config.include SomeModule
+    config.predicate_matchers[:does_something?] = :do_something
+  end
+
+See Spec::DSL::Behaviour for more on predicate_matchers
+
+* Sugar FREE!
+* Added [10434 ] Please Make -s synonymous with -e for autotest compat. This is temporary until autotest uses -e instead of -s.
+* Fixed [#10133] custom predicate matchers
+* Applied [#10473] Add should exist (new matcher) - Patch from Bret Pettichord
+* Added another formatter: failing_behaviours. Writes the names of the failing behaviours for use with --example.
+* Applied [#10315] Patch to fix pre_commit bug 10313 - pre_commit_rails: doesn't always build correctly (Patch from Antii Tarvainen)
+* Applied [#10245] Patch to HTML escape the behavior name when using HTML Formatter (Patch from Josh Knowles)
+* Applied [#10410] redirect_to does not behave consistently with regards to query string parameter ordering (Patch from Nicholas Evans)
+* Applied [#9605] Patch for ER 9472, shared behaviour (Patch by Bob Cotton)
+* The '--format rdoc' option no longer causes a dry-run by default. --dry-run must be used explicitly.
+* It's possible to specify the output file in the --format option (See explanation in --help)
+* Several --format options may be specified to output several formats in one run.
+* The --out option is gone. Use --format html:path/to/my.html instead (or similar).
+* Spec::Runner::Formatter::BaseTextFormatter#initialize only takes one argument - an IO. dry_run and color are setters.
+* Made Spec::Ui *much* easier to install. It will be released separately. Check out trunk/spec_ui/examples
+* HTML reports now include a syntax highlighted snippet of the source code where the spec failed (needs the syntax gem)
+* Added [#10262] Better Helper testing of Erb evaluation block helpers
+* Added [#9735] support flexmock (thanks to Jim Weirich for his modifications to flexmock to support this)
+* Spec::Rails controller specs will no longer let mock exception ripple through to the response.
+* Fixed [#9260] IvarProxy does not act like a hash.
+* Applied [#9458] The rspec_scaffold generator does not take into account class nesting (Patch from Steve Tendon)
+* Applied [#9132] Rakefile spec:doc can fail without preparing database (Patch from Steve Ross)
+* Applied [#9678] Custom runner command line switch, and multi-threaded runner (Patch from Bob Cotton)
+* Applied [#9926] Rakefile - RSPEC_DEPS constant as an Array of Hashes instead of an Array of Arrays (Patch from Scott Taylor)
+* Applied [#9925] Changed ".rhtml" to "template" in REST spec generator (Patch from Scott Taylor)
+* Applied [#9852] Patch for RSpec's Website using Webgen 0.4.2 (Patch from Scott Taylor)
+* Fixed [#6523] Run rspec on rails without a db
+* Fixed [#9295] rake spec should run anything in the spec directory (not just rspec's standard dirs)
+* Added [#9786] infer controller and helper names from the described type
+* Fixed [#7795] form_tag renders action='/view_spec' in view specs
+* Fixed [#9767] rspec_on_rails should not define rescue_action on controllers
+* Fixed [#9421] --line doesn't work with behaviours that use class names
+* Fixed [#9760] rspec generators incompatible with changes to edge rails
+* Added [#9786] infer controller and helper names from the described type
+* Applied a simplified version of [#9282] Change to allow running specs from textmate with rspec installed as a rails plugin (and no rspec gem installed)
+* Applied [#9700] Make Spec::DSL::Example#name public / Add a --timeout switch. A great way to prevent specs from getting slow.
+* In Rails, script/generate rspec will generate a spec.opts file that optimises faster/more efficient running of specs.
+* Added [#9522] support using rspec's expectations with test/unit
+* Moved rspec_on_rails up to the project root, simplifying the download url
+* Fixed [#8103] RSpec not installing spec script correctly.
+* The --spec option is replaced by the --example option.
+* The --loadby option no longer supports a file argument. Use --example file_name instead.
+* The --example option can now take a file name as an argument. The file should contain example names.
+* Internal classes are named Behaviour/Example (rather than Context/Specification).
+* You can now use mocha by saying config.mock_with :mocha in a spec_helper
+* before_context_eval is replaced by before_eval.
+* Applied [#9509] allow spaced options in spec.opts
+* Applied [#9510] Added File for Ruby 1.8.6
+* Applied [#9511] Clarification to README file in spec/
+* Moved all of the Spec::Rails specs down to the plugins directory - now you can run the specs after you install.
+* Updated RSpec.tmbundle to the 0.9 syntax and replaced context/specify with describe/it.
+* Applied [#9232] ActionController::Base#render is sometimes protected (patch from Dan Manges)
+* Added --reverse option, allowing contexts/specs to be run in reverse order. 
+* Added --loadby option, allowing better control over load order for spec files. mtime and file.txt supported.
+* Implemented [#8696] --order option (see --reverse and --loadby)
+* Added describe/it as aliases for context/specify - suggestion from Dan North.
+* Applied [#7637] [PATCH] add skip-migration option to rspec_scaffold generator
+* Added [#9167] string.should have_tag
+* Changed script/rails_spec_server to script/spec_server and added script/spec (w/ path to vendor/plugins/rspec)
+* Fixed [#8897] Error when mixing controller spec with/without integrated views and using template system other than rhtml
+* Updated sample app specs to 0.9 syntax
+* Updated generated specs to 0.9 syntax
+* Applied [#8994] trunk: generated names for be_ specs (Multiple patches from Yurii Rashkovskii)
+* Applied [#9983]: Allow before and after to be called in BehaviourEval. This is useful for shared examples.
+
+== Version 0.8.2
+
+Replaced assert_select fork with an assert_select wrapper for have_tag. This means that "should have_rjs" no longer supports :hide or :effect, but you can still use should_have_rjs for those.
+
+== Version 0.8.1
+
+Quick "in house" bug-fix
+
+== Version 0.8.0
+
+This release introduces a new approach to handling expectations using Expression Matchers.
+
+See Upgrade[http://rspec.rubyforge.org/upgrade.html], Spec::Expectations, Spec::Matchers and RELEASE-PLAN for more info.
+
+This release also improves the spec command line by adding DRb support and making it possible to
+store command line options in a file. This means a more flexible RSpec experience with Rails, 
+Rake and editor plugins like TextMate.
+
+It also sports myriad new features, bug fixes, patches and general goodness:
+
+* Fixed [#8928] rspec_on_rails 0.8.0-RC1 controller tests make double call to setup_with_fixtures
+* Fixed [#8925] Documentation bug in 0.8.0RC1 rspec website
+* Applied [#8132] [PATCH] RSpec breaks "rake db:sessions:create" in a rails project that has the rspec_on_rails plugin (Patch from Erik Kastner)
+* Fixed [#8789] --line and --spec not working when the context has parenhesis in the name
+* Added [#8783] auto generate spec names from last expectation
+* --heckle now fails if the heckled class or module is not found.
+* Fixed [#8771] Spec::Mocks::BaseExpectation#with converts hash params to array of arrays with #collect
+* Fixed [#8750] should[_not]_include backwards compatibility between 0.8.0-RC1 and 0.7.5.1 broken
+* Fixed [#8646] Context Runner does not report on Non standard exceptions and return a 0 return code
+* RSpec on Rails' spec_helper.rb will only force RAILS_ENV to test if it was not specified on the command line.
+* Fixed [#5485] proc#should_raise and proc#should_not_raise output
+* Added [#8484] should_receive with blocks
+* Applied [#8218] heckle_runner.rb doesn't work with heckle >= 1.2.0 (Patch from Michal Kwiatkowski)
+* Fixed [#8240] Cryptic error message when no controller_name
+* Applied [#7461] [PATCH] Contexts don't call Module::included when they include a module
+* Removed unintended block of test/unit assertions in rspec_on_rails - they should all, in theory, now be accessible
+* Added mock_model method to RSpec on Rails, which stubs common methods. Based on http://metaclass.org/2006/12/22/making-a-mockery-of-activerecord
+* Fixed [#8165] Partial Mock Errors when respond_to? is true but the method is not in the object
+* Fixed [#7611] Partial Mocks override Subclass methods
+* Fixed [#8302] Strange side effect when mocking a class method
+* Applied [#8316] to_param should return a stringified key in resource generator's controller spec (Patch from Chris Anderson)
+* Applied [#8216] shortcut for creating object stub
+* Applied [#8008] Correct generated specs for view when calling resource generator (Patch from Jonathan Tron)
+* Fixed [#7754] Command-R fails to run spec in TextMate (added instruction from Luke Redpath to the website)
+* Fixed [#7826] RSpect.tmbundle web page out of date.
+* RSpec on Rails specs are now running against RoR 1.2.1 and 1.2.2
+* rspec_scaffold now generates specs for views
+* In a Rails app, RSpec core is only loaded when RAILS_ENV==test (init.rb)
+* Added support for target.should arbitrary_expectation_handler and target.should_not arbitrary_expectation_handler
+* Fixed [#7533] Spec suite fails and the process exits with a code 0
+* Fixed [#7565] Subsequent stub! calls for method fail to override the first call to method
+* Applied [#7524] Incorrect Documentation for 'pattern' in Rake task (patch from Stephen Duncan)
+* Fixed [#7409] default fixtures do not appear to run.
+* Fixed [#7507] "render..and return" doesn't return
+* Fixed [#7509] rcov/rspec incorrectly includes boot.rb (Patch from Courtenay)
+* Fixed [#7506] unnecessary complex output on failure of response.should be_redirect
+* Applied [#6098] Make scaffold_resource generator. Based on code from Pat Maddox.
+* The drbspec command is gone. Use spec --drb instead.
+* The drb option is gone from the Rake task. Pass --drb to spec_opts instead.
+* New -X/--drb option for running specs against a server like spec/rails' script/rails_spec_server
+* New -O/--options and -G/--generate flags for file-based options (handy for spec/rails)
+* Applied [#7339] Turn off caching in HTML reports
+* Applied [#7419] "c option for colorizing output does not work with rails_spec" (Patch from Shintaro Kakutani)
+* Applied [#7406] [PATCH] 0.7.5 rspec_on_rails loads fixtures into development database (Patch from Wilson Bilkovich)
+* Applied [#7387] Allow stubs to return consecutive values (Patch from Pat Maddox)
+* Applied [#7393] Fix for rake task (Patch from Pat Maddox)
+* Reinstated support for response.should_render (in addition to controller.should_render)
+
+== Version 0.7.5.1
+
+Bug fix release to allow downloads of rspec gem using rubygems 0.9.1.
+
+== Version 0.7.5
+This release adds support for Heckle - Seattle'rb's code mutation tool.
+There are also several bug fixes to the RSpec core and the RSpec on Rails plugin.
+
+* Removed svn:externals on rails versions and plugins
+* Applied [#7345] Adding context_setup and context_teardown, with specs and 100% rcov
+* Applied [#7320] [PATCH] Allow XHR requests in controller specs to render RJS templates
+* Applied [#7319] Migration code uses drop_column when it should use remove_column (patch from Pat Maddox)
+* Added support for Heckle
+* Applied [#7282] dump results even if spec is interrupted (patch from Kouhei Sutou)
+* Applied [#7277] model.should_have(n).errors_on(:attribute) (patch from Wilson Bilkovich)
+* Applied [#7270] RSpec render_partial colliding with simply_helpful (patch from David Goodlad)
+* Added [#7250] stubs should support throwing
+* Added [#7249] stubs should support yielding
+* Fixed [#6760] fatal error when accessing nested finders in rspec
+* Fixed [#7179] script/generate rspec_scaffold generates incorrect helper name
+* Added preliminary support for assert_select (response.should_have)
+* Fixed [#6971] and_yield does not work when the arity is -1
+* Fixed [#6898] Can we separate rspec from the plugins?
+* Added [#7025] should_change should accept a block
+* Applied [#6989] partials with locals (patch from Micah Martin)
+* Applied [#7023] Typo in team.page
+
+== Version 0.7.4
+
+This release features a complete redesign of the reports generated with --format html.
+As usual there are many bug fixes - mostly related to spec/rails.
+
+* Applied [#7010] Fixes :spacer_template does not work w/ view spec (patch from Shintaro Kakutani)
+* Applied [#6798] ensure two ':' in the first backtrace line for Emacs's 'next-error' command (patch from Kouhei Sutou)
+* Added Much nicer reports to generated website
+* Much nicer reports with --format --html (patch from Luke Redpath)
+* Applied [#6959] Calls to render and redirect in controllers should return true
+* Fixed [#6981] helper method is not available in partial template.
+* Added [#6978] mock should tell you the expected and actual args when receiving the right message with the wrong args
+* Added the possibility to tweak the output of the HtmlFormatter (by overriding extra_failure_content).
+* Fixed [#6936] View specs don't include ApplicationHelper by default
+* Fixed [#6903] Rendering a partial in a view makes the view spec blow up
+* Added callback library from Brian Takita
+* Added [#6925] support controller.should_render :action_name
+* Fixed [#6884] intermittent errors related to method binding
+* Fixed [#6870] rspec on edge rails spec:controller fixture loading fails
+* Using obj.inspect for all messages
+* Improved performance by getting rid of instance_exec (instance_eval is good enough because we never need to pass it args)
+
+== Version 0.7.3
+
+Almost normal bug fix/new feature release.
+
+A couple of things you need to change in your rails specs:
+# spec_helper.rb is a little different (see http://rspec.rubyforge.org/upgrade.html)
+# use controller.should_render before OR after the action (controller.should_have_rendered is deprecated)
+
+* Applied [#6577] messy mock backtrace when frozen to edge rails (patch from Jay Levitt)
+* Fixed [#6674] rspec_on_rails fails on @session deprecation warning
+* Fixed [#6780] routing() was failing...fix included - works for 1.1.6 and edge (1.2)
+* Fixed [#6835] bad message with arbitrary predicate
+* Added [#6731] Partial templates rendered
+* Fixed [#6713] helper methods not rendered in view tests?
+* Fixed [#6707] cannot run controller / helper tests via rails_spec or spec only works with rake
+* Applied [#6417] lambda {...}.should_change(receiver, :message) (patch from Wilson Bilkovich)
+* Eliminated dependency on ZenTest
+* Fixed [#6650] Reserved characters in the TextMate bundle break svn on Win32
+* Fixed [#6643] script/generate rspec_controller: invalid symbol generation for 'controller_name' for *modularized* controllers
+* The script/rails_spec command has been moved to bin/drbspec in RSpec core (installed by the gem)
+
+== Version 0.7.2
+
+This release introduces a brand new RSpec bundle for TextMate, plus some small bugfixes.
+
+* Packaged RSpec.tmbundle.tgz as part of the distro
+* Fixed [#6593] Add moving progress bar to HtmlFormatter using Javascript
+* Applied [#6265] should_raise should accept an Exception object
+* Fixed [#6616] Can't run Rails specs with RSpec.tmbundle
+* Fixed [#6411] Can't run Rails specs with ruby
+* Added [#6589] New -l --line option. This is useful for IDE/editor runners/extensions.
+* Fixed [#6615] controller.should_render_rjs should support :partial => 'path/to/template'
+
+== Version 0.7.1
+
+Bug fixes and a couple o' new features.
+
+* Fixed [#6575] Parse error in aliasing the partial mock original method (patch by Brian Takita)
+* Fixed [#6277] debris left by stubbing (trunk) [submitted by dastels] (fixed by fix to [#6575])
+* Fixed [#6575] Parse error in aliasing the partial mock original method
+* Fixed [#6555] should_have_tag does not match documentation
+* Fixed [#6567] SyntaxError should not stop entire run
+* Fixed [#6558] integrated views look for template even when redirected
+* Fixed [#6547] response.should be_redirect broken in 0.7.0
+* Applied [#6471] Easy way to spec routes
+* Applied [#6587] Rspec on Rails displays "Spec::Rails::ContextFactory" as context name
+* Applied [#6514] Document has trivial typos.
+* Added [#6560] controller.session should be available before the action
+* Added support for should_have_rjs :visual_effect
+* Different printing and colours for unmet expectations (red) and other exceptions (magenta)
+* Simplified method_missing on mock_methods to make it less invasive on partial mocks. 
+
+== Version 0.7.0
+
+This is the "Grow up and eat your own dog food release". RSpec is now used on itself and
+we're no longer using Test::Unit to test it. Although, we are still extending Test::Unit
+for the rails plugin (indirectly - through ZenTest)
+
+IMPORTANT NOTE: THIS RELEASE IS NOT 100% BACKWARDS COMPATIBLE TO 0.6.x
+
+There are a few changes that will require that you change your existing specs.
+
+RSpec now handles equality exactly like ruby does:
+
+# actual.should_equal(expected) will pass if actual.equal?(expected) returns true
+# actual.should eql(expected) will pass if actual.eql?(expected) returns true
+# actual.should == expected will pass if actual == expected) returns true
+
+At the high level, eql? implies equivalence, while equal? implies object identity. For more
+information on how ruby deals w/ equality, you should do this:
+
+ri equal?
+
+or look at this:
+
+http://www.ruby-doc.org/core/classes/Object.html#M001057
+
+Also, we left in should_be as a synonym for should_equal, so the only specs that should break are the
+ones using should_equal (which used to use <code>==</code> instead of <code>.equal?</code>).
+
+Lastly, should_be used to handle true and false differently from any other values. We've removed
+this special handling, so now actual.should_be true will fail for any value other than true (it
+used to pass for any non-nil, non-false value), and actual.should_be false will fail for any
+value other than false (it used to pass for nil or false).
+
+Here's what you'll need to do to update your specs:
+# search for "should_equal" and replace with "should_eql"
+# run specs
+
+If any specs still fail, they are probably related to should be_true or should_be_false using
+non-boolean values. Those you'll just have to inspect manually and adjust appropriately (sorry!).
+
+--------------------------------------------------
+Specifying multiple return values in mocks now works like this:
+
+mock.should_receive(:message).and_return(1,2,3)
+
+It used to work like this:
+
+mock.should_receive(:message).and_return([1,2,3])
+
+but we decided that was counter intuitive and otherwise lame.
+
+Here's what you'll need to do to update your specs:
+# search for "and_return(["
+# get rid of the "[" and "]"
+
+--------------------------------------------------
+RSpec on Rails now supports the following (thanks to ZenTest upon which it is built):
+
+# Separate specs for models, views, controllers and helpers
+# Controller specs are completely decoupled from the views by default (though you can tell them to couple themselves if you prefer)
+# View specs are completely decoupled from app-specific controllers
+
+See http://rspec.rubyforge.org/documentation/rails/index.html for more information
+--------------------------------------------------
+As usual, there are also other new features and bug fixes:
+
+* Added lots of documentation on mocks/stubs and the rails plugin.
+* Added support for assigns[key] syntax for controller specs (to align w/ pre-existing syntax for view specs)
+* Added support for controller.should_redirect_to
+* RSpec on Rails automatically checks whether it's compatible with the installed RSpec
+* Applied [#6393] rspec_on_rails uses deprecated '@response' instead of the accessor
+* RSpec now has 100% spec coverage(!)
+* Added support for stubbing and partial mocking
+* Progress (....F..F.) is now coloured. Tweaked patch from KAKUTANI Shintaro.
+* Backtrace now excludes the rcov runner (/usr/local/bin/rcov)
+* Fixed [#5539] predicates do not work w/ rails
+* Added [#6091] support for Regexp matching messages sent to should_raise
+* Added [#6333] support for Regexp matching in mock arguments
+* Applied [#6283] refactoring of diff support to allow selectable formats and custom differs
+* Fixed [#5564] "ruby spec_file.rb" doesn't work the same way as "spec spec_file.rb"
+* Fixed [#6056] Multiple output of failing-spec notice
+* Fixed [#6233] Colours in specdoc
+* Applied [#6207] Allows --diff option to diff target and expected's #inspect output (Patch by Lachie Cox)
+* Fixed [#6203] Failure messages are misleading - consider using inspect.
+* Added [#6334] subject.should_have_xyz will try to call subject.has_xyz? - use this for hash.should_have_key(key)
+* Fixed [#6017] Rake task should ignore empty or non-existent spec-dirs
+
+== Version 0.6.4
+
+In addition to a number of bug fixes and patches, this release begins to formalize the support for
+RSpec on Rails.
+
+* Added Christopher Petrilli's TextMate bundle to vendor/textmate/RSpec.tmbundle
+* Fixed [#5909], once again supporting multi_word_predicates
+* Applied [#5873] - response.should_have_rjs (initial patch from Jake Howerton, based on ARTS by Kevin Clark)
+* Added generation of view specs for rspec_on_rails
+* Applied [#5815] active_record_subclass.should_have(3).records
+* Added support in "rake stats" for view specs (in spec/views)
+* Applied [#5801] QuickRef.pdf should say RSpec, not rSpec
+* Applied [#5728] rails_spec_runner fails on Windows (Patch from Lindsay Evans).
+* Applied [#5708] RSpec Rails plugin rspec_controller generator makes specs that do not parse.
+* Cleaned up RSpec on Rails so it doesn't pollute as much during bootstrapping.
+* Added support for response.should_have_tag and response.should_not_have_tag (works just like assert_tag in rails)
+* Added new -c, --colour, --color option for colourful (red/green) output. Inspired from Pat Eyler's Redgreen gem.
+* Added examples for Watir and Selenium under the gem's vendor directory.
+* Renamed rails_spec_runner to rails_spec_server (as referred to in the docs)
+* Added support for trying a plural for arbitrary predicates.  E.g. Album.should_exist(:name => "Hey Jude") will call Album.exists?(:name => "Hey Jude")
+* Added support for should_have to work with methods taking args returning a collection.  E.g. @dave.should_have(3).albums_i_have_that_this_guy_doesnt(@aslak)
+* Added [#5570] should_not_receive(:msg).with(:specific, "args")
+* Applied [#5065] to support using define_method rather than method_missing to capture expected messages on mocks. Thanks to Eero Saynatkari for the tip that made it work.
+* Restructured directories and Modules in order to separate rspec into three distinct Modules: Spec::Expectations, Spec::Runner and Spec::Mocks. This will allow us to more easily integrate other mock frameworks and/or allow test/unit users to take advantage of the expectation API.
+* Applied [#5620] support any boolean method and arbitrary comparisons (5.should_be < 6) (Patch from Mike Williams)
+ 
+== Version 0.6.3
+
+This release fixes some minor bugs related to RSpec on Rails
+Note that if you upgrade a rails app with this version of the rspec_on_rails plugin
+you should remove your lib/tasks/rspec.rake if it exists.
+
+* Backtraces from drb (and other standard ruby libraries) are now stripped from backtraces.
+* Applied [#5557] Put rspec.rake into the task directory of the RSpec on Rails plugin (Patch from Daniel Siemssen)
+* Applied [#5556] rails_spec_server loads environment.rb twice (Patch from Daniel Siemssen)
+
+== Version 0.6.2
+This release fixes a couple of regressions with the rake task that were introduced in the previous version (0.6.1)
+
+* Fixed [#5518] ruby -w: warnings in 0.6.1
+* Applied [#5525] fix rake task path to spec tool for gem-installed rspec (patch from Riley Lynch)
+* Fixed a teensey regression with the rake task - introduced in 0.6.1. The spec command is now quoted so it works on windows.
+
+== Version 0.6.1
+This is the "fix the most annoying bugs release" of RSpec. There are 9 bugfixes this time.
+Things that may break backwards compatibility:
+1) Spec::Rake::SpecTask no longer has the options attribute. Use ruby_opts, spec_opts and rcov_opts instead.
+
+* Fixed [#4891] RCOV task failing on windows
+* Fixed [#4896] Shouldn't modify user's $LOAD_PATH (Tip from Gavin Sinclair)
+* Fixed [#5369] ruby -w: warnings in RSpec 0.5.16 (Tip from Suraj Kurapati)
+* Applied [#5141] ExampleMatcher doesn't escape strings before matching (Patch from Nikolai Weibull).
+* Fixed [#5224] Move 'require diff-lcs' from test_helper.rb to diff_test.rb (Tip from Chris Roos)
+* Applied [#5449] Rake stats for specs (Patch from Nick Sieger)
+* Applied [#5468, #5058] Fix spec runner to correctly run controller specs (Patch from Daniel Siemssen)
+* Applied fixes to rails_spec_server to improve its ability to run several times. (Patch from Daniel Siemssen)
+* Changed RCov::VerifyTask to fail if the coverage is above the threshold. This is to ensure it gets bumped when coverage improves.
+
+== Version 0.6.0
+This release makes an official commitment to underscore_syntax (with no more support for dot.syntax)
+
+* Fixed bug (5292) that caused mock argument matching to fail
+* Converted ALL tests to use underscore syntax
+* Fixed all remaining problems with underscores revealed by converting all the tests to underscores
+* Enhanced sugar to support combinations of methods (i.e. once.and_return) 
+* Simplified helper structure taking advantage of dot/underscore combos (i.e. should.be.an_instance_of, which can be expressed as should be_an_instance_of)
+* Added support for at_most in mocks
+* Added support for should_not_receive(:msg) (will be removing should_receive(:msg).never some time soon)
+* Added support for should_have_exactly(5).items_in_collection
+
+== Version 0.5.16
+This release improves Rails support and test2spec translation.
+
+* Fixed underscore problems that occurred when RSpec was used in Rails
+* Simplified the Rails support by packaging it as a plugin instead of a generator gem.
+* Fixed [#5063] 'rspec_on_rails' require line in spec_helper.rb
+* Added pre_commit rake task to reduce risk of regressions. Useful for RSpec developers and patchers.
+* Added failure_message to RSpec Rake task
+* test2spec now defines converted helper methods outside of the setup block (bug #5057).
+
+== Version 0.5.15
+This release removes a prematurely added feature that shouldn't have been added.
+
+* Removed support for differences that was added in 0.5.14. The functionality is not aligned with RSpec's vision.
+
+== Version 0.5.14
+This release introduces better ways to extend specs, improves some of the core API and
+a experimental support for faster rails specs.
+
+* Added proc methods for specifying differences (increments and decrements). See difference_test.rb
+* Methods can now be defined alongside specs. This obsoletes the need for defining methods in setup. (Patch #5002 from Brian Takita)
+* Sugar (underscores) now works correctly with should be_a_kind_of and should be_an_instance_of
+* Added support for include and inherit in contexts. (Patch #4971 from Brian Takita)
+* Added rails_spec and rails_spec_server for faster specs on rails (still buggy - help needed)
+* Fixed bug that caused should_render to break if given a :symbol (in Rails)
+* Added support for comparing exception message in should_raise and should_not_raise
+
+== Version 0.5.13
+This release fixes some subtle bugs in the mock API.
+
+* Use fully-qualified class name of Exceptions in failure message. Easier to debug that way.
+* Fixed a bug that caused mocks to yield a one-element array (rather than the element) when one yield arg specified.
+* Mocks not raise AmbiguousReturnError if an explicit return is used at the same time as an expectation block.
+* Blocks passed to yielding mocks can now raise without causing mock verification to fail.
+
+== Version 0.5.12
+This release adds diff support for failure messages, a HTML formatter plus some other
+minor enhancements.
+
+* Added HTML formatter.
+* Added fail_on_error option to spectask.
+* Added support for diffing, using the diff-lcs Rubygem (#2648).
+* Remove RSpec on Rails files from backtrace (#4694).
+* All of RSpec's own tests run successfully after translation with test2spec.
+* Added --verbose mode for test2spec - useful for debugging when classes fail to translate.
+* Output of various formatters is now flushed - to get more continuous output.
+
+== Version 0.5.11
+This release makes test2spec usable with Rails (with some manual steps). 
+See http://rspec.rubyforge.org/tools/rails.html for more details
+
+* test2spec now correctly translates bodies of helper methods (non- test_*, setup and teardown ones).
+* Added more documentation about how to get test2spec to work with Rails.
+
+== Version 0.5.10
+This version features a second rewrite of test2spec - hopefully better than the previous one.
+
+* Improved test2spec's internals. It now transforms the syntax tree before writing out the code.
+
+== Version 0.5.9
+This release improves test2spec by allowing more control over the output
+
+* Added --template option to test2spec, which allows for custom output driven by ERB
+* Added --quiet option to test2spec
+* Removed unnecessary dependency on RubyToC
+
+== Version 0.5.8
+This release features a new Test::Unit to RSpec translation tool.
+Also note that the RubyGem of the previous release (0.5.7) was corrupt.
+We're close to being able to translate all of RSpec's own Test::Unit
+tests and have them run successfully!
+
+* Updated test2spec documentation.
+* Replaced old test2rspec with a new test2spec, which is based on ParseTree and RubyInline.
+
+== Version 0.5.7
+This release changes examples and documentation to recommend underscores rather than dots,
+and addresses some bugfixes and changes to the spec commandline.
+
+* spec DIR now works correctly, recursing down and slurping all *.rb files
+* All documentation and examples are now using '_' instead of '.'
+* Custom external formatters can now be specified via --require and --format.
+
+== Version 0.5.6
+This release fixes a bug in the Rails controller generator
+
+* The controller generator did not write correct source code (missing 'do'). Fixed.
+
+== Version 0.5.5
+This release adds initial support for Ruby on Rails in the rspec_generator gem.
+
+* [Rails] Reorganised Lachie's original code to be a generator packaged as a gem rather than a plugin.
+* [Rails] Imported code from http://lachie.info/svn/projects/rails_plugins/rspec_on_rails (Written by Lachie Cox)
+* Remove stack trace lines from TextMate's Ruby bundle
+* Better error message from spectask when no spec files are found.
+
+== Version 0.5.4
+The "the tutorial is ahead of the gem" release
+
+* Support for running a single spec with --spec
+* Exitcode is now 1 unless all specs pass, in which case it's 0.
+* -v, --version now both mean the same thing
+* For what was verbose output (-v), use --format specdoc or -f s
+* --format rdoc always runs in dry-run mode
+* Removed --doc and added --format and --dry-run
+* Refactored towards more pluggable formatters
+* Use webgen's execute tag when generating website (more accurate)
+* Fixed incorrect quoting of spec_opts in SpecTask
+* Added patch to enable underscored shoulds like 1.should_equal(1) - patch from Rich Kilmer
+* Removed most inherited instance method from Mock, making more methods mockable.
+* Made the RCovVerify task part of the standard toolset.
+* Documented Rake task and how to use it with Rcov
+* Implemented <ruby></ruby> tags for website (hooking into ERB, RedCloth and syntax)
+* RSpec Rake task now takes spec_opts and out params so it can be used for doc generation
+* RCov integration for RSpec Rake task (#4058)
+* Group all results instead of printing them several times (#4057)
+* Mocks can now yield
+* Various improvements to error reporting (including #4191)
+* backtrace excludes rspec code - use -b to include it
+* split examples into examples (passing) and failing_examples
+
+== Version 0.5.3
+The "hurry up, CoR is in two days" release.
+
+* Don't run rcov by default
+* Make separate task for running tests with RCov
+* Added Rake task to fail build if coverage drops below a certain threshold
+* Even more failure output cleanup (simplification)
+* Added duck_type constraint for mocks
+
+== Version 0.5.2
+This release has minor improvements to the commandline and fixes some gem warnings
+
+* Readded README to avoid RDoc warnings
+* Added --version switch to commandline
+* More changes to the mock API
+
+== Version 0.5.1
+This release is the first release of RSpec with a new website. It will look better soon.
+
+* Added initial documentation for API
+* Added website based on webgen
+* Modified test task to use rcov
+* Deleted unused code (thanks, rcov!)
+* Various changes to the mock API,
+* Various improvements to failure reporting
+
+== Version 0.5.0
+This release introduces a new API and obsolesces previous versions.
+
+* Moved source code to separate subfolders
+* Added new DSL runner based on instance_exec
+* Added spike for testdox/rdoc generation
+* merge Astels' and Chelimsky's work on ShouldHelper
+* this would be 0.5.0 if I updated the documentation
+* it breaks all of your existing specifications.  We're not sorry.
+
+== Version 0.3.2
+
+The "srbaker is an idiot" release.
+
+* also forgot to update the path to the actual Subversion repository
+* this should be it
+
+== Version 0.3.1
+
+This is just 0.3.0, but with the TUTORIAL added to the documentation list.
+
+* forgot to include TUTORIAL in the documentation
+
+== Version 0.3.0
+
+It's been a while since last release, lots of new stuff is available.  For instance:
+
+* improvements to the runners
+* addition of should_raise expectation (thanks to Brian Takita)
+* some documentation improvements
+* RSpec usable as a DSL
+
+== Version 0.2.0
+
+This release provides a tutorial for new users wishing to get started with
+RSpec, and many improvements.
+
+* improved reporting in the spec runner output
+* update the examples to the new mock api
+* added TUTORIAL, a getting started document for new users of RSpec
+
+== Version 0.1.7
+
+This release improves installation and documentation, mock integration and error reporting.
+
+* Comparison errors now print the class name too.
+* Mocks now take an optional +options+ parameter to specify behaviour.
+* Removed __expects in favour of should_receive
+* Added line number reporting in mock error messages for unreceived message expectations.
+* Added should_match and should_not_match.
+* Added a +mock+ method to Spec::Context which will create mocks that autoverify (no need to call __verify).
+* Mocks now require names in the constructor to ensure sensible error messages.
+* Made 'spec' executable and updated usage instructions in README accordingly.
+* Made more parts of the Spec::Context API private to avoid accidental usage.
+* Added more RDoc to Spec::Context.
+
+== Version 0.1.6
+
+More should methods.
+
+* Added should_match and should_not_match.
+
+== Version 0.1.5
+
+Included examples and tests in gem.
+
+== Version 0.1.4
+
+More tests on block based Mock expectations.
+
+== Version 0.1.3
+
+Improved mocking:
+
+* block based Mock expectations.
+
+== Version 0.1.2
+
+This release adds some improvements to the mock API and minor syntax improvements
+
+* Added Mock.should_expect for a more consistent DSL.
+* Added MockExpectation.and_returns for a better DSL.
+* Made Mock behave as a null object after a call to Mock.ignore_missing
+* Internal syntax improvements.
+* Improved exception trace by adding exception class name to error message.
+* Renamed some tests for better consistency.
+
+== Version 0.1.1
+
+This release adds some shoulds and improves error reporting
+
+* Added should be_same_as and should_not be_same_as.
+* Improved error reporting for comparison expectations.
+
+== Version 0.1.0
+
+This is the first preview release of RSpec, a Behaviour-Driven Development library for Ruby 
+
+* Added Rake script with tasks for gems, rdoc etc.
+* Added an XForge task to make release go easier.
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/MIT-LICENSE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/MIT-LICENSE
--- mephisto-0.7.3/vendor/plugins/rspec/MIT-LICENSE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/MIT-LICENSE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+Copyright (c) 2005-2007 The RSpec Development Team
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/README
--- mephisto-0.7.3/vendor/plugins/rspec/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,72 @@
+== RSpec
+
+RSpec is a Behaviour Driven Development framework with tools to express User Stories
+with Executable Scenarios and Executable Examples at the code level.
+
+RSpec ships with several modules:
+
+Spec::Story provides a framework for expressing User Stories
+
+Spec::Example provides a framework for expressing code Examples
+
+Spec::Matchers provides Expression Matchers for use with Spec::Expectations
+and Spec::Mocks.
+
+Spec::Expectations supports setting expectations on your objects so you
+can do things like:
+
+  result.should equal(expected_result)
+  
+Spec::Mocks supports creating Mock Objects, Stubs, and adding Mock/Stub
+behaviour to your existing objects.
+
+== Installation
+
+The simplest approach is to install the gem:
+
+  gem install -r rspec #mac users must sudo
+
+== Building the RSpec gem
+If you prefer to build the gem locally, check out source from svn://rubyforge.org/var/svn/rspec/trunk. Then
+do the following:
+
+  rake gem
+  gem install pkg/rspec-0.x.x.gem (you may have to sudo)
+
+== Running RSpec's specs
+In order to run RSpec's full suite of specs (rake pre_commit) you must install the following gems:
+
+* rake          # Runs the build script
+* rcov          # Verifies that the code is 100% covered by specs
+* webgen        # Generates the static HTML website
+* RedCloth      # Required by webgen
+* syntax        # Required by our own custom webgen extension to highlight ruby code
+* diff-lcs      # Required if you use the --diff switch
+* win32console  # Required by the --colour switch if you're on Windows
+* meta_project  # Required in order to make releases at RubyForge
+* heckle        # Required if you use the --heckle switch
+* hpricot       # Used for parsing HTML from the HTML output formatter in RSpec's own specs
+
+Once those are all installed, you should be able to run the suite with the following steps:
+
+* svn co svn://rubyforge.org/var/svn/rspec/trunk rspec
+* cd rspec
+* rake install_dependencies
+* cd example_rails_app
+* export RSPEC_RAILS_VERSION=1.2.3
+* rake rspec:generate_mysql_config
+* mysql -u root < db/mysql_setup.sql
+* cd ..
+* rake pre_commit
+
+Note that RSpec itself - once built - doesn't have any dependencies outside the Ruby core 
+and stdlib - with a few exceptions:
+
+* The spec command line uses diff-lcs when --diff is specified.
+* The spec command line uses heckle when --heckle is specified.
+* The Spec::Rake::SpecTask needs RCov if RCov is enabled in the task.
+
+See http://rspec.rubyforge.org for further documentation.
+
+== Contributing
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/Rakefile
--- mephisto-0.7.3/vendor/plugins/rspec/Rakefile	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,281 @@
+$:.unshift('lib')
+require 'rubygems'
+require 'rake/gempackagetask'
+require 'rake/contrib/rubyforgepublisher'
+require 'rake/clean'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'spec/version'
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.expand_path("#{dir}/../pre_commit/lib"))
+require "pre_commit"
+
+# Some of the tasks are in separate files since they are also part of the website documentation
+load File.dirname(__FILE__) + '/rake_tasks/examples.rake'
+load File.dirname(__FILE__) + '/rake_tasks/examples_with_rcov.rake'
+load File.dirname(__FILE__) + '/rake_tasks/failing_examples_with_html.rake'
+load File.dirname(__FILE__) + '/rake_tasks/verify_rcov.rake'
+
+PKG_NAME = "rspec"
+PKG_VERSION   = Spec::VERSION::STRING
+PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+PKG_FILES = FileList[
+  '[A-Z]*',
+  'lib/**/*.rb', 
+  'spec/**/*.rb', 
+  'examples/**/*',
+  'plugins/**/*',
+  'stories/**/*'
+]
+
+task :default => [:verify_rcov]
+task :verify_rcov => [:spec, :stories]
+
+desc "Run all specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['--options', 'spec.opts']
+  t.rcov = true
+  t.rcov_dir = '../doc/output/coverage'
+  t.rcov_opts = ['--exclude', 'spec\/spec,bin\/spec,examples,\/var\/lib\/gems,\/Library\/Ruby,\.autotest']
+end
+
+desc "Run all stories"
+task :stories do
+  html = 'story_server/prototype/rspec_stories.html'
+  ruby "stories/all.rb --colour --format plain --format html:#{html}"
+  unless IO.read(html) =~ /<span class="param">/m
+    raise 'highlighted parameters are broken in story HTML'
+  end
+end
+
+desc "Run all specs and store html output in doc/output/report.html"
+Spec::Rake::SpecTask.new('spec_html') do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb', '../../RSpec.tmbundle/Support/spec/*_spec.rb']
+  t.spec_opts = ['--format html:../doc/output/report.html','--backtrace']
+end
+
+desc "Run all failing examples"
+Spec::Rake::SpecTask.new('failing_examples') do |t|
+  t.spec_files = FileList['failing_examples/**/*_spec.rb']
+end
+
+desc 'Generate HTML documentation for website'
+task :webgen do
+  core.webgen
+end
+
+desc 'Generate RDoc'
+rd = Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = '../doc/output/rdoc'
+  rdoc.options << '--title' << 'RSpec' << '--line-numbers' << '--inline-source' << '--main' << 'README'
+  rdoc.rdoc_files.include('README', 'CHANGES', 'MIT-LICENSE', 'UPGRADE', 'lib/**/*.rb')
+end
+
+spec = Gem::Specification.new do |s|
+  s.name = PKG_NAME
+  s.version = PKG_VERSION
+  s.summary = Spec::VERSION::DESCRIPTION
+  s.description = <<-EOF
+    RSpec is a behaviour driven development (BDD) framework for Ruby.  RSpec was
+    created in response to Dave Astels' article _A New Look at Test Driven Development_
+    which can be read at: http://daveastels.com/index.php?p=5  RSpec is intended to
+    provide the features discussed in Dave's article.
+  EOF
+
+  s.files = PKG_FILES.to_a
+  s.require_path = 'lib'
+
+  s.has_rdoc = true
+  s.rdoc_options = rd.options
+  s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$|^EXAMPLES.rd$/ }.to_a
+
+  s.autorequire = 'spec'
+  s.bindir = 'bin'
+  s.executables = ['spec', 'spec_translator']
+  s.default_executable = 'spec'
+  s.author = "RSpec Development Team"
+  s.email = "rspec-devel@rubyforge.org"
+  s.homepage = "http://rspec.rubyforge.org"
+  s.rubyforge_project = "rspec"
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end
+
+def egrep(pattern)
+  Dir['**/*.rb'].each do |fn|
+    count = 0
+    open(fn) do |f|
+      while line = f.gets
+        count += 1
+        if line =~ pattern
+          puts "#{fn}:#{count}:#{line}"
+        end
+      end
+    end
+  end
+end
+
+desc "Look for TODO and FIXME tags in the code"
+task :todo do
+  egrep /(FIXME|TODO|TBD)/
+end
+
+task :clobber do
+  core.clobber
+end
+
+task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_website, :publish_news]
+
+desc "Verifies that there is no uncommitted code"
+task :verify_committed do
+  IO.popen('svn stat') do |io|
+    io.each_line do |line|
+      raise "\n!!! Do a svn commit first !!!\n\n" if line =~ /^\s*M\s*/
+    end
+  end
+end
+
+desc "Creates a tag in svn"
+task :tag do
+  from = `svn info #{File.dirname(__FILE__)}`.match(/URL: (.*)\/rspec/n)[1]
+  to = from.gsub(/trunk/, "tags/#{Spec::VERSION::TAG}")
+  current = from.gsub(/trunk/, "tags/CURRENT")
+
+  puts "Creating tag in SVN"
+  tag_cmd = "svn cp #{from} #{to} -m \"Tag release #{Spec::VERSION::FULL_VERSION}\""
+  `#{tag_cmd}` ; raise "ERROR: #{tag_cmd}" unless $? == 0
+
+  puts "Removing CURRENT"
+  remove_current_cmd = "svn rm #{current} -m \"Remove tags/CURRENT\""
+  `#{remove_current_cmd}` ; raise "ERROR: #{remove_current_cmd}" unless $? == 0
+
+  puts "Re-Creating CURRENT"
+  create_current_cmd = "svn cp #{to} #{current} -m \"Copy #{Spec::VERSION::TAG} to tags/CURRENT\""
+  `#{create_current_cmd}` ; "ERROR: #{create_current_cmd}" unless $? == 0
+end
+
+desc "Run this task before you commit. You should see 'OK TO COMMIT'"
+task(:pre_commit) {core.pre_commit}
+
+desc "Build the website, but do not publish it"
+task(:website) {core.website}
+
+task(:rdoc_rails) {core.rdoc_rails}
+
+task :verify_user do
+  raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
+end
+
+desc "Upload Website to RubyForge"
+task :publish_website => [:verify_user, :website] do
+  unless Spec::VERSION::RELEASE_CANDIDATE
+    publisher = Rake::SshDirPublisher.new(
+      "rspec-website@rubyforge.org",
+      "/var/www/gforge-projects/#{PKG_NAME}",
+      "../doc/output"
+    )
+    publisher.upload
+  else
+    puts "** Not publishing packages to RubyForge - this is a prerelease"
+  end
+end
+
+desc "Upload Website archive to RubyForge"
+task :archive_website => [:verify_user, :website] do
+  publisher = Rake::SshDirPublisher.new(
+    "rspec-website@rubyforge.org",
+    "/var/www/gforge-projects/#{PKG_NAME}/#{Spec::VERSION::TAG}",
+    "../doc/output"
+  )
+  publisher.upload
+end
+
+desc "Package the Rails plugin"
+task :package_rspec_on_rails do
+  mkdir 'pkg' rescue nil
+  rm_rf 'pkg/rspec_on_rails' rescue nil
+  `svn export ../rspec_on_rails pkg/rspec_on_rails-#{PKG_VERSION}`
+  Dir.chdir 'pkg' do
+    `tar cvzf rspec_on_rails-#{PKG_VERSION}.tgz rspec_on_rails-#{PKG_VERSION}`
+  end
+end
+task :pkg => :package_rspec_on_rails
+
+desc "Package the RSpec.tmbundle"
+task :package_tmbundle do
+  mkdir 'pkg' rescue nil
+  rm_rf 'pkg/RSpec.tmbundle' rescue nil
+  `svn export ../RSpec.tmbundle pkg/RSpec.tmbundle`
+  Dir.chdir 'pkg' do
+    `tar cvzf RSpec-#{PKG_VERSION}.tmbundle.tgz RSpec.tmbundle`
+  end
+end
+task :pkg => :package_tmbundle
+
+desc "Publish gem+tgz+zip on RubyForge. You must make sure lib/version.rb is aligned with the CHANGELOG file"
+task :publish_packages => [:verify_user, :package] do
+  require File.dirname(__FILE__) + '/../spec_ui/lib/spec/ui/version'
+  release_files = FileList[
+    "pkg/#{PKG_FILE_NAME}.gem",
+    "pkg/#{PKG_FILE_NAME}.tgz",
+    "pkg/rspec_on_rails-#{PKG_VERSION}.tgz",
+    "pkg/#{PKG_FILE_NAME}.zip",
+    "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz",
+    "../spec_ui/pkg/spec_ui-#{Spec::Ui::VERSION::STRING}.gem"
+  ]
+  unless Spec::VERSION::RELEASE_CANDIDATE
+    require 'meta_project'
+    require 'rake/contrib/xforge'
+
+    Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |xf|
+      # Never hardcode user name and password in the Rakefile!
+      xf.user_name = ENV['RUBYFORGE_USER']
+      xf.files = release_files.to_a
+      xf.release_name = "RSpec #{PKG_VERSION}"
+    end
+  else
+    puts "SINCE THIS IS A PRERELEASE, FILES ARE UPLOADED WITH SSH, NOT TO THE RUBYFORGE FILE SECTION"
+    puts "YOU MUST TYPE THE PASSWORD #{release_files.length} TIMES..."
+
+    host = "rspec-website@rubyforge.org"
+    remote_dir = "/var/www/gforge-projects/#{PKG_NAME}"
+
+    publisher = Rake::SshFilePublisher.new(
+      host,
+      remote_dir,
+      File.dirname(__FILE__),
+      *release_files
+    )
+    publisher.upload
+
+    puts "UPLADED THE FOLLOWING FILES:"
+    release_files.each do |file|
+      name = file.match(/pkg\/(.*)/)[1]
+      puts "* http://rspec.rubyforge.org/#{name}"
+    end
+
+    puts "They are not linked to anywhere, so don't forget to tell people!"
+  end
+end
+
+desc "Publish news on RubyForge"
+task :publish_news => [:verify_user] do
+  unless Spec::VERSION::RELEASE_CANDIDATE
+    require 'meta_project'
+    require 'rake/contrib/xforge'
+    Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(PKG_NAME)) do |news|
+      # Never hardcode user name and password in the Rakefile!
+      news.user_name = ENV['RUBYFORGE_USER']
+    end
+  else
+    puts "** Not publishing news to RubyForge - this is a prerelease"
+  end
+end
+
+def core
+  PreCommit::Core.new(self)
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/TODO technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/TODO
--- mephisto-0.7.3/vendor/plugins/rspec/TODO	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/TODO	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,88 @@
+=== Before releasing 1.1.0:
+
+== Test/Unit integration
+
+Intermingling of specs and tests should work the same with the
+spec command or the ruby command. Also, when a spec or a test
+fails, the output should be complete (including the normal spec-only
+output AND test-only output).
+
+As of 2801:
+
+------------------------------------------
+Running w/ `ruby`
+- runs specs and tests together
+------------------------------------------
+$ ruby examples/spec_and_test_together.rb 
+Loaded suite examples/spec_and_test_together
+Started
+.
+Finished in 0.000321 seconds.
+
+1 tests, 1 assertions, 0 failures, 0 errors
+.
+
+Finished in 0.000593 seconds
+
+1 example, 0 failures
+
+------------------------------------------
+Running w/ `spec`
+- only runs the specs
+-- it should also run the tests
+------------------------------------------
+$ ruby bin/spec examples/spec_and_test_together.rb 
+.
+
+Finished in 0.006251 seconds
+
+1 example, 0 failures
+
+------------------------------------------
+Running w/ `ruby` with a failing test
+- prohibits the spec output
+-- it should allow spec output
+------------------------------------------
+$ ruby examples/spec_and_test_together.rb 
+Loaded suite examples/spec_and_test_together
+Started
+F
+Finished in 0.005884 seconds.
+
+  1) Failure:
+test_should_run_alongside_spec(NeighborlyTest) [examples/spec_and_test_together.rb:18]:
+<5> expected but was
+<4>.
+
+1 tests, 1 assertions, 1 failures, 0 errors
+
+------------------------------------------
+Running w/ `ruby` with a failing spec
+- allows spec and test output
+------------------------------------------
+$ ruby examples/spec_and_test_together.rb 
+Loaded suite examples/spec_and_test_together
+Started
+.
+Finished in 0.000321 seconds.
+
+1 tests, 1 assertions, 0 failures, 0 errors
+F
+
+1)
+'spec should run alongside test' FAILED
+expected: 4,
+     got: 5 (using ==)
+examples/spec_and_test_together.rb:12:
+./examples/../lib/spec.rb:19:in `run'
+examples/spec_and_test_together.rb:17:
+
+Finished in 0.0009 seconds
+
+1 example, 1 failure
+------------------------------------------
+
+== Story Framework
+
+- should support blockless steps (in StepGroup) as pending
+- should continue execution passed pending steps (or switch to --dry-run????)
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/UPGRADE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/UPGRADE
--- mephisto-0.7.3/vendor/plugins/rspec/UPGRADE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/UPGRADE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+= Upgrading existing code to RSpec-0.9
+
+== General (see below for Spec::Rails specifics)
+
+=== New Syntax for should and should_not
+
+* Use translator (should get 90% of your code)
+* Manually fix "parenthesis" warnings
+
+=== Change before_context_eval to before_eval
+
+before_context_eval is an un-published hook used by
+Spec::Rails to create specialized behaviour contexts.
+Most of you don't need to change this, but for those
+who have exploited it, you'll need to change it to
+before_eval.
+
+== Spec::Rails
+
+=== spec_helper.rb
+
+We've added a new way to configure Spec::Runner to do
+things like use_transactional_fixtures and use_instantiated_fixtures.
+You'll need to update spec/spec_helper.rb accordingly. You can either
+just re-generate it:
+
+  script/generate rspec
+  
+Or modify spec_helper.rb based on the template, which can be found at:
+
+  vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/autotest/discover.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/autotest/discover.rb
--- mephisto-0.7.3/vendor/plugins/rspec/autotest/discover.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/autotest/discover.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+# Used just for us to develop rspec with Autotest
+# We could symbolic link rspec/vendor/plugins/rspec => rspec/., but 
+# this leads to a problem with subversion on windows.  Autotest
+# uses Ruby's load path, which contains ".", so this is a workaround
+# (albeit, an unclean one)
+require File.dirname(__FILE__) + "/../lib/autotest/discover.rb"
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/autotest/rspec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/autotest/rspec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/autotest/rspec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/autotest/rspec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + "/../lib/autotest/rspec.rb"
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/bin/spec technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/bin/spec
--- mephisto-0.7.3/vendor/plugins/rspec/bin/spec	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/bin/spec	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'spec'
+exit ::Spec::Runner::CommandLine.run(rspec_options)
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/bin/spec_translator technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/bin/spec_translator
--- mephisto-0.7.3/vendor/plugins/rspec/bin/spec_translator	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/bin/spec_translator	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+raise "\n\nUsage: spec_translator from_dir to_dir\n\n" if ARGV.size != 2
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+require 'spec/translator'
+t = ::Spec::Translator.new
+from = ARGV[0]
+to = ARGV[1]
+t.translate(from, to)
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/auto_spec_description_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/auto_spec_description_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/auto_spec_description_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/auto_spec_description_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+# Run spec w/ -fs to see the output of this file
+
+describe "Examples with no descriptions" do
+  
+  # description is auto-generated as "should equal(5)" based on the last #should
+  it do
+    3.should equal(3)
+    5.should equal(5)
+  end
+  
+  it { 3.should be < 5 }
+  
+  it { ["a"].should include("a") }
+  
+  it { [1,2,3].should respond_to(:size) }
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/before_and_after_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/before_and_after_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/before_and_after_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/before_and_after_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/spec_helper'
+$global = 0
+
+describe "State created in before(:all)" do
+  before :all do
+    @sideeffect = 1
+    $global +=1
+  end
+
+  before :each do
+    @isolated = 1
+  end
+  
+  it "should be accessible from example" do
+    @sideeffect.should == 1
+    $global.should == 1
+    @isolated.should == 1
+
+    @sideeffect += 1
+    @isolated += 1
+  end
+
+  it "should not have sideffects" do
+    @sideeffect.should == 1
+    $global.should == 2
+    @isolated.should == 1
+
+    @sideeffect += 1
+    @isolated += 1
+  end
+
+  after :each do
+    $global += 1
+  end
+  
+  after :all do
+    $global.should == 3
+    $global = 0
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/behave_as_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/behave_as_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/behave_as_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/behave_as_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+def behave_as_electric_musician
+  respond_to(:read_notes, :turn_down_amp)
+end
+
+def behave_as_musician
+  respond_to(:read_notes)
+end
+
+module BehaveAsExample
+  
+  class BluesGuitarist
+    def read_notes; end
+    def turn_down_amp; end
+  end
+  
+  class RockGuitarist
+    def read_notes; end
+    def turn_down_amp; end
+  end
+  
+  class ClassicGuitarist
+    def read_notes; end
+  end
+  
+  describe BluesGuitarist do
+    it "should behave as guitarist" do
+      BluesGuitarist.new.should behave_as_electric_musician
+    end
+  end
+
+  describe RockGuitarist do
+    it "should behave as guitarist" do
+      RockGuitarist.new.should behave_as_electric_musician
+    end
+  end
+
+  describe ClassicGuitarist do
+    it "should not behave as guitarist" do
+      ClassicGuitarist.new.should behave_as_musician
+    end
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/custom_expectation_matchers.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/custom_expectation_matchers.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/custom_expectation_matchers.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/custom_expectation_matchers.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,54 @@
+module AnimalSpecHelper
+  class Eat
+    def initialize(food)
+      @food = food
+    end
+    
+    def matches?(animal)
+      @animal = animal
+      @animal.eats?(@food)
+    end
+    
+    def failure_message
+      "expected #{@animal} to eat #{@food}, but it does not"
+    end
+    
+    def negative_failure_message
+      "expected #{@animal} not to eat #{@food}, but it does"
+    end
+  end
+    
+  def eat(food)
+    Eat.new(food)
+  end
+end
+
+module Animals
+  class Animal
+    def eats?(food)
+      return foods_i_eat.include?(food)
+    end
+  end
+  
+  class Mouse < Animal
+    def foods_i_eat
+      [:cheese]
+    end
+  end
+
+  describe Mouse do
+    include AnimalSpecHelper
+    before(:each) do
+      @mouse = Animals::Mouse.new
+    end
+  
+    it "should eat cheese" do
+      @mouse.should eat(:cheese)
+    end
+  
+    it "should not eat cat" do
+      @mouse.should_not eat(:cat)
+    end
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/custom_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/custom_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/custom_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/custom_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require 'spec/runner/formatter/progress_bar_formatter'
+
+# Example of a formatter with custom bactrace printing. Run me with:
+# ruby bin/spec failing_examples -r examples/custom_formatter.rb -f CustomFormatter
+class CustomFormatter < Spec::Runner::Formatter::ProgressBarFormatter
+  def backtrace_line(line)
+    line.gsub(/([^:]*\.rb):(\d*)/) do
+      "<a href=\"file://#{File.expand_path($1)}\">#{$1}:#{$2}</a> "
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/dynamic_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/dynamic_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/dynamic_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/dynamic_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "Some integers" do
+  (1..10).each do |n|
+    it "The root of #{n} square should be #{n}" do
+      Math.sqrt(n*n).should == n
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/file_accessor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/file_accessor.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/file_accessor.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/file_accessor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/spec_helper'
+class FileAccessor
+  def open_and_handle_with(pathname, processor)
+    pathname.open do |io|
+      processor.process(io)
+    end
+  end
+end
+
+if __FILE__ == $0
+  require File.dirname(__FILE__) + '/io_processor'
+  require 'pathname'
+  
+  accessor = FileAccessor.new
+  io_processor = IoProcessor.new
+  file = Pathname.new ARGV[0]
+
+  accessor.open_and_handle_with(file, io_processor)
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/file_accessor_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/file_accessor_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/file_accessor_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/file_accessor_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/file_accessor'
+require 'stringio'
+
+describe "A FileAccessor" do
+  # This sequence diagram illustrates what this spec specifies.
+  #
+  #                  +--------------+     +----------+     +-------------+
+  #                  | FileAccessor |     | Pathname |     | IoProcessor |
+  #                  +--------------+     +----------+     +-------------+
+  #                         |                  |                  |
+  #   open_and_handle_with  |                  |                  |
+  #   -------------------->| |           open  |                  |
+  #                        | |--------------->| |                 |
+  #                        | | io             | |                 |
+  #                        | |<...............| |                 |
+  #                        | |                 |     process(io)  |
+  #                        | |---------------------------------->| |
+  #                        | |                 |                 | |
+  #                        | |<..................................| |
+  #                         |                  |                  |
+  #
+  it "should open a file and pass it to the processor's process method" do
+    # This is the primary actor
+    accessor = FileAccessor.new
+
+    # These are the primary actor's neighbours, which we mock.
+    file = mock "Pathname"
+    io_processor = mock "IoProcessor"
+    
+    io = StringIO.new "whatever"
+    file.should_receive(:open).and_yield io
+    io_processor.should_receive(:process).with(io)
+    
+    accessor.open_and_handle_with(file, io_processor)
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/greeter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/greeter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/greeter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/greeter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/spec_helper'
+# greeter.rb
+#
+# Based on http://glu.ttono.us/articles/2006/12/19/tormenting-your-tests-with-heckle
+#
+# Run with:
+#
+#   spec greeter_spec.rb --heckle Greeter
+#
+class Greeter
+  def initialize(person = nil)
+    @person = person
+  end
+
+  def greet
+    @person.nil? ? "Hi there!" : "Hi #{@person}!"
+  end
+end
+
+describe "Greeter" do
+  it "should say Hi to person" do
+    greeter = Greeter.new("Kevin")
+    greeter.greet.should == "Hi Kevin!"
+  end
+
+  it "should say Hi to nobody" do
+    greeter = Greeter.new
+    # Uncomment the next line to make Heckle happy
+    #greeter.greet.should == "Hi there!"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/helper_method_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/helper_method_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/helper_method_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/helper_method_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "a context with helper a method" do
+  def helper_method
+    "received call"
+  end
+  
+  it "should make that method available to specs" do
+    helper_method.should == "received call"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/io_processor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/io_processor.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/io_processor.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/io_processor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+class DataTooShort < StandardError; end
+
+class IoProcessor
+  # Does some fancy stuff unless the length of +io+ is shorter than 32
+  def process(io)
+    raise DataTooShort if io.read.length < 32
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/io_processor_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/io_processor_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/io_processor_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/io_processor_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/io_processor'
+require 'stringio'
+
+describe "An IoProcessor" do
+  before(:each) do
+    @processor = IoProcessor.new
+  end
+
+  it "should raise nothing when the file is exactly 32 bytes" do
+    lambda {
+      @processor.process(StringIO.new("z"*32))
+    }.should_not raise_error
+  end
+
+  it "should raise an exception when the file length is less than 32 bytes" do
+    lambda {
+      @processor.process(StringIO.new("z"*31))
+    }.should raise_error(DataTooShort)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/legacy_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/legacy_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/legacy_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/legacy_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/spec_helper'
+context "A legacy spec" do
+  setup do
+  end
+  
+  specify "should work fine" do
+  end
+  
+  teardown do
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/mocking_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/mocking_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/mocking_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/mocking_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "A consumer of a mock" do
+  it "should be able to send messages to the mock" do
+    mock = mock("poke me")
+    mock.should_receive(:poke)
+    mock.poke
+  end
+end
+
+describe "a mock" do
+  it "should be able to mock the same message twice w/ different args" do
+    mock = mock("mock")
+    mock.should_receive(:msg).with(:arg1).and_return(:val1)
+    mock.should_receive(:msg).with(:arg2).and_return(:val2)
+    mock.msg(:arg1).should eql(:val1)
+    mock.msg(:arg2).should eql(:val2)
+  end
+
+  it "should be able to mock the same message twice w/ different args in reverse order" do
+    mock = mock("mock")
+    mock.should_receive(:msg).with(:arg1).and_return(:val1)
+    mock.should_receive(:msg).with(:arg2).and_return(:val2)
+    mock.msg(:arg2).should eql(:val2)
+    mock.msg(:arg1).should eql(:val1)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/multi_threaded_behaviour_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/multi_threaded_behaviour_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/multi_threaded_behaviour_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/multi_threaded_behaviour_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+
+class MultiThreadedBehaviourRunner < Spec::Runner::BehaviourRunner
+  def initialize(options, arg)
+    super(options)
+    # configure these
+    @thread_count = 4
+    @thread_wait = 0
+  end
+
+  def run
+    @threads = []
+    q = Queue.new
+    behaviours.each { |b| q << b}
+    success = true
+    @thread_count.times do
+      @threads << Thread.new(q) do |queue|
+        while not queue.empty?
+          behaviour = queue.pop
+          success &= behaviour.suite.run(nil)
+        end
+      end
+      sleep @thread_wait
+    end
+    @threads.each {|t| t.join}
+    success
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/nested_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/nested_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/nested_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/nested_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/stack'
+
+# TODO - this runs and does the right thing except for
+# output - "Stack" never appears. Getting close though.
+
+describe Stack do
+  before(:each) do
+    @stack = Stack.new
+  end
+  
+  describe "when empty" do
+    it "should be empty" do
+      @stack.should be_empty
+    end
+  end
+  
+  describe "when full" do
+    before(:each) do
+      (1..10).each {|n| @stack.push n}
+    end
+    it "should description" do
+      @stack.should be_full
+    end
+  end  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/partial_mock_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/partial_mock_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/partial_mock_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/partial_mock_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class MockableClass
+  def self.find id
+    return :original_return
+  end
+end
+
+describe "A partial mock" do
+
+  it "should work at the class level" do
+    MockableClass.should_receive(:find).with(1).and_return {:stub_return}
+    MockableClass.find(1).should equal(:stub_return)
+  end
+
+  it "should revert to the original after each spec" do
+    MockableClass.find(1).should equal(:original_return)
+  end
+
+  it "can be mocked w/ ordering" do
+    MockableClass.should_receive(:msg_1).ordered
+    MockableClass.should_receive(:msg_2).ordered
+    MockableClass.should_receive(:msg_3).ordered
+    MockableClass.msg_1
+    MockableClass.msg_2
+    MockableClass.msg_3
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/pending_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/pending_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/pending_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/pending_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "pending example (using pending method)" do
+  it %Q|should be reported as "PENDING: for some reason"| do
+    pending("for some reason")
+  end
+end
+
+describe "pending example (with no block)" do
+  it %Q|should be reported as "PENDING: Not Yet Implemented"|
+end
+
+describe "pending example (with block for pending)" do
+  it %Q|should have a failing block, passed to pending, reported as "PENDING: for some reason"| do
+    pending("for some reason") do
+      raise "some reason"
+    end
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/predicate_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/predicate_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/predicate_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/predicate_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class BddFramework
+  def intuitive?
+    true
+  end
+  
+  def adopted_quickly?
+    true
+  end
+end
+
+describe "BDD framework" do
+
+  before(:each) do
+    @bdd_framework = BddFramework.new
+  end
+
+  it "should be adopted quickly" do
+    @bdd_framework.should be_adopted_quickly
+  end
+  
+  it "should be intuitive" do
+    @bdd_framework.should be_intuitive
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/priority.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/priority.txt
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/priority.txt	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/priority.txt	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+examples/custom_expectation_matchers.rb
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+module SharedExampleGroupExample
+  class OneThing
+    def what_things_do
+      "stuff"
+    end
+  end
+  
+  class AnotherThing
+    def what_things_do
+      "stuff"
+    end
+  end
+  
+  class YetAnotherThing
+    def what_things_do
+      "stuff"
+    end
+  end
+  
+  # A SharedExampleGroup is a module, so you can assign
+  # it to a constant if you want ....
+  AllThings = describe "All Things", :shared => true do
+    def helper_method
+      "helper method"
+    end
+    
+    it "should do what things do" do
+      @thing.what_things_do.should == "stuff"
+    end
+  end
+  
+  # TODO - it would be nice to be able to say this instead of the above:
+  
+  # class AllThings < Spec::SharedExampleGroup
+  #   ...
+  # end
+
+  describe OneThing do
+    # ... then you can include the behaviour like this, which 
+    # feels more like what you might say ...
+    it_should_behave_like "All Things"
+    before(:each) { @thing = OneThing.new }
+    
+    it "should have access to helper methods defined in the shared behaviour" do
+      helper_method.should == "helper method"
+    end
+  end
+
+  describe AnotherThing do
+    # ... or you can include the behaviour like this, which
+    # feels more like the programming language we love.
+    it_should_behave_like AllThings
+    
+    before(:each) { @thing = AnotherThing.new }
+  end
+
+  describe YetAnotherThing do
+    # ... or you can include the behaviour like this, which
+    # feels more like the programming language we love.
+    include AllThings
+    
+    before(:each) { @thing = AnotherThing.new }
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/spec_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+lib_path = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+require 'spec'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/stack.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/stack.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/stack.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/stack.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,36 @@
+class StackUnderflowError < RuntimeError
+end
+
+class StackOverflowError < RuntimeError
+end
+
+class Stack
+  
+  def initialize
+    @items = []
+  end
+  
+  def push object
+    raise StackOverflowError if @items.length == 10
+    @items.push object
+  end
+  
+  def pop
+    raise StackUnderflowError if @items.empty?
+    @items.delete @items.last
+  end
+  
+  def peek
+    raise StackUnderflowError if @items.empty?
+    @items.last
+  end
+  
+  def empty?
+    @items.empty?
+  end
+
+  def full?
+    @items.length == 10
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/stack_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/stack_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/stack_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/stack_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + "/stack"
+
+describe "non-empty Stack", :shared => true do
+  # NOTE that this one auto-generates the description "should not be empty"
+  it { @stack.should_not be_empty }
+  
+  it "should return the top item when sent #peek" do
+    @stack.peek.should == @last_item_added
+  end
+
+  it "should NOT remove the top item when sent #peek" do
+    @stack.peek.should == @last_item_added
+    @stack.peek.should == @last_item_added
+  end
+  
+  it "should return the top item when sent #pop" do
+    @stack.pop.should == @last_item_added
+  end
+  
+  it "should remove the top item when sent #pop" do
+    @stack.pop.should == @last_item_added
+    unless @stack.empty?
+      @stack.pop.should_not == @last_item_added
+    end
+  end
+end
+
+describe "non-full Stack", :shared => true do
+  # NOTE that this one auto-generates the description "should not be full"
+  it { @stack.should_not be_full }
+
+  it "should add to the top when sent #push" do
+    @stack.push "newly added top item"
+    @stack.peek.should == "newly added top item"
+  end
+end
+
+describe Stack, " (empty)" do
+  before(:each) do
+    @stack = Stack.new
+  end
+  
+  # NOTE that this one auto-generates the description "should be empty"
+  it { @stack.should be_empty }
+  
+  it_should_behave_like "non-full Stack"
+  
+  it "should complain when sent #peek" do
+    lambda { @stack.peek }.should raise_error(StackUnderflowError)
+  end
+  
+  it "should complain when sent #pop" do
+    lambda { @stack.pop }.should raise_error(StackUnderflowError)
+  end
+end
+
+describe Stack, " (with one item)" do
+  before(:each) do
+    @stack = Stack.new
+    @stack.push 3
+    @last_item_added = 3
+  end
+
+  it_should_behave_like "non-empty Stack"
+  it_should_behave_like "non-full Stack"
+
+end
+
+describe Stack, " (with one item less than capacity)" do
+  before(:each) do
+    @stack = Stack.new
+    (1..9).each { |i| @stack.push i }
+    @last_item_added = 9
+  end
+  
+  it_should_behave_like "non-empty Stack"
+  it_should_behave_like "non-full Stack"
+end
+
+describe Stack, " (full)" do
+  before(:each) do
+    @stack = Stack.new
+    (1..10).each { |i| @stack.push i }
+    @last_item_added = 10
+  end
+
+  # NOTE that this one auto-generates the description "should be full"
+  it { @stack.should be_full }  
+
+  it_should_behave_like "non-empty Stack"
+
+  it "should complain on #push" do
+    lambda { @stack.push Object.new }.should raise_error(StackOverflowError)
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/pure/stubbing_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/stubbing_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/pure/stubbing_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/pure/stubbing_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "A consumer of a stub" do
+  it "should be able to stub methods on any Object" do
+    obj = Object.new
+    obj.stub!(:foobar).and_return {:return_value}
+    obj.foobar.should equal(:return_value)
+  end
+end
+
+class StubbableClass
+  def self.find id
+    return :original_return
+  end
+end
+
+describe "A stubbed method on a class" do
+  it "should return the stubbed value" do
+    StubbableClass.stub!(:find).and_return(:stub_return)
+    StubbableClass.find(1).should equal(:stub_return)
+  end
+  
+  it "should revert to the original method after each spec" do
+    StubbableClass.find(1).should equal(:original_return)
+  end
+
+  it "can stub! and mock the same message" do
+    StubbableClass.stub!(:msg).and_return(:stub_value)
+    StubbableClass.should_receive(:msg).with(:arg).and_return(:mock_value)
+
+    StubbableClass.msg.should equal(:stub_value)
+    StubbableClass.msg(:other_arg).should equal(:stub_value)
+    StubbableClass.msg(:arg).should equal(:mock_value)
+    StubbableClass.msg(:another_arg).should equal(:stub_value)
+    StubbableClass.msg(:yet_another_arg).should equal(:stub_value)
+    StubbableClass.msg.should equal(:stub_value)
+  end
+end
+
+describe "A mock" do
+  it "can stub!" do
+    mock = mock("stubbing mock")
+    mock.stub!(:msg).and_return(:value)
+    (1..10).each {mock.msg.should equal(:value)}
+  end
+  
+  it "can stub! and mock" do
+    mock = mock("stubbing mock")
+    mock.stub!(:stub_message).and_return(:stub_value)
+    mock.should_receive(:mock_message).once.and_return(:mock_value)
+    (1..10).each {mock.stub_message.should equal(:stub_value)}
+    mock.mock_message.should equal(:mock_value)
+    (1..10).each {mock.stub_message.should equal(:stub_value)}
+  end
+  
+  it "can stub! and mock the same message" do
+    mock = mock("stubbing mock")
+    mock.stub!(:msg).and_return(:stub_value)
+    mock.should_receive(:msg).with(:arg).and_return(:mock_value)
+    mock.msg.should equal(:stub_value)
+    mock.msg(:other_arg).should equal(:stub_value)
+    mock.msg(:arg).should equal(:mock_value)
+    mock.msg(:another_arg).should equal(:stub_value)
+    mock.msg(:yet_another_arg).should equal(:stub_value)
+    mock.msg.should equal(:stub_value)
+  end
+end
+
+    
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/adder.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/adder.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/adder.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/adder.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+class Adder
+  def initialize
+    @addends = []
+  end
+  
+  def <<(val)
+    @addends << val
+  end
+  
+  def sum
+    @addends.inject(0) { |sum_so_far, val| sum_so_far + val }
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/addition technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/addition
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/addition	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/addition	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,34 @@
+This is a story about a calculator. The text up here above the Story: declaration
+won't be processed, so you can write whatever you wish!
+
+Story: simple addition
+
+  As an accountant
+  I want to add numbers
+  So that I can count beans
+
+  Scenario: add one plus one
+    Given an addend of 1
+    And an addend of 1
+    
+    When the addends are addeds
+    
+    Then the sum should be 3
+    And the corks should be popped
+  
+  Scenario: add two plus five
+    Given an addend of 2
+    And an addend of 5
+    
+    When the addends are added
+    
+    Then the sum should be 7
+    Then it should snow
+    
+  Scenario: add three more
+    GivenScenario add two plus five
+    And an addend of 3
+    
+    When the addends are added
+    
+    Then the sum should be 10
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/addition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/addition.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/addition.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/addition.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), "helper")
+require File.join(File.dirname(__FILE__), "adder")
+
+# with_steps_for :addition, :more_addition do
+with_steps_for :addition, :more_addition do
+  # Then("the corks should be popped") { }
+  run File.expand_path(__FILE__).gsub(".rb","")
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/calculator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/calculator.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/calculator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/calculator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,65 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
+require 'spec'
+
+class AdditionMatchers < Spec::Story::StepGroup
+  steps do |add|
+    add.given("an addend of $addend") do |addend|
+      @adder ||= Adder.new
+      @adder << addend.to_i
+    end
+  end
+end
+
+steps = AdditionMatchers.new do |add|  
+  add.then("the sum should be $sum") do |sum|
+    @sum.should == sum.to_i
+  end
+end
+
+steps.when("they are added") do
+  @sum = @adder.sum
+end
+
+# This Story uses steps (see above) instead of blocks
+# passed to Given, When and Then
+
+Story "addition", %{
+  As an accountant
+  I want to add numbers
+  So that I can count some beans
+}, :steps => steps do
+  Scenario "2 + 3" do
+    Given "an addend of 2"
+    And "an addend of 3"
+    When "they are added"
+    Then "the sum should be 5"
+  end
+  
+  # This scenario uses GivenScenario, which silently runs
+  # all the steps in a previous scenario.
+  
+  Scenario "add 4 more" do
+    GivenScenario "2 + 3"
+    Given "an addend of 4"
+    When "they are added"
+    Then "the sum should be 9"
+  end
+end
+
+# And the class that makes the story pass
+
+class Adder
+  def << addend
+    addends << addend
+  end
+  
+  def sum
+    @addends.inject(0) do |result, addend|
+      result + addend.to_i
+    end
+  end
+  
+  def addends
+    @addends ||= []
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/.loadpath technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/.loadpath
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/.loadpath	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/.loadpath	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<loadpath>
+	<pathentry path="" type="src"/>
+	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
+</loadpath>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/README.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/README.txt
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/README.txt	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/README.txt	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+John Conway's Game of Life
+
+The Rules
+---------
+The Game of Life was invented by John Conway (as you might have gathered).
+The game is played on a field of cells, each of which has eight neighbors (adjacent cells).
+A cell is either occupied (by an organism) or not.
+The rules for deriving a generation from the previous one are these:
+
+Survival
+--------
+If an occupied cell has 2 or 3 neighbors, the organism survives to the next generation.
+
+Death
+-----
+If an occupied cell has 0, 1, 4, 5, 6, 7, or 8 occupied neighbors, the organism dies
+(0, 1: of loneliness; 4 thru 8: of overcrowding).
+
+Birth
+-----
+If an unoccupied cell has 3 occupied neighbors, it becomes occupied.
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..')
+
+require 'spec'
+require 'behaviour/examples/examples'
+require 'behaviour/stories/stories'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/examples.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/examples.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/examples.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/examples.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+require 'spec'
+require 'behaviour/examples/game_behaviour'
+require 'behaviour/examples/grid_behaviour'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,35 @@
+require 'life'
+
+describe Game do
+  it 'should have a grid' do
+    # given
+    game = Game.new(5, 5)
+    
+    # then
+    game.grid.should be_kind_of(Grid)
+  end
+  
+  it 'should create a cell' do
+    # given
+    game = Game.new(2, 2)
+    expected_grid = Grid.from_string( 'X. ..' )
+    
+    # when
+    game.create_at(0, 0)
+    
+    # then
+    game.grid.should == expected_grid
+  end
+  
+  it 'should destroy a cell' do
+    # given
+    game = Game.new(2,2)
+    game.grid = Grid.from_string('X. ..')
+    
+    # when
+    game.destroy_at(0,0)
+    
+    # then
+    game.grid.should == Grid.from_string('.. ..')
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,66 @@
+describe Grid do
+  it 'should be empty when created' do
+    # given
+    expected_contents = [
+      [0, 0, 0],
+      [0, 0, 0]
+    ]
+    grid = Grid.new(2, 3)
+    
+    # when
+    contents = grid.contents
+    
+    # then
+    contents.should == expected_contents
+  end
+  
+  it 'should compare equal based on its contents' do
+    # given
+    grid1 = Grid.new(2, 3)
+    grid2 = Grid.new(2, 3)
+    
+    # then
+    grid1.should == grid2
+  end
+  
+  it 'should be able to replace its contents' do
+    # given
+    grid = Grid.new(2,2)
+    new_contents = [[0,1,0], [1,0,1]]
+    
+    # when
+    grid.contents = new_contents
+    
+    # then
+    grid.contents.should == new_contents
+    grid.rows.should == 2
+    grid.columns.should == 3
+  end
+  
+  it 'should add an organism' do
+    # given
+    grid = Grid.new(2, 2)
+    expected = Grid.new(2, 2)
+    expected.contents = [[1,0],[0,0]]
+    
+    # when
+    grid.create_at(0,0)
+    
+    # then
+    grid.should == expected
+  end
+  
+  it 'should create itself from a string' do
+    # given
+    expected = Grid.new 3, 3
+    expected.create_at(0,0)
+    expected.create_at(1,0)
+    expected.create_at(2,2)
+    
+    # when
+    actual = Grid.from_string "X.. X.. ..X"
+    
+    # then
+    actual.should == expected
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+Story: cells with less than two neighbours die
+
+As a game producer
+I want cells with less than two neighbours to die
+So that I can illustrate how the game works to people with money
+
+Scenario: cells with zero or one neighbour die
+
+Given the grid looks like
+........
+.XX.XX..
+.XX.....
+....X...
+........
+When the next step occurs
+Then the grid should look like
+........
+.XX.....
+.XX.....
+........
+........
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+Story: cells with more than three neighbours die
+
+As a game producer
+I want cells with more than three neighbours to die
+So that I can show the people with money how we are getting on
+
+Scenario: blink
+
+Given the grid looks like
+.....
+...XX
+...XX
+.XX..
+.XX..
+When the next step occurs
+Then the grid should look like
+.....
+...XX
+....X
+.X...
+.XX..
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+Story: Empty spaces with three neighbours create a cell
+
+As a game producer
+I want empty cells with three neighbours to die
+So that I have a minimum feature set to ship
+
+Scenario: the glider
+
+Given the grid looks like
+...X..
+..X...
+..XXX.
+......
+......
+When the next step occurs
+Then the grid should look like
+......
+..X.X.
+..XX..
+...X..
+......
+When the next step occurs
+Then the grid should look like
+......
+..X...
+..X.X.
+..XX..
+......
+When the next step occurs
+Then the grid should look like
+......
+...X..
+.XX...
+..XX..
+......
+When the next step occurs
+Then the grid should look like
+......
+..X...
+.X....
+.XXX..
+......
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanCreateACell.story technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanCreateACell.story
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanCreateACell.story	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanCreateACell.story	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+Story: I can create a cell
+
+As a game producer
+I want to create a cell
+So that I can show the grid to people
+
+Scenario: nothing to see here
+
+Given a 3 x 3 game
+Then the grid should look like
+...
+...
+...
+
+Scenario: all on its lonesome
+
+Given a 3 x 3 game
+When I create a cell at 1, 1
+Then the grid should look like
+...
+.X.
+...
+
+Scenario: the grid has three cells
+
+Given a 3 x 3 game
+When I create a cell at 0, 0
+and I create a cell at 0, 1
+and I create a cell at 2, 2
+Then the grid should look like
+XX.
+...
+..X
+
+Scenario: more cells more more
+
+Given the grid has three cells
+When I create a celll at 3, 1
+Then the grid should look like
+XX.
+..X
+..X
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanKillACell.story technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanKillACell.story
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanKillACell.story	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanKillACell.story	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,17 @@
+Story: I can kill a cell
+
+As a game producer
+I want to kill a cell
+So that when I make a mistake I dont have to start again
+
+Scenario: bang youre dead
+
+Given the grid looks like
+XX.
+.X.
+..X
+When I destroy the cell at 0, 1
+Then the grid should look like
+X..
+.X.
+..X
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/TheGridWraps.story technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/TheGridWraps.story
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/TheGridWraps.story	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/TheGridWraps.story	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,53 @@
+Story: The grid wraps
+
+As a game player
+I want the grid to wrap
+So that untidy stuff at the edges is avoided
+
+Scenario: crowded in the corners
+
+Given the grid looks like
+X.X
+...
+X.X
+When the next step is taken
+Then the grid should look like
+X.X
+...
+X.X
+
+
+Scenario: the glider returns
+
+Given the glider
+......
+..X...
+.X....
+.XXX..
+......
+When the next step is taken
+and the next step is taken
+and the next step is taken
+and the next step is taken
+Then the grid should look like
+......
+......
+.X....
+X.....
+XXX...
+When the next step is taken
+Then the grid should look like
+.X....
+......
+......
+X.X...
+XX....
+When the next step is taken
+Then the grid should look like
+XX....
+......
+......
+X.....
+X.X...
+
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+Story "I can create a cell",
+  %(As a game producer
+    I want to create a cell
+    So that I can show the grid to people), :steps_for => :life do
+  
+  Scenario "nothing to see here" do
+    Given "a game with dimensions", 3, 3 do |rows,cols|
+      @game = Game.new(rows,cols)
+    end
+    
+    Then "the grid should look like", %(
+      ...
+      ...
+      ...
+    )
+  end
+  
+  Scenario "all on its lonesome" do
+    Given "a game with dimensions", 2, 2
+    When "I create a cell at", 1, 1 do |row,col|
+      @game.create_at(row,col)
+    end
+    Then "the grid should look like", %(
+      ..
+      .X
+    )
+  end
+  
+  Scenario "the grid has three cells" do
+    Given "a game with dimensions", 3, 3
+    When "I create a cell at", 0, 0
+    When "I create a cell at", 0, 1
+    When "I create a cell at", 2, 2
+    Then "the grid should look like", %(
+      XX.
+      ...
+      ..X
+    )
+  end
+  
+  Scenario "more cells more more" do
+    GivenScenario "the grid has three cells"
+    When "I create a cell at", 2, 0
+    Then "the grid should look like", %(
+      XX.
+      ...
+      X.X
+    )
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.expand_path("#{dir}/../../../../../../rspec/lib"))
+require 'spec'
+$LOAD_PATH.unshift(File.expand_path("#{dir}/../../"))
+require "#{dir}/../../life"
+require File.join(File.dirname(__FILE__), *%w[steps])
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+Story 'I can kill a cell',
+  %(As a game producer
+  I want to kill a cell
+  So that when I make a mistake I don't have to start again), :steps_for => :life do
+  
+  Scenario "bang, you're dead" do
+    
+    Given 'a game that looks like', %(
+      XX.
+      .X.
+      ..X
+    ) do |dots|
+      @game = Game.from_string dots
+    end
+    When 'I destroy the cell at', 0, 1 do |row,col|
+      @game.destroy_at(row,col)
+    end
+    Then 'the grid should look like', %(
+      X..
+      .X.
+      ..X
+    )
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/steps.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/steps.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/steps.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/steps.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+steps_for :life do
+  Then "the grid should look like" do |dots|
+    @game.grid.should == Grid.from_string(dots)
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+require 'behaviour/stories/create_a_cell'
+require 'behaviour/stories/kill_a_cell'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.txt
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.txt	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.txt	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+Story: Show the game field
+    As a game player
+    I want to see the field
+    so that I can observe the progress of the organisms
+
+Scenario: an empty field
+  Given a new game starts
+  When the game displays the field
+  Then the field should be empty
+
+
+
+
+
+StoryBuilder story = stories.createStory().called("a story")
+	.asA("person")
+	.iWant("to do something")
+	.soThat("I can rule the world");
+story.addScenario().called("happy path").as()
+	.given("some context")
+	.when("some event happens")
+	.then("expect some outcome");
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/life/game.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/life/game.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/life/game.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/life/game.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,23 @@
+class Game
+  attr_accessor :grid
+  def initialize(rows,cols)
+    @grid = Grid.new(rows, cols)
+  end
+  
+  def create_at(row,col)
+    @grid.create_at(row,col)
+  end
+  
+  def destroy_at(row,col)
+    @grid.destroy_at(row, col)
+  end
+  
+  def self.from_string(dots)
+    grid = Grid.from_string(dots)
+    game = new(grid.rows, grid.columns)
+    game.instance_eval do
+      @grid = grid
+    end
+    return game
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/life/grid.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/life/grid.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/life/grid.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/life/grid.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,43 @@
+class Grid
+  
+  attr_accessor :contents
+  
+  def initialize(rows, cols)
+    @contents = []
+    rows.times do @contents << [0] * cols end
+  end
+  
+  def rows
+    @contents.size
+  end
+  
+  def columns
+    @contents[0].size
+  end
+  
+  def ==(other)
+    self.contents == other.contents
+  end
+  
+  def create_at(row,col)
+    @contents[row][col] = 1
+  end
+  
+  def destroy_at(row,col)
+    @contents[row][col] = 0
+  end
+  
+  def self.from_string(str)
+    row_strings = str.split(' ')
+    grid = new(row_strings.size, row_strings[0].size)
+    
+    row_strings.each_with_index do |row, row_index|
+      row_chars = row.split(//)
+      row_chars.each_with_index do |col_char, col_index|
+        grid.create_at(row_index, col_index) if col_char == 'X'
+      end
+    end
+    return grid
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/life.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/life.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/game-of-life/life.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/game-of-life/life.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+$: << File.dirname(__FILE__)
+require 'life/game'
+require 'life/grid'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+require 'spec'
+
+# won't have to do this once plain_text_story_runner is moved into the library
+# require File.join(File.dirname(__FILE__), "plain_text_story_runner")
+
+Dir[File.join(File.dirname(__FILE__), "steps/*.rb")].each do |file|
+  require file
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/examples/stories/steps/addition_steps.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/steps/addition_steps.rb
--- mephisto-0.7.3/vendor/plugins/rspec/examples/stories/steps/addition_steps.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/examples/stories/steps/addition_steps.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+# This creates steps for :addition
+steps_for(:addition) do
+  Given("an addend of $addend") do |addend|
+    @adder ||= Adder.new
+    @adder << addend.to_i
+  end
+end
+
+# This appends to them
+steps_for(:addition) do
+  When("the addends are added")  { @sum = @adder.sum }
+end
+
+steps_for(:more_addition) do
+  Then("the sum should be $sum") { |sum| @sum.should == sum.to_i }
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/diffing_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/diffing_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/diffing_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/diffing_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,36 @@
+describe "Running specs with --diff" do
+  it "should print diff of different strings" do
+    uk = <<-EOF
+RSpec is a
+behaviour driven development
+framework for Ruby
+EOF
+    usa = <<-EOF
+RSpec is a
+behavior driven development
+framework for Ruby
+EOF
+    usa.should == uk
+  end
+
+  class Animal
+    def initialize(name,species)
+      @name,@species = name,species
+    end
+
+    def inspect
+      <<-EOA
+<Animal
+name=#{@name},
+species=#{@species}
+>
+      EOA
+    end
+  end
+
+  it "should print diff of different objects' pretty representation" do
+    expected = Animal.new "bob", "giraffe"
+    actual   = Animal.new "bob", "tortoise"
+    expected.should eql(actual)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/failure_in_setup.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/failure_in_setup.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/failure_in_setup.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/failure_in_setup.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+describe "This example" do
+  
+  before(:each) do
+    NonExistentClass.new
+  end
+  
+  it "should be listed as failing in setup" do
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/failure_in_teardown.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/failure_in_teardown.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/failure_in_teardown.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/failure_in_teardown.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+describe "This example" do
+  
+  it "should be listed as failing in teardown" do
+  end
+  
+  after(:each) do
+    NonExistentClass.new
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "Mocker" do
+
+  it "should be able to call mock()" do
+    mock = mock("poke me")
+    mock.should_receive(:poke)
+    mock.poke
+  end
+
+  it "should fail when expected message not received" do
+    mock = mock("poke me")
+    mock.should_receive(:poke)
+  end
+  
+  it "should fail when messages are received out of order" do
+    mock = mock("one two three")
+    mock.should_receive(:one).ordered
+    mock.should_receive(:two).ordered
+    mock.should_receive(:three).ordered
+    mock.one
+    mock.three
+    mock.two
+  end
+
+  it "should get yelled at when sending unexpected messages" do
+    mock = mock("don't talk to me")
+    mock.should_not_receive(:any_message_at_all)
+    mock.any_message_at_all
+  end
+
+  it "has a bug we need to fix" do
+    pending "here is the bug" do
+      # Actually, no. It's fixed. This will fail because it passes :-)
+      mock = mock("Bug")
+      mock.should_receive(:hello)
+      mock.hello
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_with_flexmock.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_with_flexmock.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_with_flexmock.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_with_flexmock.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+# stub frameworks like to gum up Object, so this is deliberately
+# set NOT to run so that you don't accidentally run it when you
+# run this dir.
+
+# To run it, stand in this directory and say:
+#
+#   RUN_FLEXMOCK_EXAMPLE=true ruby ../bin/spec mocking_with_flexmock.rb
+
+if ENV['RUN_FLEXMOCK_EXAMPLE']
+  Spec::Runner.configure do |config|
+    config.mock_with :flexmock
+  end
+
+  describe "Flexmocks" do
+    it "should fail when the expected message is received with wrong arguments" do
+      m = flexmock("now flex!")
+      m.should_receive(:msg).with("arg").once
+      m.msg("other arg")
+    end
+
+    it "should fail when the expected message is not received at all" do
+      m = flexmock("now flex!")
+      m.should_receive(:msg).with("arg").once
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_with_mocha.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_with_mocha.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_with_mocha.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_with_mocha.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,25 @@
+# stub frameworks like to gum up Object, so this is deliberately
+# set NOT to run so that you don't accidentally run it when you
+# run this dir.
+
+# To run it, stand in this directory and say:
+#
+#   RUN_MOCHA_EXAMPLE=true ruby ../bin/spec mocking_with_mocha.rb
+
+if ENV['RUN_MOCHA_EXAMPLE']
+  Spec::Runner.configure do |config|
+    config.mock_with :mocha
+  end
+  describe "Mocha framework" do
+    it "should should be made available by saying config.mock_with :mocha" do
+      m = mock()
+      m.expects(:msg).with("arg")
+      m.msg
+    end
+    it "should should be made available by saying config.mock_with :mocha" do
+      o = Object.new
+      o.expects(:msg).with("arg")
+      o.msg
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_with_rr.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_with_rr.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/mocking_with_rr.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/mocking_with_rr.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+# stub frameworks like to gum up Object, so this is deliberately
+# set NOT to run so that you don't accidentally run it when you
+# run this dir.
+
+# To run it, stand in this directory and say:
+#
+#   RUN_RR_EXAMPLE=true ruby ../bin/spec mocking_with_rr.rb
+
+if ENV['RUN_RR_EXAMPLE']
+  Spec::Runner.configure do |config|
+    config.mock_with :rr
+  end
+  describe "RR framework" do
+    it "should should be made available by saying config.mock_with :rr" do
+      o = Object.new
+      mock(o).msg("arg")
+      o.msg
+    end
+    it "should should be made available by saying config.mock_with :rr" do
+      o = Object.new
+      mock(o) do |m|
+        m.msg("arg")
+      end
+      o.msg
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/partial_mock_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/partial_mock_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/partial_mock_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/partial_mock_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class MockableClass
+  def self.find id
+    return :original_return
+  end
+end
+
+describe "A partial mock" do
+
+  it "should work at the class level (but fail here due to the type mismatch)" do
+    MockableClass.should_receive(:find).with(1).and_return {:stub_return}
+    MockableClass.find("1").should equal(:stub_return)
+  end
+
+  it "should revert to the original after each spec" do
+    MockableClass.find(1).should equal(:original_return)
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/predicate_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/predicate_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/predicate_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/predicate_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class BddFramework
+  def intuitive?
+    true
+  end
+
+  def adopted_quickly?
+    #this will cause failures because it reallly SHOULD be adopted quickly
+    false
+  end
+end
+
+describe "BDD framework" do
+
+  before(:each) do
+    @bdd_framework = BddFramework.new
+  end
+
+  it "should be adopted quickly" do
+    #this will fail because it reallly SHOULD be adopted quickly
+    @bdd_framework.should be_adopted_quickly
+  end
+
+  it "should be intuitive" do
+    @bdd_framework.should be_intuitive
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/raising_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/raising_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/raising_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/raising_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,47 @@
+describe "This example" do
+  
+  it "should show that a NoMethodError is raised but an Exception was expected" do
+    proc { ''.nonexistent_method }.should raise_error
+  end
+  
+  it "should pass" do
+    proc { ''.nonexistent_method }.should raise_error(NoMethodError)
+  end
+  
+  it "should show that a NoMethodError is raised but a SyntaxError was expected" do
+    proc { ''.nonexistent_method }.should raise_error(SyntaxError)
+  end
+  
+  it "should show that nothing is raised when SyntaxError was expected" do
+    proc { }.should raise_error(SyntaxError)
+  end
+
+  it "should show that a NoMethodError is raised but a Exception was expected" do
+    proc { ''.nonexistent_method }.should_not raise_error
+  end
+  
+  it "should show that a NoMethodError is raised" do
+    proc { ''.nonexistent_method }.should_not raise_error(NoMethodError)
+  end
+  
+  it "should also pass" do
+    proc { ''.nonexistent_method }.should_not raise_error(SyntaxError)
+  end
+  
+  it "should show that a NoMethodError is raised when nothing expected" do
+    proc { ''.nonexistent_method }.should_not raise_error(Exception)
+  end
+  
+  it "should show that the wrong message was received" do
+    proc { raise StandardError.new("what is an enterprise?") }.should raise_error(StandardError, "not this")
+  end
+  
+  it "should show that the unexpected error/message was thrown" do
+    proc { raise StandardError.new("abc") }.should_not raise_error(StandardError, "abc")
+  end
+  
+  it "should pass too" do
+    proc { raise StandardError.new("abc") }.should_not raise_error(StandardError, "xyz")
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/spec_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+lib_path = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+require "spec"
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/syntax_error_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/syntax_error_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/syntax_error_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/syntax_error_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+describe "when passing a block to a matcher" do
+  it "you should use {} instead of do/end" do
+    Object.new.should satisfy do
+      "this block is being passed to #should instead of #satisfy - use {} instead"
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/team_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/team_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/team_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/team_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+
+class Team
+  attr_reader :players
+  def initialize
+    @players = Players.new
+  end
+end
+
+class Players
+  def initialize
+    @players = []
+  end
+  def size
+    @players.size
+  end
+  def include? player
+    raise "player must be a string" unless player.is_a?(String)
+    @players.include? player
+  end
+end
+
+describe "A new team" do
+  
+  before(:each) do
+    @team = Team.new
+  end
+  
+  it "should have 3 players (failing example)" do
+    @team.should have(3).players
+  end
+  
+  it "should include some player (failing example)" do
+    @team.players.should include("Some Player")
+  end
+
+  it "should include 5 (failing example)" do
+    @team.players.should include(5)
+  end
+  
+  it "should have no players"
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/failing_examples/timeout_behaviour.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/timeout_behaviour.rb
--- mephisto-0.7.3/vendor/plugins/rspec/failing_examples/timeout_behaviour.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/failing_examples/timeout_behaviour.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "Something really slow" do
+  it "should be failed by RSpec when it takes longer than --timeout" do
+    sleep(2)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/init.rb
--- mephisto-0.7.3/vendor/plugins/rspec/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+# Placeholder to satisfy Rails.
+#
+# Do NOT add any require statements to this file. Doing
+# so will cause Rails to load this plugin all of the time.
+#
+# Running 'ruby script/generate rspec' will
+# generate spec/spec_helper.rb, which includes the necessary
+# require statements and configuration. This file should
+# be required by all of your spec files.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/autotest/discover.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/autotest/discover.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/autotest/discover.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/autotest/discover.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+Autotest.add_discovery do
+  "rspec" if File.exist?('spec')
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/autotest/rspec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/autotest/rspec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/autotest/rspec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/autotest/rspec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,94 @@
+require 'autotest'
+
+class RspecCommandError < StandardError; end
+
+class Autotest::Rspec < Autotest
+  
+  def initialize(kernel=Kernel, separator=File::SEPARATOR, alt_separator=File::ALT_SEPARATOR) # :nodoc:
+    super()
+    @kernel, @separator, @alt_separator = kernel, separator, alt_separator
+    @spec_command = spec_command
+
+    # watch out: Ruby bug (1.8.6):
+    # %r(/) != /\//
+    # since Ruby compares the REGEXP source, not the resulting pattern
+    @test_mappings = {
+      %r%^spec/.*\.rb$% => kernel.proc { |filename, _| 
+        filename 
+      },
+      %r%^lib/(.*)\.rb$% => kernel.proc { |_, m| 
+        ["spec/#{m[1]}_spec.rb"] 
+      },
+      %r%^spec/(spec_helper|shared/.*)\.rb$% => kernel.proc { 
+        files_matching %r%^spec/.*_spec\.rb$% 
+      }
+    }
+  end
+  
+  def tests_for_file(filename)
+    super.select { |f| @files.has_key? f }
+  end
+  
+  alias :specs_for_file :tests_for_file
+  
+  def failed_results(results)
+    results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
+  end
+
+  def handle_results(results)
+    @files_to_test = consolidate_failures failed_results(results)
+    unless @files_to_test.empty? then
+      hook :red
+    else
+      hook :green
+    end unless $TESTING
+    @tainted = true unless @files_to_test.empty?
+  end
+
+  def consolidate_failures(failed)
+    filters = Hash.new { |h,k| h[k] = [] }
+    failed.each do |spec, failed_trace|
+      @files.keys.select{|f| f =~ /spec\//}.each do |f|
+        if failed_trace =~ Regexp.new(f)
+          filters[f] << spec
+          break
+        end
+      end
+    end
+    return filters
+  end
+
+  def make_test_cmd(files_to_test)
+    return "#{ruby} -S #{@spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
+  end
+  
+  def add_options_if_present
+    File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
+  end
+
+  # Finds the proper spec command to use.  Precendence
+  # is set in the lazily-evaluated method spec_commands.  Alias + Override
+  # that in ~/.autotest to provide a different spec command
+  # then the default paths provided.
+  def spec_command
+    spec_commands.each do |command|
+      if File.exists?(command)
+        return @alt_separator ? (command.gsub @separator, @alt_separator) : command
+      end
+    end
+    raise RspecCommandError, "No spec command could be found!"
+  end
+  
+  # Autotest will look for spec commands in the following
+  # locations, in this order:
+  #
+  #   * bin/spec
+  #   * default spec bin/loader installed in Rubygems
+  def spec_commands
+    [
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')),
+      File.join(Config::CONFIG['bindir'], 'spec')
+    ]
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/configuration.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/configuration.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/configuration.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/configuration.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,132 @@
+module Spec
+  module Example
+    class Configuration
+      # Chooses what mock framework to use. Example:
+      #
+      #   Spec::Runner.configure do |config|
+      #     config.mock_with :rspec, :mocha, :flexmock, or :rr
+      #   end
+      #
+      # To use any other mock framework, you'll have to provide
+      # your own adapter. This is simply a module that responds to
+      # setup_mocks_for_rspec, verify_mocks_for_rspec and teardown_mocks_for_rspec.
+      # These are your hooks into the lifecycle of a given example. RSpec will
+      # call setup_mocks_for_rspec before running anything else in each Example.
+      # After executing the #after methods, RSpec will then call verify_mocks_for_rspec
+      # and teardown_mocks_for_rspec (this is guaranteed to run even if there are
+      # failures in verify_mocks_for_rspec).
+      #
+      # Once you've defined this module, you can pass that to mock_with:
+      #
+      #   Spec::Runner.configure do |config|
+      #     config.mock_with MyMockFrameworkAdapter
+      #   end
+      #
+      def mock_with(mock_framework)
+        @mock_framework = case mock_framework
+        when Symbol
+          mock_framework_path(mock_framework.to_s)
+        else
+          mock_framework
+        end
+      end
+      
+      def mock_framework # :nodoc:
+        @mock_framework ||= mock_framework_path("rspec")
+      end
+      
+      # Declares modules to be included in all behaviours (<tt>describe</tt> blocks).
+      #
+      #   config.include(My::Bottle, My::Cup)
+      #
+      # If you want to restrict the inclusion to a subset of all the behaviours then
+      # specify this in a Hash as the last argument:
+      #
+      #   config.include(My::Pony, My::Horse, :behaviour_type => :farm)
+      #
+      # Only behaviours that have that type will get the modules included:
+      #
+      #   describe "Downtown", :behaviour_type => :city do
+      #     # Will *not* get My::Pony and My::Horse included
+      #   end
+      #
+      #   describe "Old Mac Donald", :behaviour_type => :farm do
+      #     # *Will* get My::Pony and My::Horse included
+      #   end
+      #
+      def include(*args)
+        args << {} unless Hash === args.last
+        modules, options = args_and_options(*args)
+        required_behaviour_type = options[:behaviour_type]
+        required_behaviour_type = required_behaviour_type.to_sym if required_behaviour_type
+        modules.each do |mod|
+          ExampleGroupFactory.get!(required_behaviour_type).send(:include, mod)
+        end
+      end
+
+      # Defines global predicate matchers. Example:
+      #
+      #   config.predicate_matchers[:swim] = :can_swim?
+      #
+      # This makes it possible to say:
+      #
+      #   person.should swim # passes if person.should_swim? returns true
+      #
+      def predicate_matchers
+        @predicate_matchers ||= {}
+      end
+      
+      # Prepends a global <tt>before</tt> block to all behaviours.
+      # See #append_before for filtering semantics.
+      def prepend_before(*args, &proc)
+        scope, options = scope_and_options(*args)
+        behaviour_type = ExampleGroupFactory.get!(options[:behaviour_type])
+        behaviour_type.prepend_before(scope, &proc)
+      end
+      # Appends a global <tt>before</tt> block to all behaviours.
+      #
+      # If you want to restrict the block to a subset of all the behaviours then
+      # specify this in a Hash as the last argument:
+      #
+      #   config.prepend_before(:all, :behaviour_type => :farm)
+      #
+      # or
+      #
+      #   config.prepend_before(:behaviour_type => :farm)
+      #
+      def append_before(*args, &proc)
+        scope, options = scope_and_options(*args)
+        behaviour_type = ExampleGroupFactory.get!(options[:behaviour_type])
+        behaviour_type.append_before(scope, &proc)
+      end
+      alias_method :before, :append_before
+
+      # Prepends a global <tt>after</tt> block to all behaviours.
+      # See #append_before for filtering semantics.
+      def prepend_after(*args, &proc)
+        scope, options = scope_and_options(*args)
+        behaviour_type = ExampleGroupFactory.get!(options[:behaviour_type])
+        behaviour_type.prepend_after(scope, &proc)
+      end
+      alias_method :after, :prepend_after
+      # Appends a global <tt>after</tt> block to all behaviours.
+      # See #append_before for filtering semantics.
+      def append_after(*args, &proc)
+        scope, options = scope_and_options(*args)
+        behaviour_type = ExampleGroupFactory.get!(options[:behaviour_type])
+        behaviour_type.append_after(scope, &proc)
+      end
+
+    private
+
+      def scope_and_options(*args)
+        args, options = args_and_options(*args)
+        scope = (args[0] || :each), options
+      end
+    
+      def mock_framework_path(framework_name)
+        File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "plugins", "mock_frameworks", framework_name))
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/errors.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/errors.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/errors.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/errors.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+module Spec
+  module Example
+    class ExamplePendingError < StandardError
+    end
+
+    class PendingExampleFixedError < StandardError
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,25 @@
+module Spec
+  module Example
+    class Example
+      PENDING_EXAMPLE_BLOCK = lambda {
+        raise Spec::Example::ExamplePendingError.new("Not Yet Implemented")
+      }
+      attr_accessor :description
+      attr_reader :from
+      
+      def initialize(description, &implementation)
+        @from = caller(0)[3]
+        @implementation = implementation || PENDING_EXAMPLE_BLOCK
+        @description = description
+      end
+      
+      def run_in(context)
+        context.instance_eval(&@implementation)
+      end
+      
+      def to_s
+        description
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+module Spec
+  module Example
+    # The superclass for all regular RSpec examples.
+    # See also Test::Unit::TestCase::ExampleGroup
+    class ExampleGroup
+      extend Spec::Example::ExampleGroupMethods
+      include Spec::Example::ExampleMethods
+
+      def initialize(example) #:nodoc:
+        @_example = example
+      end
+    end
+  end
+end
+
+Spec::ExampleGroup = Spec::Example::ExampleGroup
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group_description.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group_description.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group_description.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group_description.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,88 @@
+module Spec
+  module Example
+    class ExampleGroupDescription
+      module ClassMethods
+        def generate_description(*args)
+          description = args.shift.to_s
+          until args.empty?
+            suffix = args.shift.to_s
+            description << " " unless suffix =~ /^\s|\.|#/
+            description << suffix
+          end
+          description
+        end
+      end
+      extend ClassMethods
+
+      attr_reader :description, :described_type, :options
+      
+      def initialize(*args)
+        args, @options = args_and_options(*args)
+        init_example_group_type
+        init_spec_path
+        init_described_type(args)
+        init_description(*args)
+      end
+  
+      def [](key)
+        @options[key]
+      end
+      
+      def []=(key, value)
+        @options[key] = value
+      end
+      
+      def to_s; @description; end
+      
+      def ==(value)
+        case value
+        when ExampleGroupDescription
+          @description == value.description
+        else
+          @description == value
+        end
+      end
+      
+    private
+      def init_example_group_type
+        # NOTE - BE CAREFUL IF CHANGING THIS NEXT LINE:
+        #   this line is as it is to satisfy JRuby - the original version
+        #   read, simply: "if options[:example_group]", which passed against ruby, but failed against jruby
+        if options[:example_group] && options[:example_group].ancestors.include?(ExampleGroup)
+          proposed_type = parse_type(options[:example_group])
+          if ExampleGroupFactory.get(proposed_type)
+            options[:behaviour_type] ||= proposed_type
+          end
+        end
+      end
+      
+      def init_spec_path
+        if options.has_key?(:spec_path)
+          options[:spec_path] = File.expand_path(options[:spec_path])
+        end
+      end
+      
+      def init_description(*args)
+        @description = self.class.generate_description(*args)
+      end
+      
+      def init_described_type(args)
+        @described_type = args.find{|arg| Module === arg}
+      end
+    
+      def parse_type(example_group)
+        class_name = get_class_name(example_group)
+        parsed_class_name = class_name.split("::").reverse[0].gsub('ExampleGroup', '')
+        return nil if parsed_class_name.empty?
+        parsed_class_name.downcase.to_sym
+      end
+
+      def get_class_name(example_group)
+        unless example_group.name.empty?
+          return example_group.name
+        end
+        get_class_name(example_group.superclass)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group_factory.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group_factory.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group_factory.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group_factory.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,104 @@
+module Spec
+  module Example
+    class ExampleGroupFactory
+      class << self
+        def reset
+          @example_group_types = {
+            :default => Spec::Example::ExampleGroup,
+            :shared => Spec::Example::SharedExampleGroup
+          }
+        end
+
+        # Registers an example group class +klass+ with the symbol
+        # +type+. For example:
+        #
+        #   Spec::Example::ExampleGroupFactory.register(:farm, Spec::Farm::Example::FarmExampleGroup)
+        #
+        # This will cause Main#describe from a file living in 
+        # <tt>spec/farm</tt> to create example group instances of type
+        # Spec::Farm::Example::FarmExampleGroup.
+        def register(id, behaviour)
+          @example_group_types[id] = behaviour
+        end
+
+        def get(id=:default)
+          id ||= :default
+          if @example_group_types.values.include?(id)
+            return id
+          else
+            return @example_group_types[id]
+          end
+        end
+        
+        def get!(id=:default)
+          example_group_class = get(id)
+          unless example_group_class
+            raise "ExampleGroup #{id.inspect} is not registered. Use ::Spec::Example::ExampleGroupFactory.register"
+          end
+          return example_group_class
+        end  
+
+        # Dynamically creates a class 
+        def create_example_group(*args, &block)
+          opts = Hash === args.last ? args.last : {}
+          if opts[:shared]
+            return create_shared_example_group(*args, &block)
+          else
+            superclass = determine_superclass(opts)
+            create_example_group_class(superclass, *args, &block)
+          end
+        end
+
+        protected
+
+        def determine_superclass(opts)
+          # new: replaces behaviour_type
+          if opts[:type]
+            id = opts[:type]
+
+          #backwards compatibility
+          elsif opts[:behaviour_type]
+            id = opts[:behaviour_type]
+
+          elsif opts[:spec_path] =~ /spec(\\|\/)(#{@example_group_types.keys.join('|')})/
+            id = $2.to_sym
+          else
+            id = :default
+          end
+          get(id)
+        end
+
+        def create_example_group_class(superclass, *args, &block)
+          create_uniquely_named_class(superclass) do
+            describe(*args)
+            register
+            module_eval(&block)
+          end
+        end
+        
+        def create_uniquely_named_class(superclass, &block)
+          example_group_class = Class.new(superclass)
+          class_name = "Subclass_#{class_count}"
+          superclass.instance_eval do
+            const_set(class_name, example_group_class)
+          end
+          example_group_class.instance_eval(&block)
+          example_group_class
+        end
+        
+        def create_shared_example_group(*args, &block)
+          shared_example_group = @example_group_types[:shared].new(*args, &block)
+          shared_example_group.register
+          shared_example_group
+        end
+
+        def class_count
+          @class_count ||= 0
+          @class_count += 1
+          @class_count
+        end
+      end
+      self.reset
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_group_methods.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,346 @@
+module Spec
+  module Example
+
+    # See http://rspec.rubyforge.org/documentation/before_and_after.html
+    module ExampleGroupMethods
+      attr_accessor :description
+
+      def inherited(klass)
+        super
+        unless klass.name.to_s == ""
+          klass.describe(klass.name)
+          klass.register
+        end
+      end
+
+      # Makes the describe/it syntax available from a class. For example:
+      #
+      #   class StackSpec < Spec::ExampleGroup
+      #     describe Stack, "with no elements"
+      #
+      #     before
+      #       @stack = Stack.new
+      #     end
+      #
+      #     it "should raise on pop" do
+      #       lambda{ @stack.pop }.should raise_error
+      #     end
+      #   end
+      #
+      def describe(*args, &example_group_block)
+        if example_group_block
+          Class.new(self) do
+            describe(*args)
+            register
+            module_eval(&example_group_block)
+          end
+        else
+          set_description(*args)
+          before_eval
+          self
+        end
+      end
+
+      # Use this to pull in examples from shared behaviours.
+      # See Spec::Runner for information about shared behaviours.
+      def it_should_behave_like(shared_example_group)
+        case shared_example_group
+        when SharedExampleGroup
+          include shared_example_group
+        else
+          example_group = SharedExampleGroup.find_shared_example_group(shared_example_group)
+          unless example_group
+            raise RuntimeError.new("Shared Example Group '#{shared_example_group}' can not be found")
+          end
+          include(example_group)
+        end
+      end
+
+      # :call-seq:
+      #   predicate_matchers[matcher_name] = method_on_object
+      #   predicate_matchers[matcher_name] = [method1_on_object, method2_on_object]
+      #
+      # Dynamically generates a custom matcher that will match
+      # a predicate on your class. RSpec provides a couple of these
+      # out of the box:
+      #
+      #   exist (or state expectations)
+      #     File.should exist("path/to/file")
+      #
+      #   an_instance_of (for mock argument constraints)
+      #     mock.should_receive(:message).with(an_instance_of(String))
+      #
+      # == Examples
+      #
+      #   class Fish
+      #     def can_swim?
+      #       true
+      #     end
+      #   end
+      #
+      #   describe Fish do
+      #     predicate_matchers[:swim] = :can_swim?
+      #     it "should swim" do
+      #       Fish.new.should swim
+      #     end
+      #   end
+      def predicate_matchers
+        @predicate_matchers ||= {:exist => :exist?, :an_instance_of => :is_a?}
+      end
+
+      # Creates an instance of Spec::Example::Example and adds
+      # it to a collection of examples of the current behaviour.
+      def it(description=:__generate_docstring, &block)
+        example = create_example(description, &block)
+        example_objects << example
+        example
+      end
+      
+      alias_method :specify, :it
+      
+      # Use this to temporarily disable an example.
+      def xit(description=:__generate_docstring, opts={}, &block)
+        Kernel.warn("Example disabled: #{description}")
+      end
+
+      def add_example(example)
+        example_objects << example
+      end
+
+      def described_type #:nodoc:
+        description.described_type
+      end
+
+      def examples #:nodoc:
+        examples = example_objects.dup
+        instance_methods.sort.each do |method_name|
+          if (is_test?(method_name) || is_spec?(method_name)) && (
+            instance_method(method_name).arity == 0 ||
+            instance_method(method_name).arity == -1
+          )
+            examples << create_example(method_name) do
+              __send__(method_name)
+            end
+          end
+        end
+        rspec_options.reverse ? examples.reverse : examples
+      end
+      
+      def number_of_examples #:nodoc:
+        examples.length
+      end
+
+      # Registers a block to be executed before each example.
+      # This method prepends +block+ to existing before blocks.
+      def prepend_before(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = before_parts_from_scope(scope)
+        parts.unshift(block)
+      end
+
+      # Registers a block to be executed before each example.
+      # This method appends +block+ to existing before blocks.
+      def append_before(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = before_parts_from_scope(scope)
+        parts << block
+      end
+      alias_method :before, :append_before
+
+      # Registers a block to be executed after each example.
+      # This method prepends +block+ to existing after blocks.
+      def prepend_after(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = after_parts_from_scope(scope)
+        parts.unshift(block)
+      end
+      alias_method :after, :prepend_after
+
+      # Registers a block to be executed after each example.
+      # This method appends +block+ to existing after blocks.
+      def append_after(*args, &block)
+        scope, options = scope_and_options(*args)
+        parts = after_parts_from_scope(scope)
+        parts << block
+      end
+
+      def remove_after(scope, &block)
+        after_each_parts.delete(block)
+      end
+
+      # Deprecated. Use before(:each)
+      def setup(&block)
+        before(:each, &block)
+      end
+
+      # Deprecated. Use after(:each)
+      def teardown(&block)
+        after(:each, &block)
+      end
+
+      def before_all_parts # :nodoc:
+        @before_all_parts ||= []
+      end
+
+      def after_all_parts # :nodoc:
+        @after_all_parts ||= []
+      end
+
+      def before_each_parts # :nodoc:
+        @before_each_parts ||= []
+      end
+
+      def after_each_parts # :nodoc:
+        @after_each_parts ||= []
+      end
+
+      # Only used from RSpec's own examples
+      def reset # :nodoc:
+        @before_all_parts = nil
+        @after_all_parts = nil
+        @before_each_parts = nil
+        @after_each_parts = nil
+      end
+      
+      def suite
+        description = description ? description.description : "RSpec Description Suite"
+        customize_example
+        suite = ExampleSuite.new(description, self)
+        add_examples(suite)
+        suite
+      end
+      
+      def register
+        rspec_options.add_example_group self
+      end
+
+      def unregister
+        rspec_options.remove_example_group self
+      end
+
+      def run_before_each(example)
+        execute_in_class_hierarchy(false) do |behaviour|
+          example.eval_each_fail_fast(behaviour.before_each_parts)
+        end
+      end
+      
+      def run_before_all(example)
+        execute_in_class_hierarchy(false) do |behaviour|
+          example.eval_each_fail_fast(behaviour.before_all_parts)
+        end
+      end
+
+      def run_after_all(example)
+        execute_in_class_hierarchy(true) do |behaviour|
+          example.eval_each_fail_slow(behaviour.after_all_parts)
+        end
+      end
+      
+      def run_after_each(example)
+        execute_in_class_hierarchy(true) do |behaviour|
+          example.eval_each_fail_slow(behaviour.after_each_parts)
+        end
+      end
+
+    private
+      def create_example(description, &implementation) #:nodoc:
+        Example.new(description, &implementation)
+      end
+      
+      def example_objects
+        @example_objects ||= []
+      end
+
+      def customize_example
+        plugin_mock_framework
+        define_predicate_matchers predicate_matchers
+        define_predicate_matchers(Spec::Runner.configuration.predicate_matchers)
+      end
+
+      def execute_in_class_hierarchy(superclass_first)
+        classes = []
+        current_class = self
+        while is_example_group?(current_class)
+          superclass_first ? classes << current_class : classes.unshift(current_class)
+          current_class = current_class.superclass
+        end
+        superclass_first ? classes << ExampleMethods : classes.unshift(ExampleMethods)
+
+        classes.each do |behaviour|
+          yield behaviour
+        end
+      end
+      
+      def is_example_group?(klass)
+        klass.kind_of?(ExampleGroupMethods)
+      end
+      
+      def add_examples(suite)
+        examples.each do |example|
+          suite << new(example)
+        end
+      end
+
+      def is_test?(method_name)
+        method_name =~ /^test_./
+      end
+      
+      def is_spec?(method_name)
+        !(method_name =~ /^should(_not)?$/) && method_name =~ /^should/
+      end
+
+      def plugin_mock_framework
+        case mock_framework = Spec::Runner.configuration.mock_framework
+        when Module
+          include mock_framework
+        else
+          require Spec::Runner.configuration.mock_framework
+          include Spec::Plugins::MockFramework
+        end
+      end
+
+      def define_predicate_matchers(definitions) # :nodoc:
+        definitions.each_pair do |matcher_method, method_on_object|
+          define_method matcher_method do |*args|
+            eval("be_#{method_on_object.to_s.gsub('?','')}(*args)")
+          end
+        end
+      end
+
+      def scope_and_options(*args)
+        args, options = args_and_options(*args)
+        scope = (args[0] || :each), options
+      end
+
+      def before_parts_from_scope(scope)
+        case scope
+        when :each; before_each_parts
+        when :all; before_all_parts
+        end
+      end
+
+      def after_parts_from_scope(scope)
+        case scope
+        when :each; after_each_parts
+        when :all; after_all_parts
+        end
+      end
+
+      def before_eval
+      end
+
+      def set_description(*args)
+        unless self.class == ExampleGroup
+          args << {} unless Hash === args.last
+          args.last[:example_group] = self
+        end
+        self.description = ExampleGroupDescription.new(*args)
+        if described_type.class == Module
+          include described_type
+        end
+        self.description
+      end
+    end
+    
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_matcher.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_matcher.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_matcher.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_matcher.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+module Spec
+  module Example
+    class ExampleMatcher
+      def initialize(example_group_name, example_name)
+        @example_group_name = example_group_name
+        @example_name = example_name
+      end
+      
+      def matches?(specified_examples)
+        specified_examples.each do |specified_example|
+          return true if matches_literal_example?(specified_example) || matches_example_not_considering_modules?(specified_example)
+        end
+        false
+      end
+      
+      protected
+      def matches_literal_example?(specified_example)
+        specified_example =~ /(^#{behaviour_regexp} #{example_regexp}$|^#{behaviour_regexp}$|^#{behaviour_with_before_all_regexp}$|^#{example_regexp}$)/
+      end
+
+      def matches_example_not_considering_modules?(specified_example)
+        specified_example =~ /(^#{behaviour_regexp_not_considering_modules} #{example_regexp}$|^#{behaviour_regexp_not_considering_modules}$|^#{example_regexp}$)/
+      end
+
+      def behaviour_regexp
+        Regexp.escape(@example_group_name)
+      end
+
+      def behaviour_with_before_all_regexp
+        Regexp.escape("#{@example_group_name} before(:all)")
+      end
+
+      def behaviour_regexp_not_considering_modules
+        Regexp.escape(@example_group_name.split('::').last)
+      end
+
+      def example_regexp
+        Regexp.escape(@example_name)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_methods.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_methods.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_methods.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_methods.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,72 @@
+module Spec
+  module Example
+    module ExampleMethods
+      extend ExampleGroupMethods
+      extend ModuleReopeningFix
+
+      include ::Spec::Matchers
+      include ::Spec::Example::Pending
+      
+      attr_reader :_example
+      
+      def violated(message="")
+        raise Spec::Expectations::ExpectationNotMetError.new(message)
+      end
+      
+      def run
+        _example.run_in(self)
+      end
+      
+      def description
+        _example.description
+      end
+      
+      def description=(description)
+        _example.description=(description)
+      end
+            
+      def use_generated_description?
+        _example.description == :__generate_docstring
+      end
+
+      def copy_instance_variables_from(obj)
+        super(obj, [:@_example, :@_result])
+      end
+
+      def run_before_all
+        self.class.run_before_all(self)
+      end
+
+      def run_before_each
+        self.class.run_before_each(self)
+      end
+
+      def run_after_each
+        self.class.run_after_each(self)
+      end
+
+      def run_after_all
+        self.class.run_after_all(self)
+      end
+
+      def eval_each_fail_fast(procs) #:nodoc:
+        procs.each do |proc|
+          instance_eval(&proc)
+        end
+      end
+
+      def eval_each_fail_slow(procs) #:nodoc:
+        first_exception = nil
+        procs.each do |proc|
+          begin
+            instance_eval(&proc)
+          rescue Exception => e
+            first_exception ||= e
+          end
+        end
+        raise first_exception if first_exception
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,124 @@
+module Spec
+  module Example
+    class ExampleRunner
+      attr_reader :options, :example_group_instance, :errors
+
+      def initialize(options, example_group_instance)
+        @options = options
+        @example_group_instance = example_group_instance
+        @example = example_group_instance._example
+        @errors = []
+      end
+      
+      def run
+        reporter.example_started(@example)
+        if dry_run
+          example_group_instance.description = "NO NAME (Because of --dry-run)" if example_group_instance.use_generated_description?
+          return reporter.example_finished(@example, nil, example_group_instance.description)
+        end
+
+        location = nil
+        Timeout.timeout(timeout) do
+          before_each_ok = before_example
+          example_ok = run_example if before_each_ok
+          after_each_ok = after_example
+          example_group_instance.description = description
+          location = failure_location(before_each_ok, example_ok, after_each_ok)
+          Spec::Matchers.clear_generated_description
+        end
+
+        reporter.example_finished(
+          @example,
+          errors.first,
+          location
+        )
+        ok?
+      end
+
+      def ok?
+        @errors.empty? || @errors.all? {|error| error.is_a?(Spec::Example::ExamplePendingError)}
+      end
+
+      def failed?
+        !ok?
+      end
+
+      protected
+      def before_example
+        setup_mocks
+        example_group_instance.run_before_each
+        return ok?
+      rescue Exception => e
+        errors << e
+        return false
+      end
+
+      def run_example
+        example_group_instance.run
+        return true
+      rescue Exception => e
+        errors << e
+        return false
+      end
+
+      def after_example
+        example_group_instance.run_after_each
+
+        begin
+          verify_mocks
+        ensure
+          teardown_mocks
+        end
+
+        return ok?
+      rescue Exception => e
+        errors << e
+        return false
+      end
+
+      def failure_location(before_each_ok, example_ok, after_each_ok)
+        return 'before(:each)' unless before_each_ok
+        return description unless example_ok
+        return 'after(:each)' unless after_each_ok
+        return nil
+      end
+
+      def reporter
+        @options.reporter
+      end
+
+      def timeout
+        @options.timeout
+      end
+      
+      def dry_run
+        @options.dry_run
+      end
+
+      def description
+        return @example.description unless example_group_instance.use_generated_description?
+        return Spec::Matchers.generated_description if Spec::Matchers.generated_description
+        return "NO NAME (Because of Error raised in matcher)" if failed?
+        "NO NAME (Because there were no expectations)"
+      end
+
+      def setup_mocks
+        if example_group_instance.respond_to?(:setup_mocks_for_rspec)
+          example_group_instance.setup_mocks_for_rspec
+        end
+      end
+
+      def verify_mocks
+        if example_group_instance.respond_to?(:verify_mocks_for_rspec)
+          example_group_instance.verify_mocks_for_rspec
+        end
+      end
+
+      def teardown_mocks
+        if example_group_instance.respond_to?(:teardown_mocks_for_rspec)
+          example_group_instance.teardown_mocks_for_rspec
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_suite.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_suite.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/example_suite.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/example_suite.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,121 @@
+module Spec
+  module Example
+    class ExampleSuite
+      extend Forwardable
+      attr_reader :examples, :example_group, :name
+      alias :tests :examples
+      
+      private :example_group
+
+      def initialize(name, example_group)
+        @name = name
+        @example_group = example_group
+        @examples = []
+      end
+
+      def run
+        retain_specified_examples
+        return true if examples.empty?
+
+        reporter.add_example_group(description)
+        success = run_before_all
+        if success
+          example = nil
+          examples.each do |example|
+            example.copy_instance_variables_from(@before_and_after_all_example)
+
+            runner = ExampleRunner.new(rspec_options, example)
+            unless runner.run
+              success = false
+            end
+          end
+          @before_and_after_all_example.copy_instance_variables_from(example)
+        end
+
+        unless run_after_all
+          success = false
+        end
+        return success
+      end
+
+      def <<(example)
+        examples << example
+      end
+
+      def size
+        examples.length
+      end
+
+      def empty?
+        size == 0
+      end
+
+      def delete(example)
+        @examples.delete example
+      end
+
+      protected
+      def retain_specified_examples
+        return unless specified_examples
+        return if specified_examples.empty?
+        return if specified_examples.index(description.to_s)
+        examples.reject! do |example|
+          matcher = ExampleMatcher.new(description.to_s, example.description)
+          !matcher.matches?(specified_examples)
+        end
+      end
+
+      def run_before_all
+        errors = []
+        unless dry_run
+          begin
+            @before_and_after_all_example = example_group.new(nil)
+            @before_and_after_all_example.run_before_all
+          rescue Exception => e
+            errors << e
+            location = "before(:all)"
+            # The easiest is to report this as an example failure. We don't have an Example
+            # at this point, so we'll just create a placeholder.
+            reporter.example_finished(create_example(location), e, location)
+            return false
+          end
+        end
+        return true
+      end
+
+      def run_after_all
+        unless dry_run
+          begin
+            @before_and_after_all_example ||= example_group.new(nil)
+            @before_and_after_all_example.run_after_all
+          rescue Exception => e
+            location = "after(:all)"
+            reporter.example_finished(create_example(location), e, location)
+            return false
+          end
+        end
+        return true
+      end
+
+      def create_example(location)
+        Example.new location
+      end
+
+      def description
+        example_group.description
+      end
+
+      def specified_examples
+        rspec_options.examples
+      end
+
+      def reporter
+        rspec_options.reporter
+      end
+
+      def dry_run
+        rspec_options.dry_run
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/module_reopening_fix.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/module_reopening_fix.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/module_reopening_fix.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/module_reopening_fix.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+module Spec
+  module Example
+    module ModuleReopeningFix
+      def child_modules
+        @child_modules ||= []
+      end
+
+      def included(mod)
+        child_modules << mod
+      end
+
+      def include(mod)
+        super
+        child_modules.each do |child_module|
+          child_module.__send__(:include, mod)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/pending.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/pending.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/pending.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/pending.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+module Spec
+  module Example      
+    module Pending
+      def pending(message = "TODO")
+        if block_given?
+          begin
+            yield
+          rescue Exception => e
+            raise Spec::Example::ExamplePendingError.new(message)
+          end
+          raise Spec::Example::PendingExampleFixedError.new("Expected pending '#{message}' to fail. No Error was raised.")
+        else
+          raise Spec::Example::ExamplePendingError.new(message)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/shared_example_group.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/shared_example_group.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example/shared_example_group.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example/shared_example_group.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,59 @@
+module Spec
+  module Example
+    class SharedExampleGroup < Module
+      class << self
+        def add_shared_example_group(new_example_group)
+          guard_against_redefining_existing_example_group(new_example_group)
+          shared_example_groups << new_example_group
+        end
+
+        def find_shared_example_group(example_group_description)
+          shared_example_groups.find do |b|
+            b.description == example_group_description
+          end
+        end
+
+        def shared_example_groups
+          # TODO - this needs to be global, or at least accessible from
+          # from subclasses of Example in a centralized place. I'm not loving
+          # this as a solution, but it works for now.
+          $shared_example_groups ||= []
+        end
+
+        private
+        def guard_against_redefining_existing_example_group(new_example_group)
+          existing_example_group = find_shared_example_group(new_example_group.description)
+          return unless existing_example_group
+          return if new_example_group.equal?(existing_example_group)
+          return if spec_path(new_example_group) == spec_path(existing_example_group)
+          raise ArgumentError.new("Shared Example '#{existing_example_group.description}' already exists")
+        end
+
+        def spec_path(example_group)
+          File.expand_path(example_group.description[:spec_path])
+        end
+      end
+      include ExampleGroupMethods
+      public :include
+
+      def initialize(*args, &example_group_block)
+        describe(*args)
+        module_eval(&example_group_block)
+      end
+
+      def included(mod) # :nodoc:
+        before_each_parts.each   { |p| mod.before_each_parts << p }
+        after_each_parts.each    { |p| mod.after_each_parts << p }
+        before_all_parts.each    { |p| mod.before_all_parts << p }
+        after_all_parts.each     { |p| mod.after_all_parts << p }
+        example_objects.each do |example|
+          mod.add_example example
+        end
+      end
+
+      def register
+        Spec::Example::SharedExampleGroup.add_shared_example_group(self)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+require 'timeout'
+require 'forwardable'
+require 'spec/example/pending'
+require 'spec/example/module_reopening_fix'
+require 'spec/example/example_group_methods'
+require 'spec/example/example_methods'
+require 'spec/example/example_group'
+require 'spec/example/example_group_description'
+require 'spec/example/shared_example_group'
+require 'spec/example/example_group_factory'
+require 'spec/example/errors'
+require 'spec/example/configuration'
+require 'spec/example/example_suite'
+require 'spec/example/example'
+require 'spec/example/example_runner'
+require 'spec/example/example_matcher'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/differs/default.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/differs/default.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/differs/default.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/differs/default.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,66 @@
+begin
+  require 'rubygems'
+  require 'diff/lcs' #necessary due to loading bug on some machines - not sure why - DaC
+  require 'diff/lcs/hunk'
+rescue LoadError ; raise "You must gem install diff-lcs to use diffing" ; end
+
+require 'pp'
+
+module Spec
+  module Expectations
+    module Differs
+
+      # TODO add some rdoc
+      class Default
+        def initialize(options)
+          @options = options
+        end
+
+        # This is snagged from diff/lcs/ldiff.rb (which is a commandline tool)
+        def diff_as_string(data_old, data_new)
+          data_old = data_old.split(/\n/).map! { |e| e.chomp }
+          data_new = data_new.split(/\n/).map! { |e| e.chomp }
+          output = ""
+          diffs = Diff::LCS.diff(data_old, data_new)
+          return output if diffs.empty?
+          oldhunk = hunk = nil  
+          file_length_difference = 0
+          diffs.each do |piece|
+            begin
+              hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, context_lines,
+                                         file_length_difference)
+              file_length_difference = hunk.file_length_difference      
+              next unless oldhunk      
+              # Hunks may overlap, which is why we need to be careful when our
+              # diff includes lines of context. Otherwise, we might print
+              # redundant lines.
+              if (context_lines > 0) and hunk.overlaps?(oldhunk)
+                hunk.unshift(oldhunk)
+              else
+                output << oldhunk.diff(format)
+              end
+            ensure
+              oldhunk = hunk
+              output << "\n"
+            end
+          end  
+          #Handle the last remaining hunk
+          output << oldhunk.diff(format) << "\n"
+        end  
+
+        def diff_as_object(target,expected)
+          diff_as_string(PP.pp(target,""), PP.pp(expected,""))
+        end
+
+        protected
+        def format
+          @options.diff_format
+        end
+
+        def context_lines
+          @options.context_lines
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/errors.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/errors.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/errors.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/errors.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+module Spec
+  module Expectations
+    class ExpectationNotMetError < StandardError
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,71 @@
+module Spec
+  module Expectations
+    # rspec adds #should and #should_not to every Object (and,
+    # implicitly, every Class).
+    module ObjectExpectations
+      # :call-seq:
+      #   should(matcher)
+      #   should == expected
+      #   should === expected
+      #   should =~ expected
+      #
+      #   receiver.should(matcher)
+      #     => Passes if matcher.matches?(receiver)
+      #
+      #   receiver.should == expected #any value
+      #     => Passes if (receiver == expected)
+      #
+      #   receiver.should === expected #any value
+      #     => Passes if (receiver === expected)
+      #
+      #   receiver.should =~ regexp
+      #     => Passes if (receiver =~ regexp)
+      #
+      # See Spec::Matchers for more information about matchers
+      #
+      # == Warning
+      #
+      # NOTE that this does NOT support receiver.should != expected.
+      # Instead, use receiver.should_not == expected
+      def should(matcher = :default_parameter, &block)
+        if :default_parameter == matcher
+          Spec::Matchers::PositiveOperatorMatcher.new(self)
+        else
+          ExpectationMatcherHandler.handle_matcher(self, matcher, &block)
+        end
+      end
+
+      # :call-seq:
+      #   should_not(matcher)
+      #   should_not == expected
+      #   should_not === expected
+      #   should_not =~ expected
+      #
+      #   receiver.should_not(matcher)
+      #     => Passes unless matcher.matches?(receiver)
+      #
+      #   receiver.should_not == expected
+      #     => Passes unless (receiver == expected)
+      #
+      #   receiver.should_not === expected
+      #     => Passes unless (receiver === expected)
+      #
+      #   receiver.should_not =~ regexp
+      #     => Passes unless (receiver =~ regexp)
+      #
+      # See Spec::Matchers for more information about matchers
+      def should_not(matcher = :default_parameter, &block)
+        if :default_parameter == matcher
+          Spec::Matchers::NegativeOperatorMatcher.new(self)
+        else
+          NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block)
+        end
+      end
+
+    end
+  end
+end
+
+class Object
+  include Spec::Expectations::ObjectExpectations
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/extensions/string_and_symbol.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/extensions/string_and_symbol.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/extensions/string_and_symbol.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/extensions/string_and_symbol.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,17 @@
+module Spec
+  module Expectations
+    module StringHelpers
+      def starts_with?(prefix)
+        to_s[0..(prefix.to_s.length - 1)] == prefix.to_s
+      end
+    end
+  end
+end
+
+class String
+  include Spec::Expectations::StringHelpers
+end
+
+class Symbol
+  include Spec::Expectations::StringHelpers
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/extensions.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/extensions.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/extensions.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/extensions.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+require 'spec/expectations/extensions/object'
+require 'spec/expectations/extensions/string_and_symbol'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/handler.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/handler.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations/handler.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations/handler.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+module Spec
+  module Expectations
+    class InvalidMatcherError < ArgumentError; end        
+    
+    module MatcherHandlerHelper
+      def describe_matcher(matcher)
+        matcher.respond_to?(:description) ? matcher.description : "[#{matcher.class.name} does not provide a description]"
+      end
+    end
+    
+    class ExpectationMatcherHandler        
+      class << self
+        include MatcherHandlerHelper
+        def handle_matcher(actual, matcher, &block)
+          unless matcher.respond_to?(:matches?)
+            raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}."
+          end
+          
+          match = matcher.matches?(actual, &block)
+          ::Spec::Matchers.generated_description = "should #{describe_matcher(matcher)}"
+          Spec::Expectations.fail_with(matcher.failure_message) unless match
+        end
+      end
+    end
+
+    class NegativeExpectationMatcherHandler
+      class << self
+        include MatcherHandlerHelper
+        def handle_matcher(actual, matcher, &block)
+          unless matcher.respond_to?(:matches?)
+            raise InvalidMatcherError, "Expected a matcher, got #{matcher.inspect}."
+          end
+
+          unless matcher.respond_to?(:negative_failure_message)
+            Spec::Expectations.fail_with(
+<<-EOF
+Matcher does not support should_not.
+See Spec::Matchers for more information
+about matchers.
+EOF
+)
+          end
+          match = matcher.matches?(actual, &block)
+          ::Spec::Matchers.generated_description = "should not #{describe_matcher(matcher)}"
+          Spec::Expectations.fail_with(matcher.negative_failure_message) if match
+        end
+      end
+    end
+
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/expectations.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/expectations.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,56 @@
+require 'spec/matchers'
+require 'spec/expectations/errors'
+require 'spec/expectations/extensions'
+require 'spec/expectations/handler'
+
+module Spec
+  
+  # Spec::Expectations lets you set expectations on your objects.
+  #
+  #   result.should == 37
+  #   team.should have(11).players_on_the_field
+  #
+  # == How Expectations work.
+  #
+  # Spec::Expectations adds two methods to Object:
+  #
+  #   should(matcher=nil)
+  #   should_not(matcher=nil)
+  #
+  # Both methods take an optional Expression Matcher (See Spec::Matchers).
+  #
+  # When +should+ receives an Expression Matcher, it calls <tt>matches?(self)</tt>. If
+  # it returns +true+, the spec passes and execution continues. If it returns
+  # +false+, then the spec fails with the message returned by <tt>matcher.failure_message</tt>.
+  #
+  # Similarly, when +should_not+ receives a matcher, it calls <tt>matches?(self)</tt>. If
+  # it returns +false+, the spec passes and execution continues. If it returns
+  # +true+, then the spec fails with the message returned by <tt>matcher.negative_failure_message</tt>.
+  #
+  # RSpec ships with a standard set of useful matchers, and writing your own
+  # matchers is quite simple. See Spec::Matchers for details.
+  module Expectations
+    class << self
+      attr_accessor :differ
+
+      # raises a Spec::Expectations::ExpectationNotMetError with message
+      #
+      # When a differ has been assigned and fail_with is passed
+      # <code>expected</code> and <code>target</code>, passes them
+      # to the differ to append a diff message to the failure message.
+      def fail_with(message, expected=nil, target=nil) # :nodoc:
+        if Array === message && message.length == 3
+          message, expected, target = message[0], message[1], message[2]
+        end
+        unless (differ.nil? || expected.nil? || target.nil?)
+          if expected.is_a?(String)
+            message << "\nDiff:" << self.differ.diff_as_string(target.to_s, expected)
+          elsif !target.is_a?(Proc)
+            message << "\nDiff:" << self.differ.diff_as_object(target, expected)
+          end
+        end
+        Kernel::raise(Spec::Expectations::ExpectationNotMetError.new(message))
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/main.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/main.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/main.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/main.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,49 @@
+module Spec
+  module Extensions
+    module Main
+      # Creates and returns a class that includes the ExampleGroupMethods
+      # module. The ExampleGroup sub-class depends on the directory of the file
+      # calling this method. For example, Spec::Rails will use different
+      # classes for specs living in <tt>spec/models</tt>,
+      # <tt>spec/helpers</tt>, <tt>spec/views</tt> and
+      # <tt>spec/controllers</tt>.
+      #
+      # It is also possible to override autodiscovery of the behaviour class
+      # with an options Hash as the last argument:
+      #
+      #   describe "name", :behaviour_type => :something_special do ...
+      #
+      # The reason for using different behaviour classes is to have different
+      # matcher methods available from within the <tt>describe</tt> block.
+      #
+      # See Spec::Example::ExampleFactory#register for details about how to
+      # register special implementations.
+      #
+      def describe(*args, &block)
+        raise ArgumentError if args.empty?
+        raise ArgumentError unless block
+        args << {} unless Hash === args.last
+        args.last[:spec_path] = caller(0)[1]
+        Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
+      end
+      alias :context :describe
+
+    private
+    
+      def rspec_options
+        $rspec_options ||= begin; \
+          parser = ::Spec::Runner::OptionParser.new(STDERR, STDOUT); \
+          parser.order!(ARGV); \
+          $rspec_options = parser.options; \
+        end
+        $rspec_options
+      end
+      
+      def init_rspec_options(options)
+        $rspec_options = options if $rspec_options.nil?
+      end
+    end
+  end
+end
+
+include Spec::Extensions::Main
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/object.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/object.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/object.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/object.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+class Object
+  def args_and_options(*args)
+    options = Hash === args.last ? args.pop : {}
+    return args, options
+  end
+
+  def metaclass
+    class << self; self; end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/autorunner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/autorunner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/autorunner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/autorunner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+class Test::Unit::AutoRunner
+  remove_method :process_args
+  def process_args(argv)
+    true
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_group.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_group.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_group.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_group.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,34 @@
+module Test
+  module Unit
+    class TestCase
+      # This subclass of the standard Test::Unit::TestCase makes RSpec
+      # available from within, so that you can do things like:
+      #
+      # class MyTest < Test::Unit::TestCase::ExampleGroup
+      #   it "should work with Test::Unit assertions" do
+      #     assert_equal 4, 2+1
+      #   end
+      #
+      #   def test_should_work_with_rspec_expectations
+      #     (3+1).should == 5
+      #   end
+      # end
+      #
+      # See also Spec::Example::ExampleGroup
+      class ExampleGroup < TestCase
+        remove_method :default_test if respond_to?(:default_test)
+        extend Spec::Example::ExampleGroupMethods
+        include Spec::Example::ExampleMethods
+
+        def initialize(example) #:nodoc:
+          @_example = example
+          @_result = ::Test::Unit::TestResult.new
+        end
+
+        def run(ignored_result=nil)
+          super()
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_suite.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_suite.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_suite.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/example_suite.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+module Spec
+  module Example
+    class ExampleSuite
+      alias_method :rspec_run, :run
+      def run(*args)
+        return true unless args.empty? # Return if we are called from Test::Unit
+        rspec_run
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/rspectestresult.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/rspectestresult.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/rspectestresult.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/rspectestresult.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+class Test::Unit::RspecTestResult < Test::Unit::TestResult
+  def passed?
+    return super & ::Spec.run
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/console/testrunner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/console/testrunner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/console/testrunner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/console/testrunner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,60 @@
+require 'test/unit/ui/console/testrunner'
+
+module Test
+  module Unit
+    module UI
+      module Console
+        class TestRunner
+
+          alias_method :started_without_rspec, :started
+          def started_with_rspec(result)
+            @result = result
+            @need_to_output_started = true
+          end
+          alias_method :started, :started_with_rspec
+
+          alias_method :test_started_without_rspec, :test_started
+          def test_started_with_rspec(name)
+            if @need_to_output_started
+              if @rspec_io
+                @rspec_io.rewind
+                output(@rspec_io.read)
+              end
+              output("Started")
+              @need_to_output_started = false
+            end
+            test_started_without_rspec(name)
+          end
+          alias_method :test_started, :test_started_with_rspec
+
+          alias_method :test_finished_without_rspec, :test_finished
+          def test_finished_with_rspec(name)
+            test_finished_without_rspec(name)
+            @ran_test = true
+          end
+          alias_method :test_finished, :test_finished_with_rspec
+
+          alias_method :finished_without_rspec, :finished
+          def finished_with_rspec(elapsed_time)
+            if @ran_test
+              finished_without_rspec(elapsed_time)
+            end
+          end
+          alias_method :finished, :finished_with_rspec
+          
+          alias_method :setup_mediator_without_rspec, :setup_mediator
+          def setup_mediator_with_rspec
+            orig_io = @io
+            @io = StringIO.new
+            setup_mediator_without_rspec
+          ensure
+            @rspec_io = @io
+            @io = orig_io
+          end
+          alias_method :setup_mediator, :setup_mediator_with_rspec
+          
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/testrunnermediator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/testrunnermediator.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/testrunnermediator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test/unit/ui/testrunnermediator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+class Test::Unit::UI::TestRunnerMediator
+  private
+  remove_method :create_result
+  # A factory method to create the result the mediator
+  # should run with. Can be overridden by subclasses if
+  # one wants to use a different result.
+  def create_result
+    return Test::Unit::RspecTestResult.new
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions/test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions/test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+require "test/unit"
+require "test/unit/testresult"
+require "test/unit/ui/testrunnermediator"
+
+require 'spec/extensions/test/unit/example_group'
+require 'spec/extensions/test/unit/example_suite'
+require 'spec/extensions/test/unit/autorunner'
+require 'spec/extensions/test/unit/rspectestresult'
+require 'spec/extensions/test/unit/ui/testrunnermediator'
+require 'spec/extensions/test/unit/ui/console/testrunner'
+
+Spec::Example::ExampleGroupFactory.register(
+  :default, Test::Unit::TestCase::ExampleGroup
+)
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/extensions.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/extensions.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+require 'spec/extensions/object'
+require 'spec/extensions/main'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/be.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/be.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/be.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/be.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,206 @@
+module Spec
+  module Matchers
+    
+    class Be #:nodoc:
+      def initialize(*args)
+        @expected = parse_expected(args.shift)
+        @args = args
+        @comparison = ""
+      end
+      
+      def matches?(actual)
+        @actual = actual
+        return true if match_or_compare unless handling_predicate?
+        if handling_predicate?
+          begin
+            return @result = actual.__send__(predicate, *@args)
+          rescue => predicate_error
+            # This clause should be empty, but rcov will not report it as covered
+            # unless something (anything) is executed within the clause
+            rcov_error_report = "http://eigenclass.org/hiki.rb?rcov-0.8.0"
+          end
+
+          # This supports should_exist > target.exists? in the old world.
+          # We should consider deprecating that ability as in the new world
+          # you can't write "should exist" unless you have your own custom matcher.
+          begin
+            return @result = actual.__send__(present_tense_predicate, *@args)
+          rescue
+            raise predicate_error
+          end
+        end
+        return false
+      end
+      
+      def failure_message
+        return "expected #{@comparison}#{expected}, got #{@actual.inspect}" unless handling_predicate?
+        return "expected #{predicate}#{args_to_s} to return true, got #{@result.inspect}"
+      end
+      
+      def negative_failure_message
+        return "expected not #{expected}, got #{@actual.inspect}" unless handling_predicate?
+        return "expected #{predicate}#{args_to_s} to return false, got #{@result.inspect}"
+      end
+      
+      def expected
+        return true if @expected == :true
+        return false if @expected == :false
+        return "nil" if @expected == :nil
+        return @expected.inspect
+      end
+      
+      def match_or_compare
+        return @actual == true if @expected == :true
+        return @actual == false if @expected == :false
+        return @actual.nil? if @expected == :nil
+        return @actual < @expected if @less_than
+        return @actual <= @expected if @less_than_or_equal
+        return @actual >= @expected if @greater_than_or_equal
+        return @actual > @expected if @greater_than
+        return @actual == @expected if @double_equal
+        return @actual === @expected if @triple_equal
+        return @actual.equal?(@expected)
+      end
+      
+      def ==(expected)
+        @double_equal = true
+        @comparison = "== "
+        @expected = expected
+        self
+      end
+
+      def ===(expected)
+        @triple_equal = true
+        @comparison = "=== "
+        @expected = expected
+        self
+      end
+
+      def <(expected)
+        @less_than = true
+        @comparison = "< "
+        @expected = expected
+        self
+      end
+
+      def <=(expected)
+        @less_than_or_equal = true
+        @comparison = "<= "
+        @expected = expected
+        self
+      end
+
+      def >=(expected)
+        @greater_than_or_equal = true
+        @comparison = ">= "
+        @expected = expected
+        self
+      end
+
+      def >(expected)
+        @greater_than = true
+        @comparison = "> "
+        @expected = expected
+        self
+      end
+      
+      def description
+        "#{prefix_to_sentence}#{comparison}#{expected_to_sentence}#{args_to_sentence}"
+      end
+
+      private
+        def parse_expected(expected)
+          if Symbol === expected
+            @handling_predicate = true
+            ["be_an_","be_a_","be_"].each do |@prefix|
+              return "#{expected.to_s.sub(@prefix,"")}".to_sym if expected.starts_with?(@prefix)
+            end
+          end
+          @prefix = "be "
+          return expected
+        end
+        
+        def handling_predicate?
+          return false if [:true, :false, :nil].include?(@expected)
+          return @handling_predicate
+        end
+
+        def predicate
+          "#{@expected.to_s}?".to_sym
+        end
+        
+        def present_tense_predicate
+          "#{@expected.to_s}s?".to_sym
+        end
+        
+        def args_to_s
+          return "" if @args.empty?
+          inspected_args = @args.collect{|a| a.inspect}
+          return "(#{inspected_args.join(', ')})"
+        end
+        
+        def comparison
+          @comparison
+        end
+        
+        def expected_to_sentence
+          split_words(@expected)
+        end
+        
+        def prefix_to_sentence
+          split_words(@prefix)
+        end
+
+        def split_words(sym)
+          sym.to_s.gsub(/_/,' ')
+        end
+
+        def args_to_sentence
+          case @args.length
+            when 0
+              ""
+            when 1
+              " #{@args[0]}"
+            else
+              " #{@args[0...-1].join(', ')} and #{@args[-1]}"
+          end
+        end
+        
+    end
+ 
+    # :call-seq:
+    #   should be_true
+    #   should be_false
+    #   should be_nil
+    #   should be_arbitrary_predicate(*args)
+    #   should_not be_nil
+    #   should_not be_arbitrary_predicate(*args)
+    #
+    # Given true, false, or nil, will pass if actual is
+    # true, false or nil (respectively).
+    #
+    # Predicates are any Ruby method that ends in a "?" and returns true or false.
+    # Given be_ followed by arbitrary_predicate (without the "?"), RSpec will match
+    # convert that into a query against the target object.
+    #
+    # The arbitrary_predicate feature will handle any predicate
+    # prefixed with "be_an_" (e.g. be_an_instance_of), "be_a_" (e.g. be_a_kind_of)
+    # or "be_" (e.g. be_empty), letting you choose the prefix that best suits the predicate.
+    #
+    # == Examples 
+    #
+    #   target.should be_true
+    #   target.should be_false
+    #   target.should be_nil
+    #   target.should_not be_nil
+    #
+    #   collection.should be_empty #passes if target.empty?
+    #   "this string".should be_an_intance_of(String)
+    #
+    #   target.should_not be_empty #passes unless target.empty?
+    #   target.should_not be_old_enough(16) #passes unless target.old_enough?(16)
+    def be(*args)
+      Matchers::Be.new(*args)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/be_close.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/be_close.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/be_close.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/be_close.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+module Spec
+  module Matchers
+
+    class BeClose #:nodoc:
+      def initialize(expected, delta)
+        @expected = expected
+        @delta = delta
+      end
+      
+      def matches?(actual)
+        @actual = actual
+        (@actual - @expected).abs < @delta
+      end
+      
+      def failure_message
+        "expected #{@expected} +/- (< #{@delta}), got #{@actual}"
+      end
+      
+      def description
+        "be close to #{@expected} (within +- #{@delta})"
+      end
+    end
+    
+    # :call-seq:
+    #   should be_close(expected, delta)
+    #   should_not be_close(expected, delta)
+    #
+    # Passes if actual == expected +/- delta
+    #
+    # == Example
+    #
+    #   result.should be_close(3.0, 0.5)
+    def be_close(expected, delta)
+      Matchers::BeClose.new(expected, delta)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/change.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/change.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/change.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/change.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,144 @@
+module Spec
+  module Matchers
+    
+    #Based on patch from Wilson Bilkovich
+    class Change #:nodoc:
+      def initialize(receiver=nil, message=nil, &block)
+        @receiver = receiver
+        @message = message
+        @block = block
+      end
+      
+      def matches?(target, &block)
+        if block
+          raise MatcherError.new(<<-EOF
+block passed to should or should_not change must use {} instead of do/end
+EOF
+)
+        end
+        @target = target
+        execute_change
+        return false if @from && (@from != @before)
+        return false if @to && (@to != @after)
+        return (@before + @amount == @after) if @amount
+        return ((@after - @before) >= @minimum) if @minimum
+        return ((@after - @before) <= @maximum) if @maximum        
+        return @before != @after
+      end
+      
+      def execute_change
+        @before = @block.nil? ? @receiver.send(@message) : @block.call
+        @target.call
+        @after = @block.nil? ? @receiver.send(@message) : @block.call
+      end
+      
+      def failure_message
+        if @to
+          "#{result} should have been changed to #{@to.inspect}, but is now #{@after.inspect}"
+        elsif @from
+          "#{result} should have initially been #{@from.inspect}, but was #{@before.inspect}"
+        elsif @amount
+          "#{result} should have been changed by #{@amount.inspect}, but was changed by #{actual_delta.inspect}"
+        elsif @minimum
+          "#{result} should have been changed by at least #{@minimum.inspect}, but was changed by #{actual_delta.inspect}"
+        elsif @maximum
+          "#{result} should have been changed by at most #{@maximum.inspect}, but was changed by #{actual_delta.inspect}"
+        else
+          "#{result} should have changed, but is still #{@before.inspect}"
+        end
+      end
+      
+      def result
+        @message || "result"
+      end
+      
+      def actual_delta
+        @after - @before
+      end
+      
+      def negative_failure_message
+        "#{result} should not have changed, but did change from #{@before.inspect} to #{@after.inspect}"
+      end
+      
+      def by(amount)
+        @amount = amount
+        self
+      end
+      
+      def by_at_least(minimum)
+        @minimum = minimum
+        self
+      end
+      
+      def by_at_most(maximum)
+        @maximum = maximum
+        self
+      end      
+      
+      def to(to)
+        @to = to
+        self
+      end
+      
+      def from (from)
+        @from = from
+        self
+      end
+    end
+    
+    # :call-seq:
+    #   should change(receiver, message, &block)
+    #   should change(receiver, message, &block).by(value)
+    #   should change(receiver, message, &block).from(old).to(new)
+    #   should_not change(receiver, message, &block)
+    #
+    # Allows you to specify that a Proc will cause some value to change.
+    #
+    # == Examples
+    #
+    #   lambda {
+    #     team.add_player(player) 
+    #   }.should change(roster, :count)
+    #
+    #   lambda {
+    #     team.add_player(player) 
+    #   }.should change(roster, :count).by(1)
+    #
+    #   lambda {
+    #     team.add_player(player) 
+    #   }.should change(roster, :count).by_at_least(1)
+    #
+    #   lambda {
+    #     team.add_player(player)
+    #   }.should change(roster, :count).by_at_most(1)    
+    #
+    #   string = "string"
+    #   lambda {
+    #     string.reverse
+    #   }.should change { string }.from("string").to("gnirts")
+    #
+    #   lambda {
+    #     person.happy_birthday
+    #   }.should change(person, :birthday).from(32).to(33)
+    #       
+    #   lambda {
+    #     employee.develop_great_new_social_networking_app
+    #   }.should change(employee, :title).from("Mail Clerk").to("CEO")
+    #
+    # Evaluates +receiver.message+ or +block+ before and
+    # after it evaluates the c object (generated by the lambdas in the examples above).
+    #
+    # Then compares the values before and after the +receiver.message+ and
+    # evaluates the difference compared to the expected difference.
+    #
+    # == Warning
+    # +should_not+ +change+ only supports the form with no subsequent calls to
+    # +by+, +by_at_least+, +by_at_most+, +to+ or +from+.
+    #
+    # blocks passed to +should+ +change+ and +should_not+ +change+
+    # must use the <tt>{}</tt> form (<tt>do/end</tt> is not supported)
+    def change(target=nil, message=nil, &block)
+      Matchers::Change.new(target, message, &block)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/eql.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/eql.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/eql.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/eql.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,43 @@
+module Spec
+  module Matchers
+  
+    class Eql #:nodoc:
+      def initialize(expected)
+        @expected = expected
+      end
+  
+      def matches?(actual)
+        @actual = actual
+        @actual.eql?(@expected)
+      end
+
+      def failure_message
+        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .eql?)", @expected, @actual
+      end
+      
+      def negative_failure_message
+        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @actual
+      end
+
+      def description
+        "eql #{@expected.inspect}"
+      end
+    end
+    
+    # :call-seq:
+    #   should eql(expected)
+    #   should_not eql(expected)
+    #
+    # Passes if actual and expected are of equal value, but not necessarily the same object.
+    #
+    # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
+    #
+    # == Examples
+    #
+    #   5.should eql(5)
+    #   5.should_not eql(3)
+    def eql(expected)
+      Matchers::Eql.new(expected)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/equal.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/equal.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/equal.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/equal.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,43 @@
+module Spec
+  module Matchers
+  
+    class Equal #:nodoc:
+      def initialize(expected)
+        @expected = expected
+      end
+  
+      def matches?(actual)
+        @actual = actual
+        @actual.equal?(@expected)
+      end
+
+      def failure_message
+        return "expected #{@expected.inspect}, got #{@actual.inspect} (using .equal?)", @expected, @actual
+      end
+
+      def negative_failure_message
+        return "expected #{@actual.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @actual
+      end
+      
+      def description
+        "equal #{@expected.inspect}"
+      end
+    end
+    
+    # :call-seq:
+    #   should equal(expected)
+    #   should_not equal(expected)
+    #
+    # Passes if actual and expected are the same object (object identity).
+    #
+    # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
+    #
+    # == Examples
+    #
+    #   5.should equal(5) #Fixnums are equal
+    #   "5".should_not equal("5") #Strings that look the same are not the same object
+    def equal(expected)
+      Matchers::Equal.new(expected)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/has.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/has.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/has.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/has.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,44 @@
+module Spec
+  module Matchers
+    
+    class Has #:nodoc:
+      def initialize(sym, *args)
+        @sym = sym
+        @args = args
+      end
+      
+      def matches?(target)
+        @target = target
+        begin
+          return target.send(predicate, *@args)
+        rescue => @error
+          # This clause should be empty, but rcov will not report it as covered
+          # unless something (anything) is executed within the clause
+          rcov_error_report = "http://eigenclass.org/hiki.rb?rcov-0.8.0"
+        end
+        return false
+      end
+      
+      def failure_message
+        raise @error if @error
+        "expected ##{predicate}(#{@args[0].inspect}) to return true, got false"
+      end
+      
+      def negative_failure_message
+        raise @error if @error
+        "expected ##{predicate}(#{@args[0].inspect}) to return false, got true"
+      end
+      
+      def description
+        "have key #{@args[0].inspect}"
+      end
+      
+      private
+        def predicate
+          "#{@sym.to_s.sub("have_","has_")}?".to_sym
+        end
+        
+    end
+ 
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/have.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/have.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/have.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/have.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,142 @@
+module Spec
+  module Matchers
+    
+    class Have #:nodoc:
+      def initialize(expected, relativity=:exactly)
+        @expected = (expected == :no ? 0 : expected)
+        @relativity = relativity
+      end
+    
+      def relativities
+        @relativities ||= {
+          :exactly => "",
+          :at_least => "at least ",
+          :at_most => "at most "
+        }
+      end
+    
+      def method_missing(sym, *args, &block)
+        @collection_name = sym
+        @args = args
+        @block = block
+        self
+      end
+    
+      def matches?(collection_owner)
+        if collection_owner.respond_to?(@collection_name)
+          collection = collection_owner.send(@collection_name, *@args, &@block)
+        elsif (collection_owner.respond_to?(:length) || collection_owner.respond_to?(:size))
+          collection = collection_owner
+        else
+          collection_owner.send(@collection_name, *@args, &@block)
+        end
+        @actual = collection.size if collection.respond_to?(:size)
+        @actual = collection.length if collection.respond_to?(:length)
+        raise not_a_collection if @actual.nil?
+        return @actual >= @expected if @relativity == :at_least
+        return @actual <= @expected if @relativity == :at_most
+        return @actual == @expected
+      end
+      
+      def not_a_collection
+        "expected #{@collection_name} to be a collection but it does not respond to #length or #size"
+      end
+    
+      def failure_message
+        "expected #{relative_expectation} #{@collection_name}, got #{@actual}"
+      end
+
+      def negative_failure_message
+        if @relativity == :exactly
+          return "expected target not to have #{@expected} #{@collection_name}, got #{@actual}"
+        elsif @relativity == :at_most
+          return <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_most(#{@expected}).#{@collection_name}
+We recommend that you use this instead:
+  should have_at_least(#{@expected + 1}).#{@collection_name}
+EOF
+        elsif @relativity == :at_least
+          return <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_least(#{@expected}).#{@collection_name}
+We recommend that you use this instead:
+  should have_at_most(#{@expected - 1}).#{@collection_name}
+EOF
+        end
+      end
+      
+      def description
+        "have #{relative_expectation} #{@collection_name}"
+      end
+      
+      private
+      
+      def relative_expectation
+        "#{relativities[@relativity]}#{@expected}"
+      end
+    end
+
+    # :call-seq:
+    #   should have(number).named_collection__or__sugar
+    #   should_not have(number).named_collection__or__sugar
+    #
+    # Passes if receiver is a collection with the submitted
+    # number of items OR if the receiver OWNS a collection
+    # with the submitted number of items.
+    #
+    # If the receiver OWNS the collection, you must use the name
+    # of the collection. So if a <tt>Team</tt> instance has a
+    # collection named <tt>#players</tt>, you must use that name
+    # to set the expectation.
+    #
+    # If the receiver IS the collection, you can use any name
+    # you like for <tt>named_collection</tt>. We'd recommend using
+    # either "elements", "members", or "items" as these are all
+    # standard ways of describing the things IN a collection.
+    #
+    # This also works for Strings, letting you set an expectation
+    # about its length
+    #
+    # == Examples
+    #
+    #   # Passes if team.players.size == 11
+    #   team.should have(11).players
+    #
+    #   # Passes if [1,2,3].length == 3
+    #   [1,2,3].should have(3).items #"items" is pure sugar
+    #
+    #   # Passes if "this string".length == 11
+    #   "this string".should have(11).characters #"characters" is pure sugar
+    def have(n)
+      Matchers::Have.new(n)
+    end
+    alias :have_exactly :have
+
+    # :call-seq:
+    #   should have_at_least(number).items
+    #
+    # Exactly like have() with >=.
+    #
+    # == Warning
+    #
+    # +should_not+ +have_at_least+ is not supported
+    def have_at_least(n)
+      Matchers::Have.new(n, :at_least)
+    end
+
+    # :call-seq:
+    #   should have_at_most(number).items
+    #
+    # Exactly like have() with <=.
+    #
+    # == Warning
+    #
+    # +should_not+ +have_at_most+ is not supported
+    def have_at_most(n)
+      Matchers::Have.new(n, :at_most)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/include.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/include.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/include.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/include.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,70 @@
+module Spec
+  module Matchers
+
+    class Include #:nodoc:
+      
+      def initialize(*expecteds)
+        @expecteds = expecteds
+      end
+      
+      def matches?(actual)
+        @actual = actual
+        @expecteds.each do |expected|
+          return false unless actual.include?(expected)
+        end
+        true
+      end
+      
+      def failure_message
+        _message
+      end
+      
+      def negative_failure_message
+        _message("not ")
+      end
+      
+      def description
+        "include #{_pretty_print(@expecteds)}"
+      end
+      
+      private
+        def _message(maybe_not="")
+          "expected #{@actual.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
+        end
+        
+        def _pretty_print(array)
+          result = ""
+          array.each_with_index do |item, index|
+            if index < (array.length - 2)
+              result << "#{item.inspect}, "
+            elsif index < (array.length - 1)
+              result << "#{item.inspect} and "
+            else
+              result << "#{item.inspect}"
+            end
+          end
+          result
+        end
+    end
+
+    # :call-seq:
+    #   should include(expected)
+    #   should_not include(expected)
+    #
+    # Passes if actual includes expected. This works for
+    # collections and Strings. You can also pass in multiple args
+    # and it will only pass if all args are found in collection.
+    #
+    # == Examples
+    #
+    #   [1,2,3].should include(3)
+    #   [1,2,3].should include(2,3) #would pass
+    #   [1,2,3].should include(2,3,4) #would fail
+    #   [1,2,3].should_not include(4)
+    #   "spread".should include("read")
+    #   "spread".should_not include("red")
+    def include(*expected)
+      Matchers::Include.new(*expected)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/match.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/match.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/match.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/match.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,41 @@
+module Spec
+  module Matchers
+    
+    class Match #:nodoc:
+      def initialize(expected)
+        @expected = expected
+      end
+      
+      def matches?(actual)
+        @actual = actual
+        return true if actual =~ @expected
+        return false
+      end
+      
+      def failure_message
+        return "expected #{@actual.inspect} to match #{@expected.inspect}", @expected, @actual
+      end
+      
+      def negative_failure_message
+        return "expected #{@actual.inspect} not to match #{@expected.inspect}", @expected, @actual
+      end
+      
+      def description
+        "match #{@expected.inspect}"
+      end
+    end
+    
+    # :call-seq:
+    #   should match(regexp)
+    #   should_not match(regexp)
+    #
+    # Given a Regexp, passes if actual =~ regexp
+    #
+    # == Examples
+    #
+    #   email.should match(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
+    def match(regexp)
+      Matchers::Match.new(regexp)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,73 @@
+module Spec
+  module Matchers
+    class BaseOperatorMatcher
+      attr_reader :generated_description
+      
+      def initialize(target)
+        @target = target
+      end
+
+      def ==(expected)
+        @expected = expected
+        __delegate_method_missing_to_target("==", expected)
+      end
+
+      def ===(expected)
+        @expected = expected
+        __delegate_method_missing_to_target("===", expected)
+      end
+
+      def =~(expected)
+        @expected = expected
+        __delegate_method_missing_to_target("=~", expected)
+      end
+
+      def >(expected)
+        @expected = expected
+        __delegate_method_missing_to_target(">", expected)
+      end
+
+      def >=(expected)
+        @expected = expected
+        __delegate_method_missing_to_target(">=", expected)
+      end
+
+      def <(expected)
+        @expected = expected
+        __delegate_method_missing_to_target("<", expected)
+      end
+
+      def <=(expected)
+        @expected = expected
+        __delegate_method_missing_to_target("<=", expected)
+      end
+
+      def fail_with_message(message)
+        Spec::Expectations.fail_with(message, @expected, @target)
+      end
+
+    end
+
+    class PositiveOperatorMatcher < BaseOperatorMatcher #:nodoc:
+
+      def __delegate_method_missing_to_target(operator, expected)
+        ::Spec::Matchers.generated_description = "should #{operator} #{expected.inspect}"
+        return if @target.send(operator, expected)
+        return fail_with_message("expected: #{expected.inspect},\n     got: #{@target.inspect} (using #{operator})") if ['==','===', '=~'].include?(operator)
+        return fail_with_message("expected: #{operator} #{expected.inspect},\n     got: #{operator.gsub(/./, ' ')} #{@target.inspect}")
+      end
+
+    end
+
+    class NegativeOperatorMatcher < BaseOperatorMatcher #:nodoc:
+
+      def __delegate_method_missing_to_target(operator, expected)
+        ::Spec::Matchers.generated_description = "should not #{operator} #{expected.inspect}"
+        return unless @target.send(operator, expected)
+        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{@target.inspect}")
+      end
+
+    end
+
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/raise_error.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,105 @@
+module Spec
+  module Matchers
+    
+    class RaiseError #:nodoc:
+      def initialize(error_or_message=Exception, message=nil)
+        if String === error_or_message
+          @expected_error = Exception
+          @expected_message = error_or_message
+        else
+          @expected_error = error_or_message
+          @expected_message = message
+        end
+      end
+      
+      def matches?(proc)
+        @raised_expected_error = false
+        @raised_other = false
+        begin
+          proc.call
+        rescue @expected_error => @actual_error
+          if @expected_message.nil?
+            @raised_expected_error = true
+          else
+            case @expected_message
+            when Regexp
+              if @expected_message =~ @actual_error.message
+                @raised_expected_error = true
+              else
+                @raised_other = true
+              end
+            else
+              if @expected_message == @actual_error.message
+                @raised_expected_error = true
+              else
+                @raised_other = true
+              end
+            end
+          end
+        rescue => @actual_error
+          @raised_other = true
+        ensure
+          return @raised_expected_error
+        end
+      end
+      
+      def failure_message
+        return "expected #{expected_error}#{actual_error}" if @raised_other || !@raised_expected_error
+      end
+
+      def negative_failure_message
+        "expected no #{expected_error}#{actual_error}"
+      end
+      
+      def description
+        "raise #{expected_error}"
+      end
+      
+      private
+        def expected_error
+          case @expected_message
+          when nil
+            @expected_error
+          when Regexp
+            "#{@expected_error} with message matching #{@expected_message.inspect}"
+          else
+            "#{@expected_error} with #{@expected_message.inspect}"
+          end
+        end
+
+        def actual_error
+          @actual_error.nil? ? " but nothing was raised" : ", got #{@actual_error.inspect}"
+        end
+    end
+    
+    # :call-seq:
+    #   should raise_error()
+    #   should raise_error(NamedError)
+    #   should raise_error(NamedError, String)
+    #   should raise_error(NamedError, Regexp)
+    #   should_not raise_error()
+    #   should_not raise_error(NamedError)
+    #   should_not raise_error(NamedError, String)
+    #   should_not raise_error(NamedError, Regexp)
+    #
+    # With no args, matches if any error is raised.
+    # With a named error, matches only if that specific error is raised.
+    # With a named error and messsage specified as a String, matches only if both match.
+    # With a named error and messsage specified as a Regexp, matches only if both match.
+    #
+    # == Examples
+    #
+    #   lambda { do_something_risky }.should raise_error
+    #   lambda { do_something_risky }.should raise_error(PoorRiskDecisionError)
+    #   lambda { do_something_risky }.should raise_error(PoorRiskDecisionError, "that was too risky")
+    #   lambda { do_something_risky }.should raise_error(PoorRiskDecisionError, /oo ri/)
+    #
+    #   lambda { do_something_risky }.should_not raise_error
+    #   lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError)
+    #   lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError, "that was too risky")
+    #   lambda { do_something_risky }.should_not raise_error(PoorRiskDecisionError, /oo ri/)
+    def raise_error(error=Exception, message=nil)
+      Matchers::RaiseError.new(error, message)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/respond_to.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/respond_to.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/respond_to.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/respond_to.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,45 @@
+module Spec
+  module Matchers
+    
+    class RespondTo #:nodoc:
+      def initialize(*names)
+        @names = names
+        @names_not_responded_to = []
+      end
+      
+      def matches?(target)
+        @names.each do |name|
+          unless target.respond_to?(name)
+            @names_not_responded_to << name
+          end
+        end
+        return @names_not_responded_to.empty?
+      end
+      
+      def failure_message
+        "expected target to respond to #{@names_not_responded_to.collect {|name| name.inspect }.join(', ')}"
+      end
+      
+      def negative_failure_message
+        "expected target not to respond to #{@names.collect {|name| name.inspect }.join(', ')}"
+      end
+      
+      def description
+        "respond to ##{@names.to_s}"
+      end
+    end
+    
+    # :call-seq:
+    #   should respond_to(*names)
+    #   should_not respond_to(*names)
+    #
+    # Matches if the target object responds to all of the names
+    # provided. Names can be Strings or Symbols.
+    #
+    # == Examples
+    # 
+    def respond_to(*names)
+      Matchers::RespondTo.new(*names)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/satisfy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/satisfy.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/satisfy.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/satisfy.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,47 @@
+module Spec
+  module Matchers
+    
+    class Satisfy #:nodoc:
+      def initialize(&block)
+        @block = block
+      end
+      
+      def matches?(actual, &block)
+        @block = block if block
+        @actual = actual
+        @block.call(actual)
+      end
+      
+      def failure_message
+        "expected #{@actual} to satisfy block"
+      end
+
+      def negative_failure_message
+        "expected #{@actual} not to satisfy block"
+      end
+    end
+    
+    # :call-seq:
+    #   should satisfy {}
+    #   should_not satisfy {}
+    #
+    # Passes if the submitted block returns true. Yields target to the
+    # block.
+    #
+    # Generally speaking, this should be thought of as a last resort when
+    # you can't find any other way to specify the behaviour you wish to
+    # specify.
+    #
+    # If you do find yourself in such a situation, you could always write
+    # a custom matcher, which would likely make your specs more expressive.
+    #
+    # == Examples
+    #
+    #   5.should satisfy { |n|
+    #     n > 3
+    #   }
+    def satisfy(&block)
+      Matchers::Satisfy.new(&block)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+module Spec
+  module Matchers
+    class SimpleMatcher
+      attr_reader :description
+      
+      def initialize(description, &match_block)
+        @description = description
+        @match_block = match_block
+      end
+
+      def matches?(actual)
+        @actual = actual
+        return @match_block.call(@actual)
+      end
+
+      def failure_message()
+        return %[expected #{@description.inspect} but got #{@actual.inspect}]
+      end
+        
+      def negative_failure_message()
+        return %[expected not to get #{@description.inspect}, but got #{@actual.inspect}]
+      end
+    end
+    
+    def simple_matcher(message, &match_block)
+      SimpleMatcher.new(message, &match_block)
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,73 @@
+module Spec
+  module Matchers
+    
+    class ThrowSymbol #:nodoc:
+      def initialize(expected=nil)
+        @expected = expected
+      end
+      
+      def matches?(proc)
+        begin
+          proc.call
+        rescue NameError => e
+          raise e unless e.message =~ /uncaught throw/
+          @actual = e.name.to_sym
+        ensure
+          if @expected.nil?
+            return @actual.nil? ? false : true
+          else
+            return @actual == @expected
+          end
+        end
+      end
+
+      def failure_message
+        if @actual
+          "expected #{expected}, got #{@actual.inspect}"
+        else
+          "expected #{expected} but nothing was thrown"
+        end
+      end
+      
+      def negative_failure_message
+        if @expected
+          "expected #{expected} not to be thrown"
+        else
+          "expected no Symbol, got :#{@actual}"
+        end
+      end
+      
+      def description
+        "throw #{expected}"
+      end
+      
+      private
+      
+        def expected
+          @expected.nil? ? "a Symbol" : @expected.inspect
+        end
+      
+    end
+ 
+    # :call-seq:
+    #   should throw_symbol()
+    #   should throw_symbol(:sym)
+    #   should_not throw_symbol()
+    #   should_not throw_symbol(:sym)
+    #
+    # Given a Symbol argument, matches if a proc throws the specified Symbol.
+    #
+    # Given no argument, matches if a proc throws any Symbol.
+    #
+    # == Examples
+    #
+    #   lambda { do_something_risky }.should throw_symbol
+    #   lambda { do_something_risky }.should throw_symbol(:that_was_risky)
+    #
+    #   lambda { do_something_risky }.should_not throw_symbol
+    #   lambda { do_something_risky }.should_not throw_symbol(:that_was_risky)
+    def throw_symbol(sym=nil)
+      Matchers::ThrowSymbol.new(sym)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/matchers.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/matchers.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,153 @@
+require 'spec/matchers/simple_matcher'
+require 'spec/matchers/be'
+require 'spec/matchers/be_close'
+require 'spec/matchers/change'
+require 'spec/matchers/eql'
+require 'spec/matchers/equal'
+require 'spec/matchers/has'
+require 'spec/matchers/have'
+require 'spec/matchers/include'
+require 'spec/matchers/match'
+require 'spec/matchers/raise_error'
+require 'spec/matchers/respond_to'
+require 'spec/matchers/satisfy'
+require 'spec/matchers/throw_symbol'
+require 'spec/matchers/operator_matcher'
+
+module Spec
+
+  # RSpec ships with a number of useful Expression Matchers. An Expression Matcher
+  # is any object that responds to the following methods:
+  #
+  #   matches?(actual)
+  #   failure_message
+  #   negative_failure_message #optional
+  #   description #optional
+  #
+  # See Spec::Expectations to learn how to use these as Expectation Matchers.
+  # See Spec::Mocks to learn how to use them as Mock Argument Constraints.
+  #
+  # == Predicates
+  #
+  # In addition to those Expression Matchers that are defined explicitly, RSpec will
+  # create custom Matchers on the fly for any arbitrary predicate, giving your specs
+  # a much more natural language feel. 
+  #
+  # A Ruby predicate is a method that ends with a "?" and returns true or false.
+  # Common examples are +empty?+, +nil?+, and +instance_of?+.
+  #
+  # All you need to do is write +should be_+ followed by the predicate without
+  # the question mark, and RSpec will figure it out from there. For example:
+  #
+  #   [].should be_empty => [].empty? #passes
+  #   [].should_not be_empty => [].empty? #fails
+  #
+  # In addtion to prefixing the predicate matchers with "be_", you can also use "be_a_"
+  # and "be_an_", making your specs read much more naturally:
+  #
+  #   "a string".should be_an_instance_of(String) =>"a string".instance_of?(String) #passes
+  #
+  #   3.should be_a_kind_of(Fixnum) => 3.kind_of?(Numeric) #passes
+  #   3.should be_a_kind_of(Numeric) => 3.kind_of?(Numeric) #passes
+  #   3.should be_an_instance_of(Fixnum) => 3.instance_of?(Fixnum) #passes
+  #   3.should_not be_instance_of(Numeric) => 3.instance_of?(Numeric) #fails
+  #
+  # RSpec will also create custom matchers for predicates like +has_key?+. To
+  # use this feature, just state that the object should have_key(:key) and RSpec will
+  # call has_key?(:key) on the target. For example:
+  #
+  #   {:a => "A"}.should have_key(:a) => {:a => "A"}.has_key?(:a) #passes
+  #   {:a => "A"}.should have_key(:b) => {:a => "A"}.has_key?(:b) #fails
+  #
+  # You can use this feature to invoke any predicate that begins with "has_", whether it is
+  # part of the Ruby libraries (like +Hash#has_key?+) or a method you wrote on your own class.
+  #
+  # == Custom Expectation Matchers
+  #
+  # When you find that none of the stock Expectation Matchers provide a natural
+  # feeling expectation, you can very easily write your own.
+  #
+  # For example, imagine that you are writing a game in which players can
+  # be in various zones on a virtual board. To specify that bob should
+  # be in zone 4, you could say:
+  #
+  #   bob.current_zone.should eql(Zone.new("4"))
+  #
+  # But you might find it more expressive to say:
+  #
+  #   bob.should be_in_zone("4")
+  #
+  # and/or
+  #
+  #   bob.should_not be_in_zone("3")
+  #
+  # To do this, you would need to write a class like this:
+  #
+  #   class BeInZone
+  #     def initialize(expected)
+  #       @expected = expected
+  #     end
+  #     def matches?(target)
+  #       @target = target
+  #       @target.current_zone.eql?(Zone.new(@expected))
+  #     end
+  #     def failure_message
+  #       "expected #{@target.inspect} to be in Zone #{@expected}"
+  #     end
+  #     def negative_failure_message
+  #       "expected #{@target.inspect} not to be in Zone #{@expected}"
+  #     end
+  #   end
+  #
+  # ... and a method like this:
+  #
+  #   def be_in_zone(expected)
+  #     BeInZone.new(expected)
+  #   end
+  #
+  # And then expose the method to your specs. This is normally done
+  # by including the method and the class in a module, which is then
+  # included in your spec:
+  #
+  #   module CustomGameMatchers
+  #     class BeInZone
+  #       ...
+  #     end
+  #
+  #     def be_in_zone(expected)
+  #       ...
+  #     end
+  #   end
+  #
+  #   describe "Player behaviour" do
+  #     include CustomGameMatchers
+  #     ...
+  #   end
+  #
+  # or you can include in globally in a spec_helper.rb file <tt>require</tt>d
+  # from your spec file(s):
+  #
+  #   Spec::Runner.configure do |config|
+  #     config.include(CustomGameMatchers)
+  #   end
+  #
+  module Matchers
+    module ModuleMethods
+      attr_accessor :generated_description
+      def clear_generated_description
+        @generated_description = nil
+      end
+    end
+    extend ModuleMethods
+
+    def method_missing(sym, *args, &block) # :nodoc:
+      return Matchers::Be.new(sym, *args) if sym.starts_with?("be_")
+      return Matchers::Has.new(sym, *args) if sym.starts_with?("have_")
+      super
+    end
+
+    class MatcherError < StandardError
+    end
+    
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+module Spec
+  module Mocks
+    module ArgumentConstraintMatchers
+
+      # Shortcut for creating an instance of Spec::Mocks::DuckTypeArgConstraint
+      def duck_type(*args)
+        DuckTypeArgConstraint.new(*args)
+      end
+
+      def any_args
+        AnyArgsConstraint.new
+      end
+      
+      def anything
+        AnyArgConstraint.new(nil)
+      end
+      
+      def boolean
+        BooleanArgConstraint.new(nil)
+      end
+      
+      def no_args
+        NoArgsConstraint.new
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,183 @@
+module Spec
+  module Mocks
+  
+    class MatcherConstraint
+      def initialize(matcher)
+        @matcher = matcher
+      end
+      
+      def matches?(value)
+        @matcher.matches?(value)
+      end
+    end
+      
+    class LiteralArgConstraint
+      def initialize(literal)
+        @literal_value = literal
+      end
+      
+      def matches?(value)
+        @literal_value == value
+      end
+    end
+    
+    class RegexpArgConstraint
+      def initialize(regexp)
+        @regexp = regexp
+      end
+      
+      def matches?(value)
+        return value =~ @regexp unless value.is_a?(Regexp)
+        value == @regexp
+      end
+    end
+    
+    class AnyArgConstraint
+      def initialize(ignore)
+      end
+      
+      def ==(other)
+        true
+      end
+      
+      # TODO - need this?
+      def matches?(value)
+        true
+      end
+    end
+    
+    class AnyArgsConstraint
+      def description
+        "any args"
+      end
+    end
+    
+    class NoArgsConstraint
+      def description
+        "no args"
+      end
+      
+      def ==(args)
+        args == []
+      end
+    end
+    
+    class NumericArgConstraint
+      def initialize(ignore)
+      end
+      
+      def matches?(value)
+        value.is_a?(Numeric)
+      end
+    end
+    
+    class BooleanArgConstraint
+      def initialize(ignore)
+      end
+      
+      def ==(value)
+        matches?(value)
+      end
+      
+      def matches?(value)
+        return true if value.is_a?(TrueClass)
+        return true if value.is_a?(FalseClass)
+        false
+      end
+    end
+    
+    class StringArgConstraint
+      def initialize(ignore)
+      end
+      
+      def matches?(value)
+        value.is_a?(String)
+      end
+    end
+    
+    class DuckTypeArgConstraint
+      def initialize(*methods_to_respond_to)
+        @methods_to_respond_to = methods_to_respond_to
+      end
+  
+      def matches?(value)
+        @methods_to_respond_to.all? { |sym| value.respond_to?(sym) }
+      end
+      
+      def description
+        "duck_type"
+      end
+    end
+
+    class ArgumentExpectation
+      attr_reader :args
+      @@constraint_classes = Hash.new { |hash, key| LiteralArgConstraint}
+      @@constraint_classes[:anything] = AnyArgConstraint
+      @@constraint_classes[:numeric] = NumericArgConstraint
+      @@constraint_classes[:boolean] = BooleanArgConstraint
+      @@constraint_classes[:string] = StringArgConstraint
+      
+      def initialize(args)
+        @args = args
+        if [:any_args] == args
+          @expected_params = nil
+          warn_deprecated(:any_args.inspect, "any_args()")
+        elsif args.length == 1 && args[0].is_a?(AnyArgsConstraint) then @expected_params = nil
+        elsif [:no_args] == args
+          @expected_params = []
+          warn_deprecated(:no_args.inspect, "no_args()")
+        elsif args.length == 1 && args[0].is_a?(NoArgsConstraint) then @expected_params = []
+        else @expected_params = process_arg_constraints(args)
+        end
+      end
+      
+      def process_arg_constraints(constraints)
+        constraints.collect do |constraint| 
+          convert_constraint(constraint)
+        end
+      end
+      
+      def warn_deprecated(deprecated_method, instead)
+        Kernel.warn "The #{deprecated_method} constraint is deprecated. Use #{instead} instead."
+      end
+      
+      def convert_constraint(constraint)
+        if [:anything, :numeric, :boolean, :string].include?(constraint)
+          case constraint
+          when :anything
+            instead = "anything()"
+          when :boolean
+            instead = "boolean()"
+          when :numeric
+            instead = "an_instance_of(Numeric)"
+          when :string
+            instead = "an_instance_of(String)"
+          end
+          warn_deprecated(constraint.inspect, instead)
+          return @@constraint_classes[constraint].new(constraint)
+        end
+        return MatcherConstraint.new(constraint) if is_matcher?(constraint)
+        return RegexpArgConstraint.new(constraint) if constraint.is_a?(Regexp)
+        return LiteralArgConstraint.new(constraint)
+      end
+      
+      def is_matcher?(obj)
+        return obj.respond_to?(:matches?) && obj.respond_to?(:description)
+      end
+      
+      def check_args(args)
+        return true if @expected_params.nil?
+        return true if @expected_params == args
+        return constraints_match?(args)
+      end
+      
+      def constraints_match?(args)
+        return false if args.length != @expected_params.length
+        @expected_params.each_index { |i| return false unless @expected_params[i].matches?(args[i]) }
+        return true
+      end
+  
+    end
+    
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/error_generator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/error_generator.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/error_generator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/error_generator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,84 @@
+module Spec
+  module Mocks
+    class ErrorGenerator
+      attr_writer :opts
+      
+      def initialize(target, name)
+        @target = target
+        @name = name
+      end
+      
+      def opts
+        @opts ||= {}
+      end
+
+      def raise_unexpected_message_error(sym, *args)
+        __raise "#{intro} received unexpected message :#{sym}#{arg_message(*args)}"
+      end
+      
+      def raise_unexpected_message_args_error(expectation, *args)
+        expected_args = format_args(*expectation.expected_args)
+        actual_args = args.empty? ? "(no args)" : format_args(*args)
+        __raise "#{intro} expected #{expectation.sym.inspect} with #{expected_args} but received it with #{actual_args}"
+      end
+      
+      def raise_expectation_error(sym, expected_received_count, actual_received_count, *args)
+        __raise "#{intro} expected :#{sym}#{arg_message(*args)} #{count_message(expected_received_count)}, but received it #{count_message(actual_received_count)}"
+      end
+      
+      def raise_out_of_order_error(sym)
+        __raise "#{intro} received :#{sym} out of order"
+      end
+      
+      def raise_block_failed_error(sym, detail)
+        __raise "#{intro} received :#{sym} but passed block failed with: #{detail}"
+      end
+      
+      def raise_missing_block_error(args_to_yield)
+        __raise "#{intro} asked to yield |#{arg_list(*args_to_yield)}| but no block was passed"
+      end
+      
+      def raise_wrong_arity_error(args_to_yield, arity)
+        __raise "#{intro} yielded |#{arg_list(*args_to_yield)}| to block with arity of #{arity}"
+      end
+      
+      private
+      def intro
+        @name ? "Mock '#{@name}'" : @target.inspect
+      end
+      
+      def __raise(message)
+        message = opts[:message] unless opts[:message].nil?
+        Kernel::raise(Spec::Mocks::MockExpectationError, message)
+      end
+      
+      def arg_message(*args)
+        " with " + format_args(*args)
+      end
+      
+      def format_args(*args)
+        return "(no args)" if args.empty? || args == [:no_args]
+        return "(any args)" if args == [:any_args]
+        "(" + arg_list(*args) + ")"
+      end
+
+      def arg_list(*args)
+        args.collect do |arg|
+          arg.respond_to?(:description) ? arg.description : arg.inspect
+        end.join(", ")
+      end
+      
+      def count_message(count)
+        return "at least #{pretty_print(count.abs)}" if count < 0
+        return pretty_print(count)
+      end
+
+      def pretty_print(count)
+        return "once" if count == 1
+        return "twice" if count == 2
+        return "#{count} times"
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/errors.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/errors.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/errors.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/errors.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+module Spec
+  module Mocks
+    class MockExpectationError < StandardError
+    end
+    
+    class AmbiguousReturnError < StandardError
+    end
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/extensions/object.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/extensions/object.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/extensions/object.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/extensions/object.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+class Object
+  include Spec::Mocks::Methods
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,254 @@
+module Spec
+  module Mocks
+
+    class BaseExpectation
+      attr_reader :sym
+      
+      def initialize(error_generator, expectation_ordering, expected_from, sym, method_block, expected_received_count=1, opts={})
+        @error_generator = error_generator
+        @error_generator.opts = opts
+        @expected_from = expected_from
+        @sym = sym
+        @method_block = method_block
+        @return_block = lambda {}
+        @actual_received_count = 0
+        @expected_received_count = expected_received_count
+        @args_expectation = ArgumentExpectation.new([AnyArgsConstraint.new])
+        @consecutive = false
+        @exception_to_raise = nil
+        @symbol_to_throw = nil
+        @order_group = expectation_ordering
+        @at_least = nil
+        @at_most = nil
+        @args_to_yield = []
+      end
+      
+      def expected_args
+        @args_expectation.args
+      end
+
+      def and_return(*values, &return_block)
+        Kernel::raise AmbiguousReturnError unless @method_block.nil?
+        case values.size
+          when 0 then value = nil
+          when 1 then value = values[0]
+        else
+          value = values
+          @consecutive = true
+          @expected_received_count = values.size if !ignoring_args? &&
+                                                    @expected_received_count < values.size
+        end
+        @return_block = block_given? ? return_block : lambda { value }
+      end
+      
+      # :call-seq:
+      #   and_raise()
+      #   and_raise(Exception) #any exception class
+      #   and_raise(exception) #any exception object
+      #
+      # == Warning
+      #
+      # When you pass an exception class, the MessageExpectation will
+      # raise an instance of it, creating it with +new+. If the exception
+      # class initializer requires any parameters, you must pass in an
+      # instance and not the class.
+      def and_raise(exception=Exception)
+        @exception_to_raise = exception
+      end
+      
+      def and_throw(symbol)
+        @symbol_to_throw = symbol
+      end
+      
+      def and_yield(*args)
+        @args_to_yield << args
+        self
+      end
+  
+      def matches(sym, args)
+        @sym == sym and @args_expectation.check_args(args)
+      end
+      
+      def invoke(args, block)
+        @order_group.handle_order_constraint self
+
+        begin
+          Kernel::raise @exception_to_raise unless @exception_to_raise.nil?
+          Kernel::throw @symbol_to_throw unless @symbol_to_throw.nil?
+
+          if !@method_block.nil?
+            return invoke_method_block(args)
+          elsif @args_to_yield.size > 0
+            return invoke_with_yield(block)
+          elsif @consecutive
+            return invoke_consecutive_return_block(args, block)
+          else
+            return invoke_return_block(args, block)
+          end
+        ensure
+          @actual_received_count += 1
+        end
+      end
+      
+      protected
+
+      def invoke_method_block(args)
+        begin
+          @method_block.call(*args)
+        rescue => detail
+          @error_generator.raise_block_failed_error @sym, detail.message
+        end
+      end
+      
+      def invoke_with_yield(block)
+        if block.nil?
+          @error_generator.raise_missing_block_error @args_to_yield
+        end
+        @args_to_yield.each do |args_to_yield_this_time|
+          if block.arity > -1 && args_to_yield_this_time.length != block.arity
+            @error_generator.raise_wrong_arity_error args_to_yield_this_time, block.arity
+          end
+          block.call(*args_to_yield_this_time)
+        end
+      end
+      
+      def invoke_consecutive_return_block(args, block)
+        args << block unless block.nil?
+        value = @return_block.call(*args)
+        
+        index = [@actual_received_count, value.size-1].min
+        value[index]
+      end
+      
+      def invoke_return_block(args, block)
+        args << block unless block.nil?
+        value = @return_block.call(*args)
+    
+        value
+      end
+    end
+    
+    class MessageExpectation < BaseExpectation
+      
+      def matches_name_but_not_args(sym, args)
+        @sym == sym and not @args_expectation.check_args(args)
+      end
+       
+      def verify_messages_received        
+        return if ignoring_args? || matches_exact_count? ||
+           matches_at_least_count? || matches_at_most_count?
+    
+        generate_error
+      rescue Spec::Mocks::MockExpectationError => error
+        error.backtrace.insert(0, @expected_from)
+        Kernel::raise error
+      end
+      
+      def ignoring_args?
+        @expected_received_count == :any
+      end
+      
+      def matches_at_least_count?
+        @at_least && @actual_received_count >= @expected_received_count
+      end
+      
+      def matches_at_most_count?
+        @at_most && @actual_received_count <= @expected_received_count
+      end
+      
+      def matches_exact_count?
+        @expected_received_count == @actual_received_count
+      end
+      
+      def generate_error
+        @error_generator.raise_expectation_error(@sym, @expected_received_count, @actual_received_count, *@args_expectation.args)
+      end
+
+      def with(*args, &block)
+        @method_block = block if block
+        @args_expectation = ArgumentExpectation.new(args)
+        self
+      end
+      
+      def exactly(n)
+        set_expected_received_count :exactly, n
+        self
+      end
+      
+      def at_least(n)
+        set_expected_received_count :at_least, n
+        self
+      end
+      
+      def at_most(n)
+        set_expected_received_count :at_most, n
+        self
+      end
+
+      def times(&block)
+        @method_block = block if block
+        self
+      end
+  
+      def any_number_of_times(&block)
+        @method_block = block if block
+        @expected_received_count = :any
+        self
+      end
+  
+      def never
+        @expected_received_count = 0
+        self
+      end
+  
+      def once(&block)
+        @method_block = block if block
+        @expected_received_count = 1
+        self
+      end
+  
+      def twice(&block)
+        @method_block = block if block
+        @expected_received_count = 2
+        self
+      end
+  
+      def ordered(&block)
+        @method_block = block if block
+        @order_group.register(self)
+        @ordered = true
+        self
+      end
+      
+      def negative_expectation_for?(sym)
+        return false
+      end
+      
+      protected
+        def set_expected_received_count(relativity, n)
+          @at_least = (relativity == :at_least)
+          @at_most = (relativity == :at_most)
+          @expected_received_count = case n
+            when Numeric
+              n
+            when :once
+              1
+            when :twice
+              2
+          end
+        end
+      
+    end
+    
+    class NegativeMessageExpectation < MessageExpectation
+      def initialize(message, expectation_ordering, expected_from, sym, method_block)
+        super(message, expectation_ordering, expected_from, sym, method_block, 0)
+      end
+      
+      def negative_expectation_for?(sym)
+        return @sym == sym
+      end
+    end
+    
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/methods.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/methods.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/methods.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/methods.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,39 @@
+module Spec
+  module Mocks
+    module Methods
+      def should_receive(sym, opts={}, &block)
+        __mock_proxy.add_message_expectation(opts[:expected_from] || caller(1)[0], sym.to_sym, opts, &block)
+      end
+
+      def should_not_receive(sym, &block)
+        __mock_proxy.add_negative_message_expectation(caller(1)[0], sym.to_sym, &block)
+      end
+      
+      def stub!(sym, opts={})
+        __mock_proxy.add_stub(caller(1)[0], sym.to_sym, opts)
+      end
+      
+      def received_message?(sym, *args, &block) #:nodoc:
+        __mock_proxy.received_message?(sym.to_sym, *args, &block)
+      end
+      
+      def rspec_verify #:nodoc:
+        __mock_proxy.verify
+      end
+
+      def rspec_reset #:nodoc:
+        __mock_proxy.reset
+      end
+
+    private
+
+      def __mock_proxy
+        if Mock === self
+          @mock_proxy ||= Proxy.new(self, @name, @options)
+        else
+          @mock_proxy ||= Proxy.new(self, self.class.name)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/mock.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/mock.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/mock.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/mock.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+module Spec
+  module Mocks
+    class Mock
+      include Methods
+
+      # Creates a new mock with a +name+ (that will be used in error messages only)
+      # == Options:
+      # * <tt>:null_object</tt> - if true, the mock object acts as a forgiving null object allowing any message to be sent to it.
+      def initialize(name, options={})
+        @name = name
+        @options = options
+      end
+      
+      # This allows for comparing the mock to other objects that proxy
+      #  such as ActiveRecords belongs_to proxy objects
+      #  By making the other object run the comparison, we're sure the call gets delegated to the proxy target
+      # This is an unfortunate side effect from ActiveRecord, but this should be safe unless the RHS redefines == in a nonsensical manner
+      def ==(other)
+        other == __mock_proxy
+      end
+
+      def method_missing(sym, *args, &block)
+        __mock_proxy.instance_eval {@messages_received << [sym, args, block]}
+        begin
+          return self if __mock_proxy.null_object?
+          super(sym, *args, &block)
+        rescue NameError
+          __mock_proxy.raise_unexpected_message_error sym, *args
+        end
+      end
+      
+      def inspect
+        "#<#{self.class}:#{sprintf '0x%x', self.object_id} @name=#{@name.inspect}>"
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/order_group.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/order_group.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/order_group.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/order_group.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+module Spec
+  module Mocks
+    class OrderGroup
+      def initialize error_generator
+        @error_generator = error_generator
+        @ordering = Array.new
+      end
+      
+      def register(expectation)
+        @ordering << expectation
+      end
+      
+      def ready_for?(expectation)
+        return @ordering.first == expectation
+      end
+      
+      def consume
+        @ordering.shift
+      end
+      
+      def handle_order_constraint expectation
+        return unless @ordering.include? expectation
+        return consume if ready_for?(expectation)
+        @error_generator.raise_out_of_order_error expectation.sym
+      end
+      
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/proxy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/proxy.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/proxy.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/proxy.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,170 @@
+module Spec
+  module Mocks
+    class Proxy
+      DEFAULT_OPTIONS = {
+        :null_object => false,
+      }
+
+      def initialize(target, name, options={})
+        @target = target
+        @name = name
+        @error_generator = ErrorGenerator.new target, name
+        @expectation_ordering = OrderGroup.new @error_generator
+        @expectations = []
+        @messages_received = []
+        @stubs = []
+        @proxied_methods = []
+        @options = options ? DEFAULT_OPTIONS.dup.merge(options) : DEFAULT_OPTIONS
+      end
+
+      def null_object?
+        @options[:null_object]
+      end
+
+      def add_message_expectation(expected_from, sym, opts={}, &block)
+        __add sym
+        @expectations << MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil, 1, opts)
+        @expectations.last
+      end
+
+      def add_negative_message_expectation(expected_from, sym, &block)
+        __add sym
+        @expectations << NegativeMessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, block_given? ? block : nil)
+        @expectations.last
+      end
+
+      def add_stub(expected_from, sym, opts={})
+        __add sym
+        @stubs.unshift MessageExpectation.new(@error_generator, @expectation_ordering, expected_from, sym, nil, :any, opts)
+        @stubs.first
+      end
+
+      def verify #:nodoc:
+        verify_expectations
+      ensure
+        reset
+      end
+
+      def reset
+        clear_expectations
+        clear_stubs
+        reset_proxied_methods
+        clear_proxied_methods
+      end
+
+      def received_message?(sym, *args, &block)
+        @messages_received.any? {|array| array == [sym, args, block]}
+      end
+
+      def has_negative_expectation?(sym)
+        @expectations.detect {|expectation| expectation.negative_expectation_for?(sym)}
+      end
+
+      def message_received(sym, *args, &block)
+        if expectation = find_matching_expectation(sym, *args)
+          expectation.invoke(args, block)
+        elsif stub = find_matching_method_stub(sym, *args)
+          stub.invoke([], block)
+        elsif expectation = find_almost_matching_expectation(sym, *args)
+          raise_unexpected_message_args_error(expectation, *args) unless has_negative_expectation?(sym) unless null_object?
+        else
+          @target.send :method_missing, sym, *args, &block
+        end
+      end
+
+      def raise_unexpected_message_args_error(expectation, *args)
+        @error_generator.raise_unexpected_message_args_error expectation, *args
+      end
+
+      def raise_unexpected_message_error(sym, *args)
+        @error_generator.raise_unexpected_message_error sym, *args
+      end
+      
+    private
+
+      def __add(sym)
+        $rspec_mocks.add(@target) unless $rspec_mocks.nil?
+        define_expected_method(sym)
+      end
+      
+      def define_expected_method(sym)
+        if target_responds_to?(sym) && !metaclass.method_defined?(munge(sym))
+          munged_sym = munge(sym)
+          metaclass.instance_eval do
+            alias_method munged_sym, sym if method_defined?(sym.to_s)
+          end
+          @proxied_methods << sym
+        end
+        
+        metaclass_eval(<<-EOF, __FILE__, __LINE__)
+          def #{sym}(*args, &block)
+            __mock_proxy.message_received :#{sym}, *args, &block
+          end
+        EOF
+      end
+
+      def target_responds_to?(sym)
+        return @target.send(munge(:respond_to?),sym) if @already_proxied_respond_to
+        return @already_proxied_respond_to = true if sym == :respond_to?
+        return @target.respond_to?(sym)
+      end
+
+      def munge(sym)
+        "proxied_by_rspec__#{sym.to_s}".to_sym
+      end
+
+      def clear_expectations
+        @expectations.clear
+      end
+
+      def clear_stubs
+        @stubs.clear
+      end
+
+      def clear_proxied_methods
+        @proxied_methods.clear
+      end
+
+      def metaclass_eval(str, filename, lineno)
+        metaclass.class_eval(str, filename, lineno)
+      end
+      
+      def metaclass
+        (class << @target; self; end)
+      end
+
+      def verify_expectations
+        @expectations.each do |expectation|
+          expectation.verify_messages_received
+        end
+      end
+
+      def reset_proxied_methods
+        @proxied_methods.each do |sym|
+          munged_sym = munge(sym)
+          metaclass.instance_eval do
+            if method_defined?(munged_sym.to_s)
+              alias_method sym, munged_sym
+              undef_method munged_sym
+            else
+              undef_method sym
+            end
+          end
+        end
+      end
+
+      def find_matching_expectation(sym, *args)
+        @expectations.find {|expectation| expectation.matches(sym, args)}
+      end
+
+      def find_almost_matching_expectation(sym, *args)
+        @expectations.find {|expectation| expectation.matches_name_but_not_args(sym, args)}
+      end
+
+      def find_matching_method_stub(sym, *args)
+        @stubs.find {|stub| stub.matches(sym, args)}
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/space.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/space.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/space.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/space.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,28 @@
+module Spec
+  module Mocks
+    class Space
+      def add(obj)
+        mocks << obj unless mocks.detect {|m| m.equal? obj}
+      end
+
+      def verify_all
+        mocks.each do |mock|
+          mock.rspec_verify
+        end
+      end
+      
+      def reset_all
+        mocks.each do |mock|
+          mock.rspec_reset
+        end
+        mocks.clear
+      end
+      
+    private
+    
+      def mocks
+        @mocks ||= []
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+module Spec
+  module Mocks
+    module SpecMethods
+      include Spec::Mocks::ArgumentConstraintMatchers
+
+      # Shortcut for creating an instance of Spec::Mocks::Mock.
+      def mock(name, options={})
+        Spec::Mocks::Mock.new(name, options)
+      end
+
+      # Shortcut for creating an instance of Spec::Mocks::Mock with
+      # predefined method stubs.
+      #
+      # == Examples
+      #
+      #   stub_thing = stub("thing", :a => "A")
+      #   stub_thing.a == "A" => true
+      #
+      #   stub_person = stub("thing", :name => "Joe", :email => "joe@domain.com")
+      #   stub_person.name => "Joe"
+      #   stub_person.email => "joe@domain.com"
+      def stub(name, stubs={})
+        object_stub = mock(name)
+        stubs.each { |key, value| object_stub.stub!(key).and_return(value) }
+        object_stub
+      end
+      
+      # Shortcut for creating a mock object that will return itself in response
+      # to any message it receives that it hasn't been explicitly instructed
+      # to respond to.
+      def stub_everything(name = 'stub')
+        mock(name, :null_object => true)
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/mocks.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/mocks.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,211 @@
+require 'spec/mocks/methods'
+require 'spec/mocks/argument_constraint_matchers'
+require 'spec/mocks/spec_methods'
+require 'spec/mocks/proxy'
+require 'spec/mocks/mock'
+require 'spec/mocks/argument_expectation'
+require 'spec/mocks/message_expectation'
+require 'spec/mocks/order_group'
+require 'spec/mocks/errors'
+require 'spec/mocks/error_generator'
+require 'spec/mocks/extensions/object'
+require 'spec/mocks/space'
+
+
+module Spec
+  # == Mocks and Stubs
+  #
+  # RSpec will create Mock Objects and Stubs for you at runtime, or attach stub/mock behaviour
+  # to any of your real objects (Partial Mock/Stub). Because the underlying implementation
+  # for mocks and stubs is the same, you can intermingle mock and stub
+  # behaviour in either dynamically generated mocks or your pre-existing classes.
+  # There is a semantic difference in how they are created, however,
+  # which can help clarify the role it is playing within a given spec.
+  #
+  # == Mock Objects
+  # 
+  # Mocks are objects that allow you to set and verify expectations that they will
+  # receive specific messages during run time. They are very useful for specifying how the subject of
+  # the spec interacts with its collaborators. This approach is widely known as "interaction
+  # testing".
+  # 
+  # Mocks are also very powerful as a design tool. As you are
+  # driving the implementation of a given class, Mocks provide an anonymous
+  # collaborator that can change in behaviour as quickly as you can write an expectation in your
+  # spec. This flexibility allows you to design the interface of a collaborator that often
+  # does not yet exist. As the shape of the class being specified becomes more clear, so do the
+  # requirements for its collaborators - often leading to the discovery of new types that are
+  # needed in your system.
+  # 
+  # Read Endo-Testing[http://www.mockobjects.com/files/endotesting.pdf] for a much
+  # more in depth description of this process.
+  # 
+  # == Stubs
+  # 
+  # Stubs are objects that allow you to set "stub" responses to
+  # messages. As Martin Fowler points out on his site,
+  # mocks_arent_stubs[http://www.martinfowler.com/articles/mocksArentStubs.html].
+  # Paraphrasing Fowler's paraphrasing
+  # of Gerard Meszaros: Stubs provide canned responses to messages they might receive in a test, while
+  # mocks allow you to specify and, subsquently, verify that certain messages should be received during
+  # the execution of a test.
+  # 
+  # == Partial Mocks/Stubs
+  # 
+  # RSpec also supports partial mocking/stubbing, allowing you to add stub/mock behaviour
+  # to instances of your existing classes. This is generally
+  # something to be avoided, because changes to the class can have ripple effects on
+  # seemingly unrelated specs. When specs fail due to these ripple effects, the fact
+  # that some methods are being mocked can make it difficult to understand why a
+  # failure is occurring.
+  # 
+  # That said, partials do allow you to expect and
+  # verify interactions with class methods such as +#find+ and +#create+
+  # on Ruby on Rails model classes.
+  # 
+  # == Further Reading
+  # 
+  # There are many different viewpoints about the meaning of mocks and stubs. If you are interested
+  # in learning more, here is some recommended reading:
+  # 
+  # * Mock Objects: http://www.mockobjects.com/
+  # * Endo-Testing: http://www.mockobjects.com/files/endotesting.pdf
+  # * Mock Roles, Not Objects: http://www.mockobjects.com/files/mockrolesnotobjects.pdf
+  # * Test Double Patterns: http://xunitpatterns.com/Test%20Double%20Patterns.html
+  # * Mocks aren't stubs: http://www.martinfowler.com/articles/mocksArentStubs.html
+  #
+  # == Creating a Mock
+  #
+  # You can create a mock in any specification (or setup) using:
+  #
+  #   mock(name, options={})
+  #
+  # The optional +options+ argument is a +Hash+. Currently the only supported
+  # option is +:null_object+. Setting this to true instructs the mock to ignore
+  # any messages it hasn’t been told to expect – and quietly return itself. For example:
+  #
+  #   mock("person", :null_object => true)
+  #
+  # == Creating a Stub
+  #
+  # You can create a stub in any specification (or setup) using:
+  #
+  #   stub(name, stub_methods_and_values_hash)
+  #
+  # For example, if you wanted to create an object that always returns
+  # "More?!?!?!" to "please_sir_may_i_have_some_more" you would do this:
+  #
+  #   stub("Mr Sykes", :please_sir_may_i_have_some_more => "More?!?!?!")
+  #
+  # == Creating a Partial Mock
+  #
+  # You don't really "create" a partial mock, you simply add method stubs and/or
+  # mock expectations to existing classes and objects:
+  #
+  #   Factory.should_receive(:find).with(id).and_return(value)
+  #   obj.stub!(:to_i).and_return(3)
+  #   etc ...
+  #
+  # == Expecting Messages
+  #
+  #   my_mock.should_receive(:sym)
+  #   my_mock.should_not_receive(:sym)
+  #   
+  # == Expecting Arguments
+  #
+  #   my_mock.should_receive(:sym).with(*args)
+  #   my_mock.should_not_receive(:sym).with(*args)
+  #
+  # == Argument Constraints using Expression Matchers
+  #
+  # Arguments that are passed to #with are compared with actual arguments received
+  # using == by default. In cases in which you want to specify things about the arguments
+  # rather than the arguments themselves, you can use any of the Expression Matchers.
+  # They don't all make syntactic sense (they were primarily designed for use with
+  # Spec::Expectations), but you are free to create your own custom Spec::Matchers.
+  #
+  # Spec::Mocks does provide one additional Matcher method named #ducktype.
+  #
+  # In addition, Spec::Mocks adds some keyword Symbols that you can use to
+  # specify certain kinds of arguments:
+  #
+  #   my_mock.should_receive(:sym).with(no_args())
+  #   my_mock.should_receive(:sym).with(any_args())
+  #   my_mock.should_receive(:sym).with(1, an_instance_of(Numeric), "b") #2nd argument can any type of Numeric
+  #   my_mock.should_receive(:sym).with(1, boolean(), "b") #2nd argument can true or false
+  #   my_mock.should_receive(:sym).with(1, /abc/, "b") #2nd argument can be any String matching the submitted Regexp
+  #   my_mock.should_receive(:sym).with(1, anything(), "b") #2nd argument can be anything at all
+  #   my_mock.should_receive(:sym).with(1, ducktype(:abs, :div), "b")
+  #                            #2nd argument can be object that responds to #abs and #div
+  #                                                                       
+  # == Receive Counts
+  #
+  #   my_mock.should_receive(:sym).once
+  #   my_mock.should_receive(:sym).twice
+  #   my_mock.should_receive(:sym).exactly(n).times
+  #   my_mock.should_receive(:sym).at_least(:once)
+  #   my_mock.should_receive(:sym).at_least(:twice)
+  #   my_mock.should_receive(:sym).at_least(n).times
+  #   my_mock.should_receive(:sym).at_most(:once)
+  #   my_mock.should_receive(:sym).at_most(:twice)
+  #   my_mock.should_receive(:sym).at_most(n).times
+  #   my_mock.should_receive(:sym).any_number_of_times
+  #
+  # == Ordering
+  #
+  #   my_mock.should_receive(:sym).ordered
+  #   my_mock.should_receive(:other_sym).ordered
+  #     #This will fail if the messages are received out of order
+  #
+  # == Setting Reponses
+  #
+  # Whether you are setting a mock expectation or a simple stub, you can tell the
+  # object precisely how to respond:
+  #
+  #   my_mock.should_receive(:sym).and_return(value)
+  #   my_mock.should_receive(:sym).exactly(3).times.and_return(value1, value2, value3)
+  #     # returns value1 the first time, value2 the second, etc
+  #   my_mock.should_receive(:sym).and_return { ... } #returns value returned by the block
+  #   my_mock.should_receive(:sym).and_raise(error)
+  #     #error can be an instantiated object or a class
+  #     #if it is a class, it must be instantiable with no args
+  #   my_mock.should_receive(:sym).and_throw(:sym)
+  #   my_mock.should_receive(:sym).and_yield(values,to,yield)
+  #   my_mock.should_receive(:sym).and_yield(values,to,yield).and_yield(some,other,values,this,time)
+  #     # for methods that yield to a block multiple times
+  #
+  # Any of these responses can be applied to a stub as well, but stubs do
+  # not support any qualifiers about the message received (i.e. you can't specify arguments
+  # or receive counts):
+  #
+  #   my_mock.stub!(:sym).and_return(value)
+  #   my_mock.stub!(:sym).and_return(value1, value2, value3)
+  #   my_mock.stub!(:sym).and_raise(error)
+  #   my_mock.stub!(:sym).and_throw(:sym)
+  #   my_mock.stub!(:sym).and_yield(values,to,yield)
+  #   my_mock.stub!(:sym).and_yield(values,to,yield).and_yield(some,other,values,this,time)
+  #
+  # == Arbitrary Handling
+  #
+  # Once in a while you'll find that the available expectations don't solve the
+  # particular problem you are trying to solve. Imagine that you expect the message
+  # to come with an Array argument that has a specific length, but you don't care
+  # what is in it. You could do this:
+  #
+  #   my_mock.should_receive(:sym) do |arg|
+  #     arg.should be_an_istance_of(Array)
+  #     arg.length.should == 7
+  #   end
+  #
+  # Note that this would fail if the number of arguments received was different from
+  # the number of block arguments (in this case 1).
+  #
+  # == Combining Expectation Details
+  #
+  # Combining the message name with specific arguments, receive counts and responses
+  # you can get quite a bit of detail in your expectations:
+  #
+  #   my_mock.should_receive(:<<).with("illegal value").once.and_raise(ArgumentError)
+  module Mocks
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/rake/spectask.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/rake/spectask.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/rake/spectask.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/rake/spectask.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,224 @@
+#!/usr/bin/env ruby
+
+# Define a task library for running RSpec contexts.
+
+require 'rake'
+require 'rake/tasklib'
+
+module Spec
+  module Rake
+
+    # A Rake task that runs a set of specs.
+    #
+    # Example:
+    #  
+    #   Spec::Rake::SpecTask.new do |t|
+    #     t.warning = true
+    #     t.rcov = true
+    #   end
+    #
+    # This will create a task that can be run with:
+    #
+    #   rake spec
+    #
+    # If rake is invoked with a "SPEC=filename" command line option,
+    # then the list of spec files will be overridden to include only the
+    # filename specified on the command line.  This provides an easy way
+    # to run just one spec.
+    #
+    # If rake is invoked with a "SPEC_OPTS=options" command line option,
+    # then the given options will override the value of the +spec_opts+
+    # attribute.
+    #
+    # If rake is invoked with a "RCOV_OPTS=options" command line option,
+    # then the given options will override the value of the +rcov_opts+
+    # attribute.
+    #
+    # Examples:
+    #
+    #   rake spec                                      # run specs normally
+    #   rake spec SPEC=just_one_file.rb                # run just one spec file.
+    #   rake spec SPEC_OPTS="--diff"                   # enable diffing
+    #   rake spec RCOV_OPTS="--aggregate myfile.txt"   # see rcov --help for details
+    #
+    # Each attribute of this task may be a proc. This allows for lazy evaluation,
+    # which is sometimes handy if you want to defer the evaluation of an attribute value
+    # until the task is run (as opposed to when it is defined).
+    class SpecTask < ::Rake::TaskLib
+      class << self
+        def attr_accessor(*names)
+          super(*names)
+          names.each do |name|
+            module_eval "def #{name}() evaluate(@#{name}) end" # Allows use of procs
+          end
+        end
+      end
+
+      # Name of spec task. (default is :spec)
+      attr_accessor :name
+
+      # Array of directories to be added to $LOAD_PATH before running the
+      # specs. Defaults to ['<the absolute path to RSpec's lib directory>']
+      attr_accessor :libs
+
+      # If true, requests that the specs be run with the warning flag set.
+      # E.g. warning=true implies "ruby -w" used to run the specs. Defaults to false.
+      attr_accessor :warning
+
+      # Glob pattern to match spec files. (default is 'spec/**/*_spec.rb')
+      # Setting the SPEC environment variable overrides this.
+      attr_accessor :pattern
+
+      # Array of commandline options to pass to RSpec. Defaults to [].
+      # Setting the SPEC_OPTS environment variable overrides this.
+      attr_accessor :spec_opts
+
+      # Whether or not to use RCov (default is false)
+      # See http://eigenclass.org/hiki.rb?rcov
+      attr_accessor :rcov
+      
+      # Array of commandline options to pass to RCov. Defaults to ['--exclude', 'lib\/spec,bin\/spec'].
+      # Ignored if rcov=false
+      # Setting the RCOV_OPTS environment variable overrides this.
+      attr_accessor :rcov_opts
+
+      # Directory where the RCov report is written. Defaults to "coverage"
+      # Ignored if rcov=false
+      attr_accessor :rcov_dir
+
+      # Array of commandline options to pass to ruby. Defaults to [].
+      attr_accessor :ruby_opts
+
+      # Whether or not to fail Rake when an error occurs (typically when specs fail).
+      # Defaults to true.
+      attr_accessor :fail_on_error
+
+      # A message to print to stderr when there are failures.
+      attr_accessor :failure_message
+
+      # Where RSpec's output is written. Defaults to STDOUT.
+      # DEPRECATED. Use --format FORMAT:WHERE in spec_opts.
+      attr_accessor :out
+
+      # Explicitly define the list of spec files to be included in a
+      # spec.  +spec_files+ is expected to be an array of file names (a
+      # FileList is acceptable).  If both +pattern+ and +spec_files+ are
+      # used, then the list of spec files is the union of the two.
+      # Setting the SPEC environment variable overrides this.
+      attr_accessor :spec_files
+      
+      # Use verbose output. If this is set to true, the task will print
+      # the executed spec command to stdout. Defaults to false.
+      attr_accessor :verbose
+
+      # Defines a new task, using the name +name+.
+      def initialize(name=:spec)
+        @name = name
+        @libs = [File.expand_path(File.dirname(__FILE__) + '/../../../lib')]
+        @pattern = nil
+        @spec_files = nil
+        @spec_opts = []
+        @warning = false
+        @ruby_opts = []
+        @fail_on_error = true
+        @rcov = false
+        @rcov_opts = ['--exclude', 'lib\/spec,bin\/spec,config\/boot.rb']
+        @rcov_dir = "coverage"
+
+        yield self if block_given?
+        @pattern = 'spec/**/*_spec.rb' if pattern.nil? && spec_files.nil?
+        define
+      end
+
+      def define # :nodoc:
+        spec_script = File.expand_path(File.dirname(__FILE__) + '/../../../bin/spec')
+
+        lib_path = libs.join(File::PATH_SEPARATOR)
+        actual_name = Hash === name ? name.keys.first : name
+        unless ::Rake.application.last_comment
+          desc "Run specs" + (rcov ? " using RCov" : "")
+        end
+        task name do
+          RakeFileUtils.verbose(verbose) do
+            unless spec_file_list.empty?
+              # ruby [ruby_opts] -Ilib -S rcov [rcov_opts] bin/spec -- examples [spec_opts]
+              # or
+              # ruby [ruby_opts] -Ilib bin/spec examples [spec_opts]
+              cmd = "ruby "
+
+              rb_opts = ruby_opts.clone
+              rb_opts << "-I\"#{lib_path}\""
+              rb_opts << "-S rcov" if rcov
+              rb_opts << "-w" if warning
+              cmd << rb_opts.join(" ")
+              cmd << " "
+              cmd << rcov_option_list
+              cmd << %[ -o "#{rcov_dir}" ] if rcov
+              cmd << %Q|"#{spec_script}"|
+              cmd << " "
+              cmd << "-- " if rcov
+              cmd << spec_file_list.collect { |fn| %["#{fn}"] }.join(' ')
+              cmd << " "
+              cmd << spec_option_list
+              if out
+                cmd << " "
+                cmd << %Q| > "#{out}"|
+                STDERR.puts "The Spec::Rake::SpecTask#out attribute is DEPRECATED and will be removed in a future version. Use --format FORMAT:WHERE instead."
+              end
+              if verbose
+                puts cmd
+              end
+              unless system(cmd)
+                STDERR.puts failure_message if failure_message
+                raise("Command #{cmd} failed") if fail_on_error
+              end
+            end
+          end
+        end
+
+        if rcov
+          desc "Remove rcov products for #{actual_name}"
+          task paste("clobber_", actual_name) do
+            rm_r rcov_dir rescue nil
+          end
+
+          clobber_task = paste("clobber_", actual_name)
+          task :clobber => [clobber_task]
+
+          task actual_name => clobber_task
+        end
+        self
+      end
+
+      def rcov_option_list # :nodoc:
+        return "" unless rcov
+        ENV['RCOV_OPTS'] || rcov_opts.join(" ") || ""
+      end
+
+      def spec_option_list # :nodoc:
+        STDERR.puts "RSPECOPTS is DEPRECATED and will be removed in a future version. Use SPEC_OPTS instead." if ENV['RSPECOPTS']
+        ENV['SPEC_OPTS'] || ENV['RSPECOPTS'] || spec_opts.join(" ") || ""
+      end
+      
+      def evaluate(o) # :nodoc:
+        case o
+          when Proc then o.call
+          else o
+        end
+      end
+
+      def spec_file_list # :nodoc:
+        if ENV['SPEC']
+          FileList[ ENV['SPEC'] ]
+        else
+          result = []
+          result += spec_files.to_a if spec_files
+          result += FileList[ pattern ].to_a if pattern
+          FileList[result]
+        end
+      end
+
+    end
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+module RCov
+  # A task that can verify that the RCov coverage doesn't
+  # drop below a certain threshold. It should be run after
+  # running Spec::Rake::SpecTask.
+  class VerifyTask < Rake::TaskLib
+    # Name of the task. Defaults to :verify_rcov
+    attr_accessor :name
+    
+    # Path to the index.html file generated by RCov, which
+    # is the file containing the total coverage.
+    # Defaults to 'coverage/index.html'
+    attr_accessor :index_html
+    
+    # Whether or not to output details. Defaults to true.
+    attr_accessor :verbose
+    
+    # The threshold value (in percent) for coverage. If the 
+    # actual coverage is not equal to this value, the task will raise an 
+    # exception. 
+    attr_accessor :threshold
+    
+    # Require the threshold value be met exactly.  This is the default.
+    attr_accessor :require_exact_threshold
+    
+    def initialize(name=:verify_rcov)
+      @name = name
+      @index_html = 'coverage/index.html'
+      @verbose = true
+      @require_exact_threshold = true
+      yield self if block_given?
+      raise "Threshold must be set" if @threshold.nil?
+      define
+    end
+    
+    def define
+      desc "Verify that rcov coverage is at least #{threshold}%"
+      task @name do
+        total_coverage = nil
+
+        File.open(index_html).each_line do |line|
+          if line =~ /<tt.*>(\d+\.\d+)%<\/tt>&nbsp;<\/td>/
+            total_coverage = eval($1)
+            break
+          end
+        end
+        puts "Coverage: #{total_coverage}% (threshold: #{threshold}%)" if verbose
+        raise "Coverage must be at least #{threshold}% but was #{total_coverage}%" if total_coverage < threshold
+        raise "Coverage has increased above the threshold of #{threshold}% to #{total_coverage}%. You should update your threshold value." if (total_coverage > threshold) and require_exact_threshold
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,57 @@
+module Spec
+  module Runner
+    class BacktraceTweaker
+      def clean_up_double_slashes(line)
+        line.gsub!('//','/')
+      end
+    end
+
+    class NoisyBacktraceTweaker < BacktraceTweaker
+      def tweak_backtrace(error, spec_name)
+        return if error.backtrace.nil?
+        error.backtrace.each do |line|
+          clean_up_double_slashes(line)
+        end
+      end
+    end
+
+    # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
+    class QuietBacktraceTweaker < BacktraceTweaker
+      unless defined?(IGNORE_PATTERNS)
+        root_dir = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+        spec_files = Dir["#{root_dir}/lib/spec/*"].map do |path| 
+          subpath = path[root_dir.length..-1]
+          /#{subpath}/
+        end
+        IGNORE_PATTERNS = spec_files + [
+          /\/lib\/ruby\//,
+          /bin\/spec:/,
+          /bin\/rcov:/,
+          /lib\/rspec_on_rails/,
+          /vendor\/rails/,
+          # TextMate's Ruby and RSpec plugins
+          /Ruby\.tmbundle\/Support\/tmruby.rb:/,
+          /RSpec\.tmbundle\/Support\/lib/,
+          /temp_textmate\./,
+          /mock_frameworks\/rspec/,
+          /spec_server/
+        ]
+      end
+      
+      def tweak_backtrace(error, spec_name)
+        return if error.backtrace.nil?
+        error.backtrace.collect! do |line|
+          clean_up_double_slashes(line)
+          IGNORE_PATTERNS.each do |ignore|
+            if line =~ ignore
+              line = nil
+              break
+            end
+          end
+          line
+        end
+        error.backtrace.compact!
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/class_and_arguments_parser.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/class_and_arguments_parser.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/class_and_arguments_parser.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/class_and_arguments_parser.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+module Spec
+  module Runner
+    class ClassAndArgumentsParser
+      class << self
+        def parse(s)
+          if s =~ /([a-zA-Z_]+(?:::[a-zA-Z_]+)*):?(.*)/
+            arg = $2 == "" ? nil : $2
+            [$1, arg]
+          else
+            raise "Couldn't parse #{s.inspect}"
+          end
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/command_line.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/command_line.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/command_line.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/command_line.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,28 @@
+require 'spec/runner/option_parser'
+
+module Spec
+  module Runner
+    # Facade to run specs without having to fork a new ruby process (using `spec ...`)
+    class CommandLine
+      class << self
+        # Runs specs. +argv+ is the commandline args as per the spec commandline API, +err+
+        # and +out+ are the streams output will be written to.
+        def run(instance_rspec_options)
+          # NOTE - this call to init_rspec_options is not spec'd, but neither is any of this
+          # swapping of $rspec_options. That is all here to enable rspec to run against itself
+          # and maintain coverage in a single process. Therefore, DO NOT mess with this stuff
+          # unless you know what you are doing!
+          init_rspec_options(instance_rspec_options)
+          orig_rspec_options = rspec_options
+          begin
+            $rspec_options = instance_rspec_options
+            return $rspec_options.run_examples
+          ensure
+            ::Spec.run = true
+            $rspec_options = orig_rspec_options
+          end
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+require "drb/drb"
+
+module Spec
+  module Runner
+    # Facade to run specs by connecting to a DRB server
+    class DrbCommandLine
+      # Runs specs on a DRB server. Note that this API is similar to that of
+      # CommandLine - making it possible for clients to use both interchangeably.
+      def self.run(options)
+        begin
+          DRb.start_service
+          spec_server = DRbObject.new_with_uri("druby://localhost:8989")
+          spec_server.run(options.argv, options.error_stream, options.output_stream)
+        rescue DRb::DRbConnError => e
+          options.error_stream.puts "No server is running"
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,59 @@
+module Spec
+  module Runner
+    class ExampleGroupRunner
+      def initialize(options)
+        @options = options
+      end
+
+      def load_files(files)
+        # It's important that loading files (or choosing not to) stays the
+        # responsibility of the BehaviourRunner. Some implementations (like)
+        # the one using DRb may choose *not* to load files, but instead tell
+        # someone else to do it over the wire.
+        files.each do |file|
+          load file
+        end
+      end
+
+      def run
+        prepare
+        success = true
+        example_groups.each do |example_group|
+          success = success & example_group.suite.run
+        end
+        return success
+      ensure
+        finish
+      end
+
+      protected
+      def prepare
+        reporter.start(number_of_examples)
+        example_groups.reverse! if reverse
+      end
+
+      def finish
+        reporter.end
+        reporter.dump
+      end
+
+      def reporter
+        @options.reporter
+      end
+
+      def reverse
+        @options.reverse
+      end
+
+      def example_groups
+        @options.example_groups
+      end
+
+      def number_of_examples
+        @options.number_of_examples
+      end
+    end
+    # TODO: BT - Deprecate BehaviourRunner?
+    BehaviourRunner = ExampleGroupRunner
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/extensions/object.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/extensions/object.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/extensions/object.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/extensions/object.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,32 @@
+# The following copyright applies to Object#copy_instance_variables_from,
+# which we borrowed from active_support.
+#
+# Copyright (c) 2004 David Heinemeier Hansson
+# 
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+class Object
+  # From active_support
+  def copy_instance_variables_from(object, exclude = []) # :nodoc:
+    exclude += object.protected_instance_variables if object.respond_to? :protected_instance_variables
+    
+    instance_variables = object.instance_variables - exclude.map { |name| name.to_s }
+    instance_variables.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,77 @@
+module Spec
+  module Runner
+    module Formatter
+      # Baseclass for formatters that implements all required methods as no-ops. 
+      class BaseFormatter
+        def initialize(options, where)
+          @options = options
+          @where = where
+        end
+        
+        # This method is invoked before any examples are run, right after
+        # they have all been collected. This can be useful for special
+        # formatters that need to provide progress on feedback (graphical ones)
+        #
+        # This method will only be invoked once, and the next one to be invoked
+        # is #add_example_group
+        def start(example_count)
+        end
+
+        # This method is invoked at the beginning of the execution of each behaviour.
+        # +name+ is the name of the behaviour and +first+ is true if it is the
+        # first behaviour - otherwise it's false.
+        #
+        # The next method to be invoked after this is #example_failed or #example_finished
+        def add_example_group(name)
+        end
+
+        # This method is invoked when an +example+ starts.
+        def example_started(example)
+        end
+
+        # This method is invoked when an +example+ passes.
+        def example_passed(example)
+        end
+
+        # This method is invoked when an +example+ fails, i.e. an exception occurred
+        # inside it (such as a failed should or other exception). +counter+ is the 
+        # sequence number of the failure (starting at 1) and +failure+ is the associated 
+        # Failure object.
+        def example_failed(example, counter, failure)
+        end
+        
+        # This method is invoked when an example is not yet implemented (i.e. has not
+        # been provided a block), or when an ExamplePendingError is raised.
+        # +name+ is the name of the example.
+        # +message+ is the message from the ExamplePendingError, if it exists, or the
+        # default value of "Not Yet Implemented"
+        def example_pending(behaviour_name, example_name, message)
+        end
+
+        # This method is invoked after all of the examples have executed. The next method
+        # to be invoked after this one is #dump_failure (once for each failed example),
+        def start_dump
+        end
+
+        # Dumps detailed information about an example failure.
+        # This method is invoked for each failed example after all examples have run. +counter+ is the sequence number
+        # of the associated example. +failure+ is a Failure object, which contains detailed
+        # information about the failure.
+        def dump_failure(counter, failure)
+        end
+      
+        # This method is invoked after the dumping of examples and failures.
+        def dump_summary(duration, example_count, failure_count, pending_count)
+        end
+        
+        # This gets invoked after the summary if option is set to do so.
+        def dump_pending
+        end
+
+        # This method is invoked at the very end. Allows the formatter to clean up, like closing open streams.
+        def close
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,128 @@
+module Spec
+  module Runner
+    module Formatter
+      # Baseclass for text-based formatters. Can in fact be used for
+      # non-text based ones too - just ignore the +output+ constructor
+      # argument.
+      class BaseTextFormatter < BaseFormatter
+        # Creates a new instance that will write to +where+. If +where+ is a
+        # String, output will be written to the File with that name, otherwise
+        # +where+ is exected to be an IO (or an object that responds to #puts and #write).
+        def initialize(options, where)
+          super
+          if where.is_a?(String)
+            @output = File.open(where, 'w')
+          elsif where == STDOUT
+            @output = Kernel
+            def @output.flush
+              STDOUT.flush
+            end
+          else
+            @output = where
+          end
+          @snippet_extractor = SnippetExtractor.new
+          @pending_examples = []
+        end
+        
+        def example_pending(behaviour_name, example_name, message)
+          @pending_examples << ["#{behaviour_name} #{example_name}", message]
+        end
+        
+        def dump_failure(counter, failure)
+          @output.puts
+          @output.puts "#{counter.to_s})"
+          @output.puts colourise("#{failure.header}\n#{failure.exception.message}", failure)
+          @output.puts format_backtrace(failure.exception.backtrace)
+          @output.flush
+        end
+        
+        def colourise(s, failure)
+          if(failure.expectation_not_met?)
+            red(s)
+          elsif(failure.pending_fixed?)
+            blue(s)
+          else
+            magenta(s)
+          end
+        end
+      
+        def dump_summary(duration, example_count, failure_count, pending_count)
+          return if dry_run?
+          @output.puts
+          @output.puts "Finished in #{duration} seconds"
+          @output.puts
+
+          summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+          summary << ", #{pending_count} pending" if pending_count > 0  
+
+          if failure_count == 0
+            if pending_count > 0
+              @output.puts yellow(summary)
+            else
+              @output.puts green(summary)
+            end
+          else
+            @output.puts red(summary)
+          end
+          @output.flush
+        end
+
+        def dump_pending
+          unless @pending_examples.empty?
+            @output.puts
+            @output.puts "Pending:"
+            @pending_examples.each do |pending_example|
+              @output.puts "#{pending_example[0]} (#{pending_example[1]})" 
+            end
+          end
+          @output.flush
+        end
+        
+        def close
+          if IO === @output
+            @output.close 
+          end
+        end
+        
+        def format_backtrace(backtrace)
+          return "" if backtrace.nil?
+          backtrace.map { |line| backtrace_line(line) }.join("\n")
+        end
+      
+      protected
+
+        def colour?
+          @options.colour ? true : false
+        end
+
+        def dry_run?
+          @options.dry_run ? true : false
+        end
+        
+        def backtrace_line(line)
+          line.sub(/\A([^:]+:\d+)$/, '\\1:')
+        end
+
+        def colour(text, colour_code)
+          return text unless colour? && output_to_tty?
+          "#{colour_code}#{text}\e[0m"
+        end
+
+        def output_to_tty?
+          begin
+            @output == Kernel || @output.tty?
+          rescue NoMethodError
+            false
+          end
+        end
+        
+        def green(text); colour(text, "\e[32m"); end
+        def red(text); colour(text, "\e[31m"); end
+        def magenta(text); colour(text, "\e[35m"); end
+        def yellow(text); colour(text, "\e[33m"); end
+        def blue(text); colour(text, "\e[34m"); end
+        
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/failing_behaviours_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/failing_behaviours_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/failing_behaviours_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/failing_behaviours_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+module Spec
+  module Runner
+    module Formatter
+      class FailingBehavioursFormatter < BaseTextFormatter      
+        def add_example_group(behaviour_name)
+          if behaviour_name =~ /(.*) \(druby.*\)$/
+            @behaviour_name = $1
+          else
+            @behaviour_name = behaviour_name
+          end
+        end
+      
+        def example_failed(example, counter, failure)
+          unless @behaviour_name.nil?
+            @output.puts @behaviour_name 
+            @behaviour_name = nil
+            @output.flush
+          end
+        end
+
+        def dump_failure(counter, failure)
+        end
+
+        def dump_summary(duration, example_count, failure_count, pending_count)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+module Spec
+  module Runner
+    module Formatter
+      class FailingExamplesFormatter < BaseTextFormatter      
+        def add_example_group(behaviour_name)
+          @behaviour_name = behaviour_name
+        end
+      
+        def example_failed(example, counter, failure)
+          @output.puts "#{@behaviour_name} #{example.description}"
+          @output.flush
+        end
+
+        def dump_failure(counter, failure)
+        end
+
+        def dump_summary(duration, example_count, failure_count, pending_count)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,329 @@
+require 'erb'
+
+module Spec
+  module Runner
+    module Formatter
+      class HtmlFormatter < BaseTextFormatter
+        include ERB::Util # for the #h method
+        
+        def initialize(options, output)
+          super
+          @current_behaviour_number = 0
+          @current_example_number = 0
+        end
+
+        # The number of the currently running behaviour
+        def current_behaviour_number
+          @current_behaviour_number
+        end
+        
+        # The number of the currently running example (a global counter)
+        def current_example_number
+          @current_example_number
+        end
+        
+        def start(example_count)
+          @example_count = example_count
+
+          @output.puts html_header
+          @output.puts report_header
+          @output.flush
+        end
+
+        def add_example_group(name)
+          @behaviour_red = false
+          @behaviour_red = false
+          @current_behaviour_number += 1
+          unless current_behaviour_number == 1
+            @output.puts "  </dl>"
+            @output.puts "</div>"
+          end
+          @output.puts "<div class=\"behaviour\">"
+          @output.puts "  <dl>"
+          @output.puts "  <dt id=\"behaviour_#{current_behaviour_number}\">#{h(name)}</dt>"
+          @output.flush
+        end
+
+        def start_dump
+          @output.puts "  </dl>"
+          @output.puts "</div>"
+          @output.flush
+        end
+
+        def example_started(example)
+          @current_example_number += 1
+        end
+
+        def example_passed(example)
+          move_progress
+          @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{h(example.description)}</span></dd>"
+          @output.flush
+        end
+
+        def example_failed(example, counter, failure)
+          extra = extra_failure_content(failure)
+          failure_style = failure.pending_fixed? ? 'pending_fixed' : 'failed'
+          @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
+          @header_red = true
+          @output.puts "    <script type=\"text/javascript\">makeRed('behaviour_#{current_behaviour_number}');</script>" unless @behaviour_red
+          @behaviour_red = true
+          move_progress
+          @output.puts "    <dd class=\"spec #{failure_style}\">"
+          @output.puts "      <span class=\"failed_spec_name\">#{h(example.description)}</span>"
+          @output.puts "      <div class=\"failure\" id=\"failure_#{counter}\">"
+          @output.puts "        <div class=\"message\"><pre>#{h(failure.exception.message)}</pre></div>" unless failure.exception.nil?
+          @output.puts "        <div class=\"backtrace\"><pre>#{format_backtrace(failure.exception.backtrace)}</pre></div>" unless failure.exception.nil?
+          @output.puts extra unless extra == ""
+          @output.puts "      </div>"
+          @output.puts "    </dd>"
+          @output.flush
+        end
+
+        def example_pending(behaviour_name, example_name, message)
+          @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
+          @output.puts "    <script type=\"text/javascript\">makeYellow('behaviour_#{current_behaviour_number}');</script>" unless @behaviour_red
+          move_progress
+          @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{h(example_name)} (PENDING: #{h(message)})</span></dd>"
+          @output.flush
+        end
+
+        # Override this method if you wish to output extra HTML for a failed spec. For example, you
+        # could output links to images or other files produced during the specs.
+        #
+        def extra_failure_content(failure)
+          "    <pre class=\"ruby\"><code>#{@snippet_extractor.snippet(failure.exception)}</code></pre>"
+        end
+        
+        def move_progress
+          @output.puts "    <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
+          @output.flush
+        end
+
+        def percent_done
+          result = 100.0
+          if @example_count != 0
+            result = ((current_example_number).to_f / @example_count.to_f * 1000).to_i / 10.0
+          end
+          result
+        end
+
+        def dump_failure(counter, failure)
+        end
+
+        def dump_summary(duration, example_count, failure_count, pending_count)
+          if dry_run?
+            totals = "This was a dry-run"
+          else
+            totals = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+            totals << ", #{pending_count} pending" if pending_count > 0  
+          end
+          @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{duration} seconds</strong>\";</script>"
+          @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
+          @output.puts "</div>"
+          @output.puts "</div>"
+          @output.puts "</body>"
+          @output.puts "</html>"
+          @output.flush
+        end
+
+        def html_header 
+          <<-EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+</head>
+<body>
+EOF
+        end
+
+        def report_header
+          <<-EOF
+<div class="rspec-report">
+  <script type="text/javascript">
+    // <![CDATA[
+#{global_scripts}
+    // ]]>
+  </script>
+  <style type="text/css">
+#{global_styles}
+  </style>
+
+<div id="rspec-header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+EOF
+        end
+
+        def global_scripts
+          <<-EOF
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+EOF
+        end
+        
+        def global_styles
+          <<-EOF
+#rspec-header {
+  background: #65C400; color: #fff;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.behaviour {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+EOF
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,45 @@
+module Spec
+  module Runner
+    module Formatter
+      class ProfileFormatter < ProgressBarFormatter
+        
+        def initialize(options, where)
+          super
+          @examples = []
+        end
+        
+        def start(count)
+          @output.puts "Profiling enabled."
+        end
+        
+        def add_example_group(example)
+          @behaviour = example
+        end
+        
+        def example_started(example)
+          @time = Time.now
+        end
+        
+        def example_passed(example)
+          super
+          @examples << [@behaviour, example, Time.now - @time]
+        end
+        
+        def start_dump
+          super
+          @output.puts "\n\nTop 10 slowest examples:\n"
+          
+          @examples = @examples.sort_by do |b, e, t|
+            t
+          end.reverse
+          
+          @examples[0..9].each do |e|
+            @output.print red(sprintf("%.7f", e[2]))
+            @output.puts " #{e[0]} #{e[1]}"
+          end
+          @output.flush
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+module Spec
+  module Runner
+    module Formatter
+      class ProgressBarFormatter < BaseTextFormatter
+        def add_example_group(name)
+        end
+      
+        def example_failed(example, counter, failure)
+          @output.print colourise('F', failure)
+          @output.flush
+        end
+
+        def example_passed(example)
+          @output.print green('.')
+          @output.flush
+        end
+      
+        def example_pending(behaviour_name, example_name, message)
+          super
+          @output.print yellow('P')
+          @output.flush
+        end
+        
+        def start_dump
+          @output.puts
+          @output.flush
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+module Spec
+  module Runner
+    module Formatter
+      # This class extracts code snippets by looking at the backtrace of the passed error
+      class SnippetExtractor #:nodoc:
+        class NullConverter; def convert(code, pre); code; end; end #:nodoc:
+        begin; require 'rubygems'; require 'syntax/convertors/html'; @@converter = Syntax::Convertors::HTML.for_syntax "ruby"; rescue LoadError => e; @@converter = NullConverter.new; end
+        
+        def snippet(error)
+          raw_code, line = snippet_for(error.backtrace[0])
+          highlighted = @@converter.convert(raw_code, false)
+          highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter)
+          post_process(highlighted, line)
+        end
+        
+        def snippet_for(error_line)
+          if error_line =~ /(.*):(\d+)/
+            file = $1
+            line = $2.to_i
+            [lines_around(file, line), line]
+          else
+            ["# Couldn't get snippet for #{error_line}", 1]
+          end
+        end
+        
+        def lines_around(file, line)
+          if File.file?(file)
+            lines = File.open(file).read.split("\n")
+            min = [0, line-3].max
+            max = [line+1, lines.length-1].min
+            selected_lines = []
+            selected_lines.join("\n")
+            lines[min..max].join("\n")
+          else
+            "# Couldn't get snippet for #{file}"
+          end
+        end
+        
+        def post_process(highlighted, offending_line)
+          new_lines = []
+          highlighted.split("\n").each_with_index do |line, i|
+            new_line = "<span class=\"linenum\">#{offending_line+i-2}</span>#{line}"
+            new_line = "<span class=\"offending\">#{new_line}</span>" if i == 2
+            new_lines << new_line
+          end
+          new_lines.join("\n")
+        end
+        
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,36 @@
+module Spec
+  module Runner
+    module Formatter
+      class SpecdocFormatter < BaseTextFormatter      
+        def add_example_group(name)
+          @output.puts
+          @output.puts name
+          @output.flush
+        end
+      
+        def example_failed(example, counter, failure)
+          message = if failure.expectation_not_met?
+            "- #{example.description} (FAILED - #{counter})"
+          else
+            "- #{example.description} (ERROR - #{counter})"
+          end
+          
+          @output.puts(failure.expectation_not_met? ? red(message) : magenta(message))
+          @output.flush
+        end
+        
+        def example_passed(example)
+          message = "- #{example.description}"
+          @output.puts green(message)
+          @output.flush
+        end
+        
+        def example_pending(behaviour_name, example_name, message)
+          super
+          @output.puts yellow("- #{example_name} (PENDING: #{message})")
+          @output.flush
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,123 @@
+require 'erb'
+
+module Spec
+  module Runner
+    module Formatter
+      module Story
+        class HtmlFormatter < BaseTextFormatter
+          include ERB::Util
+          
+          def run_started(count)
+            @output.puts <<-EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <title>Stories</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Expires" content="-1" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <script src="javascripts/prototype.js" type="text/javascript"></script>
+    <script src="javascripts/scriptaculous.js" type="text/javascript"></script>
+    <script src="javascripts/application.js" type="text/javascript"></script>
+    <link href="stylesheets/style.css" rel="stylesheet" type="text/css" />
+  </head>
+  <body>
+    <div id="container">
+EOF
+          end
+
+          def collected_steps(steps)
+            unless steps.empty?
+              @output.puts "      <ul id=\"stock_steps\" style=\"display: none;\">"
+              steps.each do |step|
+                @output.puts "        <li>#{step}</li>"
+              end
+              @output.puts "      </ul>"
+            end
+          end
+
+          def run_ended
+            @output.puts <<-EOF
+    </div>
+  </body>
+</head>
+EOF
+          end
+          
+          def story_started(title, narrative)
+            @output.puts <<-EOF
+      <dl class="story passed">
+        <dt>#{h title}</dt>
+        <dd>
+          <p>
+            #{h(narrative).split("\n").join("<br />")}
+          </p>
+EOF
+          end
+
+          def story_ended(title, narrative)
+            @output.puts <<-EOF
+        </dd>
+      </dl>
+EOF
+          end
+
+          def scenario_started(story_title, scenario_name)
+            @output.puts <<-EOF
+          <dl class="passed">
+            <dt>#{h scenario_name}</dt>
+            <dd>
+              <ul class="steps">
+EOF
+          end
+
+          def scenario_ended
+            @output.puts <<-EOF
+              </ul>
+            </dd>
+          </dl>
+EOF
+          end
+          
+          def found_scenario(type, description)
+          end
+
+          def scenario_succeeded(story_title, scenario_name)
+            scenario_ended
+          end
+
+          def scenario_pending(story_title, scenario_name, reason)
+            scenario_ended
+          end
+
+          def scenario_failed(story_title, scenario_name, err)
+            scenario_ended
+          end
+
+          def step_succeeded(type, description, *args)
+            print_step('passed', type, description, *args) # TODO: uses succeeded CSS class
+          end
+
+          def step_pending(type, description, *args)
+            print_step('pending', type, description, *args)
+          end
+
+          def step_failed(type, description, *args)
+            print_step('failed', type, description, *args)
+          end
+          
+          def print_step(klass, type, description, *args)
+            spans = args.map { |arg| "<span class=\"param\">#{arg}</span>" }
+            i = -1
+            inner = type.to_s.capitalize + ' ' + description.gsub(::Spec::Story::Step::PARAM_PATTERN) { |param| spans[i+=1] }
+            @output.puts "                <li class=\"#{klass}\">#{inner}</li>"
+          end
+
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,117 @@
+module Spec
+  module Runner
+    module Formatter
+      module Story
+        class PlainTextFormatter < BaseTextFormatter
+          def initialize(options, where)
+            super
+            @successful_scenario_count = 0
+            @pending_scenario_count = 0
+            @failed_scenarios = []
+            @pending_steps = []
+            @previous_type = nil
+          end
+        
+          def run_started(count)
+            @count = count
+            @output.puts "Running #@count scenarios:\n"
+          end
+
+          def story_started(title, narrative)
+            @output.puts "Story: #{title}\n\n"
+            narrative.each_line do |line|
+              @output.print "  "
+              @output.print line
+            end
+          end
+        
+          def story_ended(title, narrative)
+            @output.puts
+            @output.puts
+          end
+
+          def scenario_started(story_title, scenario_name)
+            @scenario_already_failed = false
+            @output.print "\n\nScenario: #{scenario_name}"
+            @scenario_ok = true
+          end
+        
+          def scenario_succeeded(story_title, scenario_name)
+            @successful_scenario_count += 1
+          end
+        
+          def scenario_failed(story_title, scenario_name, err)
+            @failed_scenarios << [story_title, scenario_name, err] unless @scenario_already_failed
+            @scenario_already_failed = true
+          end
+        
+          def scenario_pending(story_title, scenario_name, msg)
+            @pending_steps << [story_title, scenario_name, msg]
+            @pending_scenario_count += 1 unless @scenario_already_failed
+            @scenario_already_failed = true
+          end
+        
+          def run_ended
+            @output.puts "\n\n#@count scenarios: #@successful_scenario_count succeeded, #{@failed_scenarios.size} failed, #@pending_scenario_count pending"
+            unless @pending_steps.empty?
+              @output.puts "\nPending Steps:"
+              @pending_steps.each_with_index do |pending, i|
+                title, scenario_name, msg = pending
+                @output.puts "#{i+1}) #{title} (#{scenario_name}): #{msg}"
+              end
+            end
+            unless @failed_scenarios.empty?
+              @output.print "\nFAILURES:"
+              @failed_scenarios.each_with_index do |failure, i|
+                title, scenario_name, err = failure
+                @output.print %[
+    #{i+1}) #{title} (#{scenario_name}) FAILED
+    #{err.class}: #{err.message}
+    #{err.backtrace.join("\n")}
+    ]
+              end
+            end
+          end
+        
+          def step_succeeded(type, description, *args)
+            found_step(type, description, false, *args)
+          end
+        
+          def step_pending(type, description, *args)
+            found_step(type, description, false, *args)
+            @output.print " (PENDING)"
+            @scenario_ok = false
+          end
+        
+          def step_failed(type, description, *args)
+            found_step(type, description, true, *args)
+            @output.print red(@scenario_ok ? " (FAILED)" : " (SKIPPED)")
+            @scenario_ok = false
+          end
+          
+          def collected_steps(steps)
+          end
+
+        private
+
+          def found_step(type, description, failed, *args)
+            text = if(type == @previous_type)
+              "\n  And "
+            else
+              "\n\n  #{type.to_s.capitalize} "
+            end
+            i = -1
+            text << description.gsub(::Spec::Story::Step::PARAM_PATTERN) { |param| args[i+=1] }
+            @output.print(failed ? red(text) : green(text))
+
+            if type == :'given scenario'
+              @previous_type = :given
+            else
+              @previous_type = type
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/story.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/story.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/story.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/story.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+require 'spec/runner/formatter/story/plain_text_formatter'
+require 'spec/runner/formatter/story/html_formatter'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/text_mate_formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/text_mate_formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter/text_mate_formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter/text_mate_formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+require 'spec/runner/formatter/html_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      # Formats backtraces so they're clickable by TextMate
+      class TextMateFormatter < HtmlFormatter
+        def backtrace_line(line)
+          line.gsub(/([^:]*\.rb):(\d*)/) do
+            "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
+          end
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/formatter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/formatter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require 'spec/runner/formatter/base_formatter'
+require 'spec/runner/formatter/base_text_formatter'
+require 'spec/runner/formatter/progress_bar_formatter'
+require 'spec/runner/formatter/specdoc_formatter'
+require 'spec/runner/formatter/html_formatter'
+require 'spec/runner/formatter/text_mate_formatter'
+require 'spec/runner/formatter/failing_examples_formatter'
+require 'spec/runner/formatter/failing_behaviours_formatter'
+require 'spec/runner/formatter/snippet_extractor'
+require 'spec/runner/formatter/profile_formatter'
+require 'spec/runner/formatter/story'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,72 @@
+begin
+  require 'rubygems'
+  require 'heckle'
+rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
+
+module Spec
+  module Runner
+    # Creates a new Heckler configured to heckle all methods in the classes
+    # whose name matches +filter+
+    class HeckleRunner
+      def initialize(filter, heckle_class=Heckler)
+        @filter = filter
+        @heckle_class = heckle_class
+      end
+      
+      # Runs all the behaviours held by +rspec_options+ once for each of the
+      # methods in the matched classes.
+      def heckle_with
+        if @filter =~ /(.*)[#\.](.*)/
+          heckle_method($1, $2)
+        else
+          heckle_class_or_module(@filter)
+        end
+      end
+      
+      def heckle_method(class_name, method_name)
+        verify_constant(class_name)
+        heckle = @heckle_class.new(class_name, method_name, rspec_options)
+        heckle.validate
+      end
+      
+      def heckle_class_or_module(class_or_module_name)
+        verify_constant(class_or_module_name)
+        pattern = /^#{class_or_module_name}/
+        classes = []
+        ObjectSpace.each_object(Class) do |klass|
+          classes << klass if klass.name =~ pattern
+        end
+        
+        classes.each do |klass|
+          klass.instance_methods(false).each do |method_name|
+            heckle = @heckle_class.new(klass.name, method_name, rspec_options)
+            heckle.validate
+          end
+        end
+      end
+      
+      def verify_constant(name)
+        begin
+          # This is defined in Heckle
+          name.to_class
+        rescue
+          raise "Heckling failed - \"#{name}\" is not a known class or module"
+        end
+      end
+    end
+    
+    #Supports Heckle 1.2 and prior (earlier versions used Heckle::Base)
+    class Heckler < (Heckle.const_defined?(:Base) ? Heckle::Base : Heckle)
+      def initialize(klass_name, method_name, rspec_options)
+        super(klass_name, method_name)
+        @rspec_options = rspec_options
+      end
+
+      def tests_pass?
+        success = @rspec_options.run_examples
+        success
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/heckle_runner_unsupported.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/heckle_runner_unsupported.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/heckle_runner_unsupported.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/heckle_runner_unsupported.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+module Spec
+  module Runner
+    # Dummy implementation for Windows that just fails (Heckle is not supported on Windows)
+    class HeckleRunner
+      def initialize(filter)
+        raise "Heckle not supported on Windows"
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/option_parser.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/option_parser.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/option_parser.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/option_parser.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,225 @@
+require 'optparse'
+require 'stringio'
+
+module Spec
+  module Runner
+    class OptionParser < ::OptionParser
+      class << self
+        def parse(args, err, out)
+          parser = new(err, out)
+          parser.parse(args)
+          parser.options
+        end
+      end
+
+      attr_reader :options
+
+      OPTIONS = {
+        :diff =>    ["-D", "--diff [FORMAT]", "Show diff of objects that are expected to be equal when they are not",
+                                             "Builtin formats: unified|u|context|c",
+                                             "You can also specify a custom differ class",
+                                             "(in which case you should also specify --require)"],
+        :colour =>  ["-c", "--colour", "--color", "Show coloured (red/green) output"],
+        :example => ["-e", "--example [NAME|FILE_NAME]",  "Execute example(s) with matching name(s). If the argument is",
+                                                          "the path to an existing file (typically generated by a previous",
+                                                          "run using --format failing_examples:file.txt), then the examples",
+                                                          "on each line of thatfile will be executed. If the file is empty,",
+                                                          "all examples will be run (as if --example was not specified).",
+                                                          " ",
+                                                          "If the argument is not an existing file, then it is treated as",
+                                                          "an example name directly, causing RSpec to run just the example",
+                                                          "matching that name"],
+        :specification => ["-s", "--specification [NAME]", "DEPRECATED - use -e instead", "(This will be removed when autotest works with -e)"],
+        :line => ["-l", "--line LINE_NUMBER", Integer, "Execute behaviout or specification at given line.",
+                                                       "(does not work for dynamically generated specs)"],
+        :format => ["-f", "--format FORMAT[:WHERE]",  "Specifies what format to use for output. Specify WHERE to tell",
+                                                    "the formatter where to write the output. All built-in formats",
+                                                    "expect WHERE to be a file name, and will write to STDOUT if it's",
+                                                    "not specified. The --format option may be specified several times",
+                                                    "if you want several outputs",
+                                                    " ",
+                                                    "Builtin formats: ",
+                                                    "progress|p           : Text progress",
+                                                    "profile|o            : Text progress with profiling of 10 slowest examples",
+                                                    "specdoc|s            : Example doc as text",
+                                                    "html|h               : A nice HTML report",
+                                                    "failing_examples|e   : Write all failing examples - input for --example",
+                                                    "failing_behaviours|b : Write all failing behaviours - input for --example",
+                                                    " ",
+                                                    "FORMAT can also be the name of a custom formatter class",
+                                                    "(in which case you should also specify --require to load it)"],
+        :require => ["-r", "--require FILE", "Require FILE before running specs",
+                                          "Useful for loading custom formatters or other extensions.",
+                                          "If this option is used it must come before the others"],
+        :backtrace => ["-b", "--backtrace", "Output full backtrace"],
+        :loadby => ["-L", "--loadby STRATEGY", "Specify the strategy by which spec files should be loaded.",
+                                              "STRATEGY can currently only be 'mtime' (File modification time)",
+                                              "By default, spec files are loaded in alphabetical order if --loadby",
+                                              "is not specified."],
+        :reverse => ["-R", "--reverse", "Run examples in reverse order"],
+        :timeout => ["-t", "--timeout FLOAT", "Interrupt and fail each example that doesn't complete in the",
+                                              "specified time"],
+        :heckle => ["-H", "--heckle CODE", "If all examples pass, this will mutate the classes and methods",
+                                           "identified by CODE little by little and run all the examples again",
+                                           "for each mutation. The intent is that for each mutation, at least",
+                                           "one example *should* fail, and RSpec will tell you if this is not the",
+                                           "case. CODE should be either Some::Module, Some::Class or",
+                                           "Some::Fabulous#method}"],
+        :dry_run => ["-d", "--dry-run", "Invokes formatters without executing the examples."],
+        :options_file => ["-O", "--options PATH", "Read options from a file"],
+        :generate_options => ["-G", "--generate-options PATH", "Generate an options file for --options"],
+        :runner => ["-U", "--runner RUNNER", "Use a custom Runner."],
+        :drb => ["-X", "--drb", "Run examples via DRb. (For example against script/spec_server)"],
+        :version => ["-v", "--version", "Show version"],
+        :help => ["-h", "--help", "You're looking at it"]
+      }
+
+      def initialize(err, out)
+        super()
+        @error_stream = err
+        @out_stream = out
+        @options = Options.new(@error_stream, @out_stream)
+
+        @spec_parser = SpecParser.new
+        @file_factory = File
+
+        self.banner = "Usage: spec (FILE|DIRECTORY|GLOB)+ [options]"
+        self.separator ""
+        on(*OPTIONS[:diff]) {|diff| @options.parse_diff(diff)}
+        on(*OPTIONS[:colour]) {@options.colour = true}
+        on(*OPTIONS[:example]) {|example| @options.parse_example(example)}
+        on(*OPTIONS[:specification]) {|example| @options.parse_example(example)}
+        on(*OPTIONS[:line]) {|line_number| @options.line_number = line_number.to_i}
+        on(*OPTIONS[:format]) {|format| @options.parse_format(format)}
+        on(*OPTIONS[:require]) {|requires| invoke_requires(requires)}
+        on(*OPTIONS[:backtrace]) {@options.backtrace_tweaker = NoisyBacktraceTweaker.new}
+        on(*OPTIONS[:loadby]) {|loadby| @options.loadby = loadby}
+        on(*OPTIONS[:reverse]) {@options.reverse = true}
+        on(*OPTIONS[:timeout]) {|timeout| @options.timeout = timeout.to_f}
+        on(*OPTIONS[:heckle]) {|heckle| @options.load_heckle_runner(heckle)}
+        on(*OPTIONS[:dry_run]) {@options.dry_run = true}
+        on(*OPTIONS[:options_file]) {|options_file| parse_options_file(options_file)}
+        on(*OPTIONS[:generate_options]) do |options_file|
+        end
+        on(*OPTIONS[:runner]) do |runner|
+          @options.user_input_for_runner = runner
+        end
+        on(*OPTIONS[:drb]) {}
+        on(*OPTIONS[:version]) {parse_version}
+        on_tail(*OPTIONS[:help]) {parse_help}
+      end
+
+      def order!(argv, &blk)
+        @argv = argv
+        @options.argv = @argv.dup
+        return if parse_generate_options
+        return if parse_drb
+        
+        super(@argv) do |file|
+          @options.files << file
+          blk.call(file) if blk
+        end
+
+        if @options.line_number
+          set_spec_from_line_number
+        end
+
+        @options
+      end
+
+      protected
+      def invoke_requires(requires)
+        requires.split(",").each do |file|
+          require file
+        end
+      end
+      
+      def parse_options_file(options_file)
+        option_file_args = IO.readlines(options_file).map {|l| l.chomp.split " "}.flatten
+        @argv.push(*option_file_args)
+      end
+
+      def parse_generate_options
+        # Remove the --generate-options option and the argument before writing to file
+        options_file = nil
+        ['-G', '--generate-options'].each do |option|
+          if index = @argv.index(option)
+            @argv.delete_at(index)
+            options_file = @argv.delete_at(index)
+          end
+        end
+        
+        if options_file
+          write_generated_options(options_file)
+          return true
+        else
+          return false
+        end
+      end
+      
+      def write_generated_options(options_file)
+        File.open(options_file, 'w') do |io|
+          io.puts @argv.join("\n")
+        end
+        @out_stream.puts "\nOptions written to #{options_file}. You can now use these options with:"
+        @out_stream.puts "spec --options #{options_file}"
+        @options.examples_should_not_be_run
+      end
+
+      def parse_drb
+        is_drb = false
+        argv = @options.argv
+        is_drb ||= argv.delete(OPTIONS[:drb][0])
+        is_drb ||= argv.delete(OPTIONS[:drb][1])
+        return nil unless is_drb
+        @options.examples_should_not_be_run
+        DrbCommandLine.run(
+          self.class.parse(argv, @error_stream, @out_stream)
+        )
+        true
+      end
+
+      def parse_version
+        @out_stream.puts ::Spec::VERSION::DESCRIPTION
+        exit if stdout?
+      end
+
+      def parse_help
+        @out_stream.puts self
+        exit if stdout?
+      end      
+
+      def set_spec_from_line_number
+        if @options.examples.empty?
+          if @options.files.length == 1
+            if @file_factory.file?(@options.files[0])
+              source = @file_factory.open(@options.files[0])
+              example = @spec_parser.spec_name_for(source, @options.line_number)
+              @options.parse_example(example)
+            elsif @file_factory.directory?(@options.files[0])
+              @error_stream.puts "You must specify one file, not a directory when using the --line option"
+              exit(1) if stderr?
+            else
+              @error_stream.puts "#{@options.files[0]} does not exist"
+              exit(2) if stderr?
+            end
+          else
+            @error_stream.puts "Only one file can be specified when using the --line option: #{@options.files.inspect}"
+            exit(3) if stderr?
+          end
+        else
+          @error_stream.puts "You cannot use both --line and --example"
+          exit(4) if stderr?
+        end
+      end
+
+      def stdout?
+        @out_stream == $stdout
+      end
+
+      def stderr?
+        @error_stream == $stderr
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/options.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/options.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/options.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/options.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,245 @@
+module Spec
+  module Runner
+    class Options
+      FILE_SORTERS = {
+        'mtime' => lambda {|file_a, file_b| File.mtime(file_b) <=> File.mtime(file_a)}
+      }
+
+      EXAMPLE_FORMATTERS = {
+        'specdoc'  => Formatter::SpecdocFormatter,
+        's'        => Formatter::SpecdocFormatter,
+        'html'     => Formatter::HtmlFormatter,
+        'h'        => Formatter::HtmlFormatter,
+        'progress' => Formatter::ProgressBarFormatter,
+        'p'        => Formatter::ProgressBarFormatter,
+        'failing_examples' => Formatter::FailingExamplesFormatter,
+        'e'        => Formatter::FailingExamplesFormatter,
+        'failing_behaviours' => Formatter::FailingBehavioursFormatter,
+        'b'        => Formatter::FailingBehavioursFormatter,
+        'profile'  => Formatter::ProfileFormatter,
+        'o'        => Formatter::ProfileFormatter,
+        'textmate' => Formatter::TextMateFormatter,
+      }
+
+      STORY_FORMATTERS = {
+        'plain' => Formatter::Story::PlainTextFormatter,
+        'html'  => Formatter::Story::HtmlFormatter,
+        'h'     => Formatter::Story::HtmlFormatter
+      }
+
+      attr_accessor(
+        :backtrace_tweaker,
+        :context_lines,
+        :diff_format,
+        :dry_run,
+        :profile,
+        :examples,
+        :heckle_runner,
+        :line_number,
+        :loadby,
+        :reporter,
+        :reverse,
+        :timeout,
+        :verbose,
+        :user_input_for_runner,
+        :error_stream,
+        :output_stream,
+        # TODO: BT - Figure out a better name
+        :argv
+      )
+      attr_reader :colour, :differ_class, :files, :example_groups
+
+      def initialize(error_stream, output_stream)
+        @error_stream = error_stream
+        @output_stream = output_stream
+        @backtrace_tweaker = QuietBacktraceTweaker.new
+        @examples = []
+        @colour = false
+        @profile = false
+        @dry_run = false
+        @reporter = Reporter.new(self)
+        @context_lines = 3
+        @diff_format  = :unified
+        @files = []
+        @example_groups = []
+        @user_input_for_runner = nil
+        @examples_run = false
+      end
+
+      def add_example_group(example_group)
+        @example_groups << example_group
+      end
+
+      def remove_example_group(example_group)
+        @example_groups.delete(example_group)
+      end
+
+      def run_examples
+        return true unless examples_should_be_run?
+        runner = custom_runner || ExampleGroupRunner.new(self)
+
+        runner.load_files(files_to_load)
+        if example_groups.empty?
+          true
+        else
+          success = runner.run
+          @examples_run = true
+          heckle if heckle_runner
+          success
+        end
+      end
+
+      def examples_run?
+        @examples_run
+      end
+
+      def examples_should_not_be_run
+        @examples_should_be_run = false
+      end      
+
+      def colour=(colour)
+        @colour = colour
+        begin; \
+          require 'Win32/Console/ANSI' if @colour && PLATFORM =~ /win32/; \
+        rescue LoadError ; \
+          raise "You must gem install win32console to use colour on Windows" ; \
+        end
+      end
+
+      def parse_diff(format)
+        case format
+        when :context, 'context', 'c'
+          @diff_format  = :context
+          default_differ
+        when :unified, 'unified', 'u', '', nil
+          @diff_format  = :unified
+          default_differ
+        else
+          @diff_format  = :custom
+          self.differ_class = load_class(format, 'differ', '--diff')
+        end
+      end
+
+      def parse_example(example)
+        if(File.file?(example))
+          @examples = File.open(example).read.split("\n")
+        else
+          @examples = [example]
+        end
+      end
+
+      def parse_format(format_arg)
+        format, where = ClassAndArgumentsParser.parse(format_arg)
+        unless where
+          raise "When using several --format options only one of them can be without a file" if @out_used
+          where = @output_stream
+          @out_used = true
+        end
+        @format_options ||= []
+        @format_options << [format, where]
+      end
+      
+      def formatters
+        @format_options ||= [['progress', @output_stream]]
+        @formatters ||= @format_options.map do |format, where|
+          formatter_type = EXAMPLE_FORMATTERS[format] || load_class(format, 'formatter', '--format')
+          formatter_type.new(self, where)
+        end
+      end
+
+      def story_formatters
+        @format_options ||= [['plain', @output_stream]]
+        @story_formatters ||= @format_options.map do |format, where|
+          formatter_type = STORY_FORMATTERS[format] || load_class(format, 'formatter', '--format')
+          formatter_type.new(self, where)
+        end
+      end
+
+      def load_heckle_runner(heckle)
+        suffix = [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} ? '_unsupported' : ''
+        require "spec/runner/heckle_runner#{suffix}"
+        @heckle_runner = HeckleRunner.new(heckle)
+      end
+
+      def number_of_examples
+        @example_groups.inject(0) do |sum, example_group|
+          sum + example_group.number_of_examples
+        end
+      end
+
+      protected
+      def examples_should_be_run?
+        return @examples_should_be_run unless @examples_should_be_run.nil?
+        @examples_should_be_run = true
+      end
+      
+      def differ_class=(klass)
+        return unless klass
+        @differ_class = klass
+        Spec::Expectations.differ = self.differ_class.new(self)
+      end
+
+      def load_class(name, kind, option)
+        if name =~ /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/
+          arg = $2 == "" ? nil : $2
+          [$1, arg]
+        else
+          m = "#{name.inspect} is not a valid class name"
+          @error_stream.puts m
+          raise m
+        end
+        begin
+          eval(name, binding, __FILE__, __LINE__)
+        rescue NameError => e
+          @error_stream.puts "Couldn't find #{kind} class #{name}"
+          @error_stream.puts "Make sure the --require option is specified *before* #{option}"
+          if $_spec_spec ; raise e ; else exit(1) ; end
+        end
+      end
+      
+      def files_to_load
+        result = []
+        sorted_files.each do |file|
+          if test ?d, file
+            result += Dir[File.expand_path("#{file}/**/*.rb")]
+          elsif test ?f, file
+            result << file
+          else
+            raise "File or directory not found: #{file}"
+          end
+        end
+        result
+      end
+      
+      def custom_runner
+        return nil unless custom_runner?
+        klass_name, arg = ClassAndArgumentsParser.parse(user_input_for_runner)
+        runner_type = load_class(klass_name, 'behaviour runner', '--runner')
+        return runner_type.new(self, arg)
+      end
+
+      def custom_runner?
+        return user_input_for_runner ? true : false
+      end
+      
+      def heckle
+        returns = self.heckle_runner.heckle_with
+        self.heckle_runner = nil
+        returns
+      end
+      
+      def sorted_files
+        return sorter ? files.sort(&sorter) : files
+      end
+
+      def sorter
+        FILE_SORTERS[loadby]
+      end
+
+      def default_differ
+        require 'spec/expectations/differs/default'
+        self.differ_class = Spec::Expectations::Differs::Default
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/reporter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/reporter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/reporter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/reporter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,136 @@
+module Spec
+  module Runner
+    class Reporter
+      attr_reader :options
+      
+      def initialize(options)
+        @options = options
+        @options.reporter = self
+        clear
+      end
+      
+      def add_example_group(name)
+        formatters.each{|f| f.add_example_group(name)}
+        @example_group_names << name
+      end
+      
+      def example_started(example)
+        formatters.each{|f| f.example_started(example)}
+      end
+      
+      def example_finished(example, error=nil, failure_location=nil, pending=false)
+        @examples << example
+        
+        if error.nil?
+          example_passed(example)
+        elsif Spec::Example::ExamplePendingError === error
+          example_pending(@example_group_names.last, example, error.message)
+        else
+          example_failed(example, error, failure_location)
+        end
+      end
+
+      def start(number_of_examples)
+        clear
+        @start_time = Time.new
+        formatters.each{|f| f.start(number_of_examples)}
+      end
+  
+      def end
+        @end_time = Time.new
+      end
+  
+      # Dumps the summary and returns the total number of failures
+      def dump
+        formatters.each{|f| f.start_dump}
+        dump_pending
+        dump_failures
+        formatters.each do |f|
+          f.dump_summary(duration, @examples.length, @failures.length, @pending_count)
+          f.close
+        end
+        @failures.length
+      end
+
+    private
+
+      def formatters
+        @options.formatters
+      end
+
+      def backtrace_tweaker
+        @options.backtrace_tweaker
+      end
+  
+      def clear
+        @example_group_names = []
+        @failures = []
+        @pending_count = 0
+        @examples = []
+        @start_time = nil
+        @end_time = nil
+      end
+  
+      def dump_failures
+        return if @failures.empty?
+        @failures.inject(1) do |index, failure|
+          formatters.each{|f| f.dump_failure(index, failure)}
+          index + 1
+        end
+      end
+      def dump_pending
+        formatters.each{|f| f.dump_pending}
+      end
+
+      def duration
+        return @end_time - @start_time unless (@end_time.nil? or @start_time.nil?)
+        return "0.0"
+      end
+      
+      def example_passed(name)
+        formatters.each{|f| f.example_passed(name)}
+      end
+
+      def example_failed(name, error, failure_location)
+        backtrace_tweaker.tweak_backtrace(error, failure_location)
+        example_name = "#{@example_group_names.last} #{name}"
+        failure = Failure.new(example_name, error)
+        @failures << failure
+        formatters.each{|f| f.example_failed(name, @failures.length, failure)}
+      end
+      
+      def example_pending(behaviour_name, example_name, message="Not Yet Implemented")
+        @pending_count += 1
+        formatters.each{|f| f.example_pending(behaviour_name, example_name, message)}
+      end
+      
+      class Failure
+        attr_reader :exception
+        
+        def initialize(example_name, exception)
+          @example_name = example_name
+          @exception = exception
+        end
+
+        def header
+          if expectation_not_met?
+            "'#{@example_name}' FAILED"
+          elsif pending_fixed?
+            "'#{@example_name}' FIXED"
+          else
+            "#{@exception.class.name} in '#{@example_name}'"
+          end
+        end
+        
+        def pending_fixed?
+          @exception.is_a?(Spec::Example::PendingExampleFixedError)
+        end
+
+        def expectation_not_met?
+          @exception.is_a?(Spec::Expectations::ExpectationNotMetError)
+        end
+
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner/spec_parser.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,53 @@
+module Spec
+  module Runner
+    # Parses a spec file and finds the nearest example for a given line number.
+    class SpecParser
+      def spec_name_for(io, line_number)
+        source  = io.read
+        behaviour, behaviour_line = behaviour_at_line(source, line_number)
+        example, example_line = example_at_line(source, line_number)
+        if behaviour && example && (behaviour_line < example_line)
+          "#{behaviour} #{example}"
+        elsif behaviour
+          behaviour
+        else
+          nil
+        end
+      end
+
+    protected
+
+      def behaviour_at_line(source, line_number)
+        find_above(source, line_number, /^\s*(context|describe)\s+(.*)\s+do/)
+      end
+
+      def example_at_line(source, line_number)
+        find_above(source, line_number, /^\s*(specify|it)\s+(.*)\s+do/)
+      end
+
+      # Returns the context/describe or specify/it name and the line number
+      def find_above(source, line_number, pattern)
+        lines_above_reversed(source, line_number).each_with_index do |line, n|
+          return [parse_description($2), line_number-n] if line =~ pattern
+        end
+        nil
+      end
+
+      def lines_above_reversed(source, line_number)
+        lines = source.split("\n")
+        lines[0...line_number].reverse
+      end
+      
+      def parse_description(str)
+        return str[1..-2] if str =~ /^['"].*['"]$/
+        if matches = /^['"](.*)['"](,.*)?$/.match(str)
+          return ::Spec::Example::ExampleGroupDescription.generate_description(matches[1])
+        end
+        if matches = /^(.*)\s*,\s*['"](.*)['"](,.*)?$/.match(str)
+          return ::Spec::Example::ExampleGroupDescription.generate_description(matches[1], matches[2])
+        end
+        return str
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,190 @@
+require 'spec/runner/formatter'
+require 'spec/runner/options'
+require 'spec/runner/option_parser'
+require 'spec/runner/example_group_runner'
+require 'spec/runner/command_line'
+require 'spec/runner/drb_command_line'
+require 'spec/runner/backtrace_tweaker'
+require 'spec/runner/reporter'
+require 'spec/runner/extensions/object'
+require 'spec/runner/spec_parser'
+require 'spec/runner/class_and_arguments_parser'
+
+module Spec
+  # == Behaviours and Examples
+  # 
+  # Rather than expressing examples in classes, RSpec uses a custom domain specific language to 
+  # describe Behaviours and Examples of those behaviours.
+  # 
+  # A Example is the equivalent of a fixture in xUnit-speak. It is a metaphor for the context
+  # in which you will run your executable example - a set of known objects in a known starting state.
+  # We begin be describing
+  # 
+  #   describe Account do
+  # 
+  #     before do
+  #       @account = Account.new
+  #     end
+  # 
+  #     it "should have a balance of $0" do
+  #       @account.balance.should == Money.new(0, :dollars)
+  #     end
+  # 
+  #   end
+  # 
+  # We use the before block to set up the Example (given), and then the #it method to
+  # hold the example code that expresses the event (when) and the expected outcome (then).
+  # 
+  # == Helper Methods
+  # 
+  # A primary goal of RSpec is to keep the examples clear. We therefore prefer
+  # less indirection than you might see in xUnit examples and in well factored, DRY production code. We feel
+  # that duplication is OK if removing it makes it harder to understand an example without
+  # having to look elsewhere to understand its context.
+  # 
+  # That said, RSpec does support some level of encapsulating common code in helper
+  # methods that can exist within a context or within an included module.
+  # 
+  # == Setup and Teardown
+  # 
+  # You can use before and after within a Example. Both methods take an optional
+  # scope argument so you can run the block before :each example or before :all examples
+  # 
+  #   describe "..." do
+  #     before :all do
+  #       ...
+  #     end
+  # 
+  #     before :each do
+  #       ...
+  #     end
+  # 
+  #     it "should do something" do
+  #       ...
+  #     end
+  # 
+  #     it "should do something else" do
+  #       ...
+  #     end
+  # 
+  #     after :each do
+  #       ...
+  #     end
+  # 
+  #     after :all do
+  #       ...
+  #     end
+  # 
+  #   end
+  # 
+  # The <tt>before :each</tt> block will run before each of the examples, once for each example. Likewise,
+  # the <tt>after :each</tt> block will run after each of the examples.
+  # 
+  # It is also possible to specify a <tt>before :all</tt> and <tt>after :all</tt>
+  # block that will run only once for each behaviour, respectively before the first <code>before :each</code>
+  # and after the last <code>after :each</code>. The use of these is generally discouraged, because it
+  # introduces dependencies between the examples. Still, it might prove useful for very expensive operations
+  # if you know what you are doing.
+  # 
+  # == Local helper methods
+  # 
+  # You can include local helper methods by simply expressing them within a context:
+  # 
+  #   describe "..." do
+  #   
+  #     it "..." do
+  #       helper_method
+  #     end
+  # 
+  #     def helper_method
+  #       ...
+  #     end
+  # 
+  #   end
+  # 
+  # == Included helper methods
+  # 
+  # You can include helper methods in multiple contexts by expressing them within
+  # a module, and then including that module in your context:
+  # 
+  #   module AccountExampleHelperMethods
+  #     def helper_method
+  #       ...
+  #     end
+  #   end
+  # 
+  #   describe "A new account" do
+  #     include AccountExampleHelperMethods
+  #     before do
+  #       @account = Account.new
+  #     end
+  # 
+  #     it "should have a balance of $0" do
+  #       helper_method
+  #       @account.balance.should eql(Money.new(0, :dollars))
+  #     end
+  #   end
+  # 
+  # == Shared behaviour
+  # 
+  # You can define a shared behaviour, that may be used on other behaviours
+  #
+  #  describe "All Editions", :shared => true do
+  #    it "all editions behaviour" ...
+  #  end
+  #
+  #  describe SmallEdition do
+  #    it_should_behave_like "All Editions"
+  #  
+  #    it "should do small edition stuff" do
+  #      ...
+  #    end
+  #  end
+  #
+  # You can also assign the shared behaviour to a module and include that
+  #
+  #  AllEditions = describe "All Editions", :shared => true do
+  #    it "all editions behaviour" ...
+  #  end
+  #
+  #  describe SmallEdition do
+  #    it_should_behave_like AllEditions
+  #  
+  #    it "should do small edition stuff" do
+  #      ...
+  #    end
+  #  end
+  #
+  # And, for those of you who prefer to use something more like Ruby, you
+  # can just include the module directly
+  #
+  #  describe SmallEdition do
+  #    include AllEditions
+  #  
+  #    it "should do small edition stuff" do
+  #      ...
+  #    end
+  #  end
+  module Runner
+    class << self
+      def configuration # :nodoc:
+        @configuration ||= Spec::Example::Configuration.new
+      end
+      
+      # Use this to configure various configurable aspects of
+      # RSpec:
+      #
+      #   Spec::Runner.configure do |configuration|
+      #     # Configure RSpec here
+      #   end
+      #
+      # The yielded <tt>configuration</tt> object is a
+      # Spec::Example::Configuration instance. See its RDoc
+      # for details about what you can do with it.
+      #
+      def configure
+        yield configuration
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/extensions/main.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/extensions/main.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/extensions/main.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/extensions/main.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,86 @@
+module Spec
+  module Story
+    module Extensions
+      module Main
+        def Story(title, narrative, params = {}, &body)
+          ::Spec::Story::Runner.story_runner.Story(title, narrative, params, &body)
+        end
+      
+        # Calling this deprecated is silly, since it hasn't been released yet. But, for
+        # those who are reading this - this will be deleted before the 1.1 release.
+        def run_story(*args, &block)
+          runner = Spec::Story::Runner::PlainTextStoryRunner.new(*args)
+          runner.instance_eval(&block) if block
+          runner.run
+        end
+      
+        # Creates (or appends to an existing) a namespaced group of steps for use in Stories
+        #
+        # == Examples
+        #
+        #   # Creating a new group
+        #   steps_for :forms do
+        #     When("user enters $value in the $field field") do ... end
+        #     When("user submits the $form form") do ... end
+        #   end
+        def steps_for(tag, &block)
+          steps = rspec_story_steps[tag]
+          steps.instance_eval(&block) if block
+          steps
+        end
+      
+        # Creates a context for running a Plain Text Story with specific groups of Steps. 
+        # Also supports adding arbitrary steps that will only be accessible to
+        # the Story being run.
+        #
+        # == Examples
+        #
+        #   # Run a Story with one group of steps
+        #   with_steps_for :checking_accounts do
+        #     run File.dirname(__FILE__) + "/withdraw_cash"
+        #   end
+        #
+        #   # Run a Story, adding steps that are only available for this Story
+        #   with_steps_for :accounts do
+        #     Given "user is logged in as account administrator"
+        #     run File.dirname(__FILE__) + "/reconcile_accounts"
+        #   end
+        #
+        #   # Run a Story with steps from two groups
+        #   with_steps_for :checking_accounts, :savings_accounts do
+        #     run File.dirname(__FILE__) + "/transfer_money"
+        #   end
+        #
+        #   # Run a Story with a specific Story extension
+        #   with_steps_for :login, :navigation do
+        #     run File.dirname(__FILE__) + "/user_changes_password", :type => RailsStory
+        #   end
+        def with_steps_for(*tags, &block)
+          steps = Spec::Story::StepGroup.new do
+            extend StoryRunnerStepGroupAdapter
+          end
+          tags.each {|tag| steps << rspec_story_steps[tag]}
+          steps.instance_eval(&block) if block
+          steps
+        end
+
+      private
+
+        module StoryRunnerStepGroupAdapter
+          def run(path, options={})
+            runner = Spec::Story::Runner::PlainTextStoryRunner.new(path, options)
+            runner.steps << self
+            runner.run
+          end
+        end
+        
+        def rspec_story_steps  # :nodoc:
+          $rspec_story_steps ||= Spec::Story::StepGroupHash.new
+        end
+                
+      end
+    end
+  end
+end
+
+include Spec::Story::Extensions::Main
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/extensions.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/extensions.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/extensions.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/extensions.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+require 'spec/story/extensions/main'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/given_scenario.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/given_scenario.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/given_scenario.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/given_scenario.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+module Spec
+  module Story
+    class GivenScenario
+      def initialize name
+        @name = name
+      end
+      
+      def perform(instance, ignore_name)
+        scenario = Runner::StoryRunner.scenario_from_current_story @name
+        Runner::ScenarioRunner.new.run(scenario, instance)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+module Spec
+  module Story
+    module Runner
+      class PlainTextStoryRunner
+        # You can initialize a PlainTextStoryRunner with the path to the
+        # story file or a block, in which you can define the path using load.
+        #
+        # == Examples
+        #   
+        #   PlainTextStoryRunner.new('path/to/file')
+        #
+        #   PlainTextStoryRunner.new do |runner|
+        #     runner.load 'path/to/file'
+        #   end
+        def initialize(*args)
+          @options = Hash === args.last ? args.pop : {}
+          @story_file = args.empty? ? nil : args.shift
+          yield self if block_given?
+        end
+        
+        def []=(key, value)
+          @options[key] = value
+        end
+        
+        def load(path)
+          @story_file = path
+        end
+        
+        def run
+          raise "You must set a path to the file with the story. See the RDoc." if @story_file.nil?
+          mediator = Spec::Story::Runner::StoryMediator.new steps, Spec::Story::Runner.story_runner, @options
+          parser = Spec::Story::Runner::StoryParser.new mediator
+
+          story_text = File.read(@story_file)          
+          parser.parse(story_text.split("\n"))
+
+          mediator.run_stories
+        end
+        
+        def steps
+          @step_group ||= Spec::Story::StepGroup.new
+          yield @step_group if block_given?
+          @step_group
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/scenario_collector.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/scenario_collector.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/scenario_collector.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/scenario_collector.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+module Spec
+  module Story
+    module Runner
+      class ScenarioCollector
+        attr_accessor :scenarios
+        
+        def initialize(story)
+          @story = story
+          @scenarios = []
+        end
+        
+        def Scenario(name, &body)
+          @scenarios << Scenario.new(@story, name, &body)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,49 @@
+module Spec
+  module Story
+    module Runner
+      class ScenarioRunner
+        def initialize
+          @listeners = []
+        end
+        
+        def run(scenario, world)
+          @listeners.each { |l| l.scenario_started(scenario.story.title, scenario.name) }
+          run_story_ignoring_scenarios(scenario.story, world)
+          
+          world.start_collecting_errors
+          world.instance_eval(&scenario.body)
+          if world.errors.empty?
+            @listeners.each { |l| l.scenario_succeeded(scenario.story.title, scenario.name) }
+          else
+            world.errors.each do |e|
+              case e
+              when Spec::Example::ExamplePendingError
+                @listeners.each { |l| l.scenario_pending(scenario.story.title, scenario.name, e.message) }
+              else
+                @listeners.each { |l| l.scenario_failed(scenario.story.title, scenario.name, e) }
+              end
+            end
+          end
+        end
+        
+        def add_listener(listener)
+          @listeners << listener
+        end
+        
+        private
+        
+        def run_story_ignoring_scenarios(story, world)
+          class << world
+            def Scenario(name, &block)
+              # do nothing
+            end
+          end
+          story.run_in(world)
+          class << world
+            remove_method(:Scenario)
+          end
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,123 @@
+ module Spec
+  module Story
+    module Runner
+
+      class StoryMediator
+        def initialize(step_group, runner, options={})
+          @step_group = step_group
+          @stories = []
+          @runner = runner
+          @options = options
+        end
+        
+        def stories
+          @stories.collect { |p| p.to_proc }
+        end
+        
+        def create_story(title, narrative)
+          @stories << Story.new(title, narrative, @step_group, @options)
+        end
+        
+        def create_scenario(title)
+          current_story.add_scenario Scenario.new(title)
+        end
+        
+        def create_given(name)
+          current_scenario.add_step Step.new('Given', name)
+        end
+        
+        def create_given_scenario(name)
+          current_scenario.add_step Step.new('GivenScenario', name)
+        end
+        
+        def create_when(name)
+          current_scenario.add_step Step.new('When', name)
+        end
+        
+        def create_then(name)
+          current_scenario.add_step Step.new('Then', name)
+        end
+        
+        def run_stories
+          stories.each { |story| @runner.instance_eval(&story) }
+        end
+        
+        private
+        def current_story
+          @stories.last
+        end
+        
+        def current_scenario
+          current_story.current_scenario
+        end
+        
+        class Story
+          def initialize(title, narrative, step_group, options)
+            @title = title
+            @narrative = narrative
+            @scenarios = []
+            @step_group = step_group
+            @options = options
+          end
+          
+          def to_proc
+            title = @title
+            narrative = @narrative
+            scenarios = @scenarios.collect { |scenario| scenario.to_proc }
+            options = @options.merge(:steps => @step_group)
+            lambda do
+              Story title, narrative, options do
+                scenarios.each { |scenario| instance_eval(&scenario) }
+              end
+            end
+          end
+          
+          def add_scenario(scenario)
+            @scenarios << scenario
+          end
+          
+          def current_scenario
+            @scenarios.last
+          end
+        end
+        
+        class Scenario
+          def initialize(name)
+            @name = name
+            @steps = []
+          end
+          
+          def to_proc
+            name = @name
+            steps = @steps.collect { |step| step.to_proc }
+            lambda do
+              Scenario name do
+                steps.each { |step| instance_eval(&step) }
+              end
+            end
+          end
+          
+          def add_step(step)
+            @steps << step
+          end
+        end
+        
+        class Step
+          def initialize(type, name)
+            @type = type
+            @name = name
+          end
+          
+          def to_proc
+            type = @type
+            name = @name
+            lambda do
+              send(type, name)
+            end
+          end
+        end
+      end
+      
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,227 @@
+module Spec
+  module Story
+    module Runner
+      
+      class IllegalStepError < StandardError
+        def initialize(state, event)
+          super("Illegal attempt to create a #{event} after a #{state}")
+        end
+      end
+
+      class StoryParser
+        def initialize(story_mediator)
+          @story_mediator = story_mediator
+          @current_story_lines = []
+          transition_to(:starting_state)
+        end
+        
+        def parse(lines)
+          lines.reject! {|line| line == ""}
+          until lines.empty?
+            process_line(lines.shift)
+          end
+          @state.eof
+        end
+        
+        def process_line(line)
+          line.strip!
+          case line
+          when /^Story: /           : @state.story(line)
+          when /^Scenario: /        : @state.scenario(line)
+          when /^Given:? /          : @state.given(line)
+          when /^GivenScenario:? /  : @state.given_scenario(line)
+          when /^When:? /           : @state.event(line)
+          when /^Then:? /           : @state.outcome(line)
+          when /^And:? /            : @state.one_more_of_the_same(line)
+          else                        @state.other(line)
+          end
+        end
+
+        def init_story(title)
+          @current_story_lines.clear
+          add_story_line(title)
+        end
+        
+        def add_story_line(line)
+          @current_story_lines << line
+        end
+        
+        def create_story()
+          unless @current_story_lines.empty?
+            @story_mediator.create_story(@current_story_lines[0].gsub("Story: ",""), @current_story_lines[1..-1].join("\n"))
+            @current_story_lines.clear
+          end
+        end
+        
+        def create_scenario(title)
+          @story_mediator.create_scenario(title.gsub("Scenario: ",""))
+        end
+        
+        def create_given(name)
+          @story_mediator.create_given(name)
+        end
+        
+        def create_given_scenario(name)
+          @story_mediator.create_given_scenario(name)
+        end
+        
+        def create_when(name)
+          @story_mediator.create_when(name)
+        end
+        
+        def create_then(name)
+          @story_mediator.create_then(name)
+        end
+
+        def transition_to(key)
+          @state = states[key]
+        end
+        
+        def states
+          @states ||= {
+            :starting_state => StartingState.new(self),
+            :story_state => StoryState.new(self),
+            :scenario_state => ScenarioState.new(self),
+            :given_state => GivenState.new(self),
+            :when_state => WhenState.new(self),
+            :then_state => ThenState.new(self)
+          }
+        end
+        
+        class State
+          def initialize(parser)
+            @parser = parser
+          end
+          
+          def story(line)
+            @parser.init_story(line)
+            @parser.transition_to(:story_state)
+          end
+
+          def scenario(line)
+            @parser.create_scenario(line)
+            @parser.transition_to(:scenario_state)
+          end
+
+          def given(line)
+            @parser.create_given(remove_tag_from(:given, line))
+            @parser.transition_to(:given_state)
+          end
+          
+          def given_scenario(line)
+            @parser.create_given_scenario(remove_tag_from(:givenscenario, line))
+            @parser.transition_to(:given_state)
+          end
+          
+          def event(line)
+            @parser.create_when(remove_tag_from(:when, line))
+            @parser.transition_to(:when_state)
+          end
+          
+          def outcome(line)
+            @parser.create_then(remove_tag_from(:then, line))
+            @parser.transition_to(:then_state)
+          end
+
+          def remove_tag_from(tag, line)
+            tokens = line.split
+            # validation of tag can go here
+            tokens[0].downcase.match(/#{tag.to_s}:?/) ? 
+                                (tokens[1..-1].join(' ')) : line
+          end
+
+          def eof
+          end
+          
+          def other(line)
+            # no-op - supports header text before the first story in a file
+          end
+        end
+        
+        class StartingState < State
+          def initialize(parser)
+            @parser = parser
+          end
+        end
+        
+        class StoryState < State
+          def one_more_of_the_same(line)
+            other(line)
+          end
+
+          def story(line)
+            @parser.create_story
+            @parser.add_story_line(line)
+          end
+          
+          def scenario(line)
+            @parser.create_story
+            @parser.create_scenario(line)
+            @parser.transition_to(:scenario_state)
+          end
+          
+          def given(line)
+            other(line)
+          end
+          
+          def event(line)
+            other(line)
+          end
+          
+          def outcome(line)
+            other(line)
+          end
+          
+          def other(line)
+            @parser.add_story_line(line)
+          end
+          
+          def eof
+            @parser.create_story
+          end
+        end
+
+        class ScenarioState < State
+          def one_more_of_the_same(line)
+            raise IllegalStepError.new("Scenario", "And")
+          end
+
+          def scenario(line)
+            @parser.create_scenario(line)
+          end
+        end
+        
+        class GivenState < State
+          def one_more_of_the_same(line)
+            @parser.create_given(remove_tag_from(:and, line))
+          end
+          
+          def given(line)
+            @parser.create_given(remove_tag_from(:given, line))
+          end
+        end
+        
+        class WhenState < State
+          def one_more_of_the_same(line)
+            @parser.create_when(remove_tag_from(:and ,line))
+          end
+
+          def event(line)
+            @parser.create_when(remove_tag_from(:when ,line))
+          end
+        end
+
+        class ThenState < State
+          def one_more_of_the_same(line)
+            @parser.create_then(remove_tag_from(:and ,line))
+          end
+
+          def outcome(line)
+            @parser.create_then(remove_tag_from(:then ,line))
+          end
+        end
+
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,67 @@
+module Spec
+  module Story
+    module Runner
+      class StoryRunner
+        class << self
+          attr_accessor :current_story_runner
+          
+          def scenario_from_current_story(scenario_name)
+            current_story_runner.scenario_from_current_story(scenario_name)
+          end
+        end
+        
+        attr_accessor :stories, :scenarios, :current_story
+        
+        def initialize(scenario_runner, world_creator = World)
+          StoryRunner.current_story_runner = self
+          @scenario_runner = scenario_runner
+          @world_creator = world_creator
+          @stories = []
+          @scenarios_by_story = {}
+          @scenarios = []
+          @listeners = []
+        end
+        
+        def Story(title, narrative, params = {}, &body)
+          story = Story.new(title, narrative, params, &body)
+          @stories << story
+          
+          # collect scenarios
+          collector = ScenarioCollector.new(story)
+          story.run_in(collector)
+          @scenarios += collector.scenarios
+          @scenarios_by_story[story.title] = collector.scenarios
+        end
+        
+        def run_stories
+          return if @stories.empty?
+          @listeners.each { |l| l.run_started(scenarios.size) }
+          @stories.each do |story|
+            story.assign_steps_to(World)
+            @current_story = story
+            @listeners.each { |l| l.story_started(story.title, story.narrative) }
+            scenarios = @scenarios_by_story[story.title]
+            scenarios.each do |scenario|
+              type = story[:type] || Object
+              args = story[:args] || []
+              world = @world_creator.create(type, *args)
+              @scenario_runner.run(scenario, world)
+            end
+            @listeners.each { |l| l.story_ended(story.title, story.narrative) }
+          end
+          unique_steps = World.step_names.uniq.sort
+          @listeners.each { |l| l.collected_steps(unique_steps) }
+          @listeners.each { |l| l.run_ended }
+        end
+        
+        def add_listener(listener)
+          @listeners << listener
+        end
+        
+        def scenario_from_current_story(scenario_name)
+          @scenarios_by_story[@current_story.title].find {|s| s.name == scenario_name }
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,58 @@
+require 'spec/story/runner/scenario_collector.rb'
+require 'spec/story/runner/scenario_runner.rb'
+require 'spec/story/runner/story_runner.rb'
+require 'spec/story/runner/story_parser.rb'
+require 'spec/story/runner/story_mediator.rb'
+require 'spec/story/runner/plain_text_story_runner.rb'
+
+module Spec
+  module Story
+    module Runner
+      class << self
+        def run_options # :nodoc:
+          @run_options ||= ::Spec::Runner::OptionParser.parse(ARGV, $stderr, $stdout)
+        end
+        
+        def story_runner # :nodoc:
+          unless @story_runner
+            @story_runner = StoryRunner.new(scenario_runner, world_creator)
+            run_options.story_formatters.each do |formatter|
+              register_listener(formatter)
+            end
+            Runner.register_exit_hook
+          end
+          @story_runner
+        end
+        
+        def scenario_runner # :nodoc:
+          @scenario_runner ||= ScenarioRunner.new
+        end
+        
+        def world_creator # :nodoc:
+          @world_creator ||= World
+        end
+        
+        # Use this to register a customer output formatter.
+        def register_listener(listener)
+          story_runner.add_listener(listener) # run_started, story_started, story_ended, #run_ended
+          world_creator.add_listener(listener) # found_scenario, step_succeeded, step_failed, step_failed
+          scenario_runner.add_listener(listener) # scenario_started, scenario_succeeded, scenario_pending, scenario_failed
+        end
+        
+        def register_exit_hook # :nodoc:
+          # TODO - when story runner uses test/unit runners like example runner does we can kill
+          # this and also the assorted Kernel.stub!(:at_exit) in examples
+          at_exit do
+            Runner.story_runner.run_stories unless $!
+          end
+          # TODO exit with non-zero status if run fails
+        end
+        
+        def dry_run
+          run_options.dry_run
+        end
+        
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/scenario.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/scenario.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/scenario.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/scenario.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+
+module Spec
+  module Story
+    class Scenario
+      attr_accessor :name, :body, :story
+      
+      def initialize(story, name, &body)
+        @story = story
+        @name = name
+        @body = body
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/step.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/step.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/step.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/step.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+module Spec
+  module Story
+    class Step
+      PARAM_PATTERN = /(\$\w*)/
+      
+      attr_reader :name
+      def initialize(name, &block)
+        @name = name
+        assign_expression(name)
+        init_module(name, &block)
+      end
+
+      def perform(instance, *args)
+        instance.extend(@mod)
+        instance.__send__(@name, *args)
+      end
+
+      def init_module(name, &block)
+        @mod = Module.new do
+          define_method(name.to_s, &block)
+        end
+      end
+
+      def matches?(name)
+        !(matches = name.match(@expression)).nil?
+      end
+            
+      def parse_args(name)
+        name.match(@expression)[1..-1]
+      end
+
+      private
+      
+        def assign_expression(name)
+          expression = name.dup
+          if String === expression
+            expression.gsub! '(', '\('
+            expression.gsub! ')', '\)'
+            while expression =~ PARAM_PATTERN
+              expression.gsub!($1, "(.*)")
+            end
+          end
+          @expression = Regexp.new("^#{expression}$")
+        end
+
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/step_group.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/step_group.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/step_group.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/step_group.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,90 @@
+module Spec
+  module Story
+
+    class StepGroupHash < Hash
+      def initialize
+        super do |h,k|
+          h[k] = Spec::Story::StepGroup.new
+        end
+      end
+    end
+
+    class StepGroup
+      def self.steps(&block)
+        @step_group ||= StepGroup.new(false)
+        @step_group.instance_eval(&block) if block
+        @step_group
+      end
+      
+      def initialize(init_defaults=true,&block)
+        @hash_of_lists_of_steps = Hash.new {|h, k| h[k] = []}
+        if init_defaults
+          self.class.steps.add_to(self)
+        end
+        instance_eval(&block) if block
+      end
+      
+      def find(type, name)
+        @hash_of_lists_of_steps[type].each do |step|
+          return step if step.matches?(name)
+        end
+        return nil
+      end
+
+      def GivenScenario(name, &block)
+        create_matcher(:given_scenario, name, &block)
+      end
+      
+      def Given(name, &block)
+        create_matcher(:given, name, &block)
+      end
+      
+      def When(name, &block)
+        create_matcher(:when, name, &block)
+      end
+      
+      def Then(name, &block)
+        create_matcher(:then, name, &block)
+      end
+
+      alias :given_scenario :GivenScenario
+      alias :given :Given
+      alias :when :When
+      alias :then :Then
+      
+      
+      def add(type, steps)
+        (@hash_of_lists_of_steps[type] << steps).flatten!
+      end
+      
+      def clear
+        @hash_of_lists_of_steps.clear
+      end
+      
+      def empty?
+        [:given_scenario, :given, :when, :then].each do |type|
+          return false unless @hash_of_lists_of_steps[type].empty?
+        end
+        return true
+      end
+      
+      def add_to(other_step_matchers)
+        [:given_scenario, :given, :when, :then].each do |type|
+          other_step_matchers.add(type, @hash_of_lists_of_steps[type])
+        end
+      end
+      
+      def <<(other_step_matchers)
+        other_step_matchers.add_to(self) if other_step_matchers.respond_to?(:add_to)
+      end
+      
+      # TODO - make me private
+      def create_matcher(type, name, &block)
+        matcher = Step.new(name, &block)
+        @hash_of_lists_of_steps[type] << matcher
+        matcher
+      end
+      
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/step_mother.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/step_mother.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/step_mother.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/step_mother.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+module Spec
+  module Story
+    class StepMother
+      def initialize
+        @steps = StepGroup.new
+      end
+      
+      def use(new_step_group)
+        @steps << new_step_group
+      end
+      
+      def store(type, step)
+        @steps.add(type, step)
+      end
+      
+      def find(type, name)
+        if @steps.find(type, name).nil?
+          @steps.add(type,
+          Step.new(name) do
+            raise Spec::Example::ExamplePendingError.new("Unimplemented step: #{name}")
+          end
+          )
+        end
+        @steps.find(type, name)
+      end
+      
+      def clear
+        @steps.clear
+      end
+      
+      def empty?
+        @steps.empty?
+      end
+      
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/story.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/story.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/story.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/story.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+module Spec
+  module Story
+    class Story
+      attr_reader :title, :narrative
+      
+      def initialize(title, narrative, params = {}, &body)
+        @body = body
+        @title = title
+        @narrative = narrative
+        @params = params
+      end
+      
+      def [](key)
+        @params[key]
+      end
+      
+      def run_in(obj)
+        obj.instance_eval(&@body)
+      end
+      
+      def assign_steps_to(assignee)
+        if @params[:steps]
+          assignee.use(@params[:steps])
+        else
+          case keys = @params[:steps_for]
+          when Symbol
+            keys = [keys]
+          when nil
+            keys = []
+          end
+          keys.each do |key|
+            assignee.use(steps_for(key))
+          end
+        end
+      end
+      
+      def steps_for(key)
+        $rspec_story_steps[key]
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/world.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/world.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story/world.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story/world.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,124 @@
+require 'rubygems'
+require 'spec/expectations'
+require 'spec/matchers'
+require 'spec/example/pending'
+
+module Spec
+  module Story
+=begin
+  A World represents the actual instance a scenario will run in.
+  
+  The runner ensures any instance variables and methods defined anywhere
+  in a story block are available to all the scenarios. This includes
+  variables that are created or referenced inside Given, When and Then
+  blocks.
+=end
+    module World
+      include ::Spec::Example::Pending
+      include ::Spec::Matchers
+      # store steps and listeners in the singleton metaclass.
+      # This serves both to keep them out of the way of runtime Worlds
+      # and to make them available to all instances.
+      class << self
+        def create(cls = Object, *args)
+          cls.new(*args).extend(World)
+        end
+        
+        def listeners
+          @listeners ||= []
+        end
+        
+        def add_listener(listener)
+          listeners() << listener
+        end
+        
+        def step_mother
+          @step_mother ||= StepMother.new
+        end
+                
+        def use(steps)
+          step_mother.use(steps)
+        end
+        
+        def step_names
+          @step_names ||= []
+        end
+
+        def run_given_scenario_with_suspended_listeners(world, type, name, scenario)
+          current_listeners = Array.new(listeners)
+          begin
+            listeners.each { |l| l.found_scenario(type, name) }
+            @listeners.clear
+            scenario.perform(world, name) unless ::Spec::Story::Runner.dry_run
+          ensure
+            @listeners.replace(current_listeners)
+          end
+        end
+        
+        def store_and_call(world, type, name, *args, &block)
+          if block_given?
+            step_mother.store(type, Step.new(name, &block))
+          end
+          step = step_mother.find(type, name)
+
+          step_name = step.name
+          step_names << step_name
+          
+          # It's important to have access to the parsed args here, so
+          # we can give them to the listeners. The HTML reporter needs
+          # the args so it can style them. See the generated output in
+          # story_server/prototype/rspec_stories.html (generated by rake stories)
+          args = step.parse_args(name) if args.empty?
+          begin
+            step.perform(world, *args) unless ::Spec::Story::Runner.dry_run
+            listeners.each { |l| l.step_succeeded(type, step_name, *args) }
+          rescue Exception => e
+            case e
+            when Spec::Example::ExamplePendingError
+              @listeners.each { |l| l.step_pending(type, step_name, *args) }
+            else
+              @listeners.each { |l| l.step_failed(type, step_name, *args) }
+            end
+            errors << e
+          end
+        end
+        
+        def errors
+          @errors ||= []
+        end
+      end # end of class << self
+      
+      def start_collecting_errors
+        errors.clear
+      end
+      
+      def errors
+        World.errors
+      end
+      
+      def GivenScenario(name)
+        World.run_given_scenario_with_suspended_listeners(self, :'given scenario', name, GivenScenario.new(name))
+        @__previous_step = :given
+      end
+      
+      def Given(name, *args, &block)
+        World.store_and_call self, :given, name, *args, &block
+        @__previous_step = :given
+      end
+      
+      def When(name, *args, &block)
+        World.store_and_call self, :when, name, *args, &block
+        @__previous_step = :when
+      end
+      
+      def Then(name, *args, &block)
+        World.store_and_call self, :then, name, *args, &block
+        @__previous_step = :then
+      end
+      
+      def And(name, *args, &block)
+        World.store_and_call self, @__previous_step, name, *args, &block
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/story.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/story.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+require 'spec/story/extensions'
+require 'spec/story/given_scenario'
+require 'spec/story/runner'
+require 'spec/story/scenario'
+require 'spec/story/step'
+require 'spec/story/step_group'
+require 'spec/story/step_mother'
+require 'spec/story/story'
+require 'spec/story/world'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/test_case_adapter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/test_case_adapter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/test_case_adapter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/test_case_adapter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+require 'spec/expectations'
+require 'spec/matchers'
+
+module Test
+  module Unit
+    class TestCase
+      include Spec::Matchers
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/translator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/translator.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/translator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/translator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,114 @@
+require 'fileutils'
+
+module Spec
+  class Translator
+    def translate(from, to)
+      from = File.expand_path(from)
+      to = File.expand_path(to)
+      if File.directory?(from)
+        translate_dir(from, to)
+      elsif(from =~ /\.rb$/)
+        translate_file(from, to)
+      end
+    end
+    
+    def translate_dir(from, to)
+      FileUtils.mkdir_p(to) unless File.directory?(to)
+      Dir["#{from}/*"].each do |sub_from|
+        path = sub_from[from.length+1..-1]
+        sub_to = File.join(to, path)
+        translate(sub_from, sub_to)
+      end
+    end
+
+    def translate_file(from, to)
+      translation = ""
+      File.open(from) do |io|
+        io.each_line do |line|
+          translation << translate_line(line)
+        end
+      end
+      File.open(to, "w") do |io|
+        io.write(translation)
+      end
+    end
+
+    def translate_line(line)
+      # Translate deprecated mock constraints
+      line.gsub!(/:any_args/, 'any_args')
+      line.gsub!(/:anything/, 'anything')
+      line.gsub!(/:boolean/, 'boolean')
+      line.gsub!(/:no_args/, 'no_args')
+      line.gsub!(/:numeric/, 'an_instance_of(Numeric)')
+      line.gsub!(/:string/, 'an_instance_of(String)')
+
+      return line if line =~ /(should_not|should)_receive/
+      
+      line.gsub!(/(^\s*)context([\s*|\(]['|"|A-Z])/, '\1describe\2')
+      line.gsub!(/(^\s*)specify([\s*|\(]['|"|A-Z])/, '\1it\2')
+      line.gsub!(/(^\s*)context_setup(\s*[do|\{])/, '\1before(:all)\2')
+      line.gsub!(/(^\s*)context_teardown(\s*[do|\{])/, '\1after(:all)\2')
+      line.gsub!(/(^\s*)setup(\s*[do|\{])/, '\1before(:each)\2')
+      line.gsub!(/(^\s*)teardown(\s*[do|\{])/, '\1after(:each)\2')
+      
+      if line =~ /(.*\.)(should_not|should)(?:_be)(?!_)(.*)/m
+        pre = $1
+        should = $2
+        post = $3
+        be_or_equal = post =~ /(<|>)/ ? "be" : "equal"
+        
+        return "#{pre}#{should} #{be_or_equal}#{post}"
+      end
+      
+      if line =~ /(.*\.)(should_not|should)_(?!not)\s*(.*)/m
+        pre = $1
+        should = $2
+        post = $3
+        
+        post.gsub!(/^raise/, 'raise_error')
+        post.gsub!(/^throw/, 'throw_symbol')
+        
+        unless standard_matcher?(post)
+          post = "be_#{post}"
+        end
+        
+        # Add parenthesis
+        post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\'|\"|\:|@| ]+)(\})/, '\1(\2)\3') # inside a block
+        post.gsub!(/^(redirect_to)\s+(.*)/, '\1(\2)') # redirect_to, which often has http:
+        post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\{.*\}|\'|\"|\:|@| ]+)/, '\1(\2)')
+        post.gsub!(/(\s+\))/, ')')
+        post.gsub!(/\)\}/, ') }')
+        post.gsub!(/^(\w+)\s+(\/.*\/)/, '\1(\2)') #regexps
+        line = "#{pre}#{should} #{post}"
+      end
+
+      line
+    end
+    
+    def standard_matcher?(matcher)
+      patterns = [
+        /^be/, 
+        /^be_close/,
+        /^eql/, 
+        /^equal/, 
+        /^has/, 
+        /^have/, 
+        /^change/, 
+        /^include/,
+        /^match/, 
+        /^raise_error/, 
+        /^respond_to/, 
+        /^redirect_to/, 
+        /^satisfy/, 
+        /^throw_symbol/,
+        # Extra ones that we use in spec_helper
+        /^pass/,
+        /^fail/,
+        /^fail_with/,
+      ]
+      matched = patterns.detect{ |p| matcher =~ p }
+      !matched.nil?
+    end
+    
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec/version.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/version.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec/version.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec/version.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,23 @@
+module Spec
+  module VERSION
+    unless defined? MAJOR
+      MAJOR  = 1
+      MINOR  = 1
+      TINY   = 0
+      RELEASE_CANDIDATE = nil
+
+      # RANDOM_TOKEN: 0.885013695004692
+      REV = "$LastChangedRevision: 2958 $".match(/LastChangedRevision: (\d+)/)[1]
+
+      STRING = [MAJOR, MINOR, TINY].join('.')
+      TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')
+      FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')} (r#{REV})"
+
+      NAME   = "RSpec"
+      URL    = "http://rspec.rubyforge.org/"  
+    
+      DESCRIPTION = "#{NAME}-#{FULL_VERSION} - BDD for Ruby\n#{URL}"
+    end
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/lib/spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/lib/spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/lib/spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,38 @@
+require 'spec/version'
+require 'spec/matchers'
+require 'spec/expectations'
+require 'spec/translator'
+require 'spec/example'
+require 'spec/extensions'
+require 'spec/runner'
+require 'spec/story'
+
+if Object.const_defined?(:Test); \
+  require 'spec/extensions/test'; \
+end
+module Spec
+  class << self
+    def run?
+      @run || rspec_options.examples_run?
+    end
+
+    def run; \
+      return true if run?; \
+      result = rspec_options.run_examples; \
+      @run = true; \
+      result; \
+    end
+    attr_writer :run
+
+    def exit?; \
+      !Object.const_defined?(:Test) || Test::Unit.run?; \
+    end
+  end
+end
+
+at_exit do \
+  unless $! || Spec.run?; \
+    success = Spec.run; \
+    exit success if Spec.exit?; \
+  end \
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/flexmock.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/flexmock.rb
--- mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/flexmock.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/flexmock.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+#  Created by Jim Weirich on 2007-04-10.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'flexmock/rspec'
+
+module Spec
+  module Plugins
+    module MockFramework
+      include FlexMock::MockContainer
+      def setup_mocks_for_rspec
+        # No setup required
+      end
+      def verify_mocks_for_rspec
+        flexmock_verify
+      end
+      def teardown_mocks_for_rspec
+        flexmock_close
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/mocha.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/mocha.rb
--- mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/mocha.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/mocha.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,19 @@
+require 'mocha/standalone'
+require 'mocha/object'
+
+module Spec
+  module Plugins
+    module MockFramework
+      include Mocha::Standalone
+      def setup_mocks_for_rspec
+        mocha_setup
+      end
+      def verify_mocks_for_rspec
+        mocha_verify
+      end
+      def teardown_mocks_for_rspec
+        mocha_teardown
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/rr.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/rr.rb
--- mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/rr.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/rr.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+require 'rr'
+
+patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS
+patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
+
+module Spec
+  module Plugins
+    module MockFramework
+      include RR::Extensions::InstanceMethods
+      def setup_mocks_for_rspec
+        RR::Space.instance.reset
+      end
+      def verify_mocks_for_rspec
+        RR::Space.instance.verify_doubles
+      end
+      def teardown_mocks_for_rspec
+        RR::Space.instance.reset
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "spec", "mocks"))
+
+module Spec
+  module Plugins
+    module MockFramework
+      include Spec::Mocks::SpecMethods
+      def setup_mocks_for_rspec
+        $rspec_mocks ||= Spec::Mocks::Space.new
+      end
+      def verify_mocks_for_rspec
+        $rspec_mocks.verify_all
+      end
+      def teardown_mocks_for_rspec
+        $rspec_mocks.reset_all
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/examples.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/examples.rake
--- mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/examples.rake	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/examples.rake	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Run all examples"
+Spec::Rake::SpecTask.new('examples') do |t|
+  t.spec_files = FileList['examples/**/*.rb']
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/examples_with_rcov.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/examples_with_rcov.rake
--- mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/examples_with_rcov.rake	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/examples_with_rcov.rake	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Run all examples with RCov"
+Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
+  t.spec_files = FileList['examples/**/*.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'examples']
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/failing_examples_with_html.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/failing_examples_with_html.rake
--- mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/failing_examples_with_html.rake	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/failing_examples_with_html.rake	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Generate HTML report for failing examples"
+Spec::Rake::SpecTask.new('failing_examples_with_html') do |t|
+  t.spec_files = FileList['failing_examples/**/*.rb']
+  t.spec_opts = ["--format", "html:../doc/output/documentation/tools/failing_examples.html", "--diff"]
+  t.fail_on_error = false
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/verify_rcov.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/verify_rcov.rake
--- mephisto-0.7.3/vendor/plugins/rspec/rake_tasks/verify_rcov.rake	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/rake_tasks/verify_rcov.rake	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+require 'rake'
+require 'spec/rake/verify_rcov'
+
+RCov::VerifyTask.new(:verify_rcov => :spec) do |t|
+  t.threshold = 100.0 # Make sure you have rcov 0.7 or higher!
+  t.index_html = '../doc/output/coverage/index.html'
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/README.jruby technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/README.jruby
--- mephisto-0.7.3/vendor/plugins/rspec/spec/README.jruby	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/README.jruby	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+= Running specs on JRuby =
+
+svn co http://svn.codehaus.org/jruby/trunk jruby
+cd jruby/jruby
+ant clean
+ant
+# put JRuby's bin dir on your PATH
+jruby -S gem install rake --no-ri --no-rdoc
+jruby -S gem install diff-lcs
+cd ../testsuites/rspec
+mkdir target
+jruby -S rake checkout_code
+cd target/rspec
+jruby bin/spec spec -c
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/autotest/discover_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/autotest/discover_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/autotest/discover_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/autotest/discover_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + "/../autotest_helper"
+
+module DiscoveryHelper
+  def load_discovery
+    require File.dirname(__FILE__) + "/../../lib/autotest/discover"
+  end
+end
+
+
+class Autotest
+  describe Rspec, "discovery" do
+    include DiscoveryHelper
+    
+    it "should add the rspec autotest plugin" do
+      Autotest.should_receive(:add_discovery).and_yield
+      load_discovery
+    end
+  end  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/autotest/rspec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/autotest/rspec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/autotest/rspec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/autotest/rspec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,264 @@
+require File.dirname(__FILE__) + "/../autotest_helper"
+
+class Autotest
+  
+  module AutotestHelper
+    def rspec_output
+      <<-HERE
+.............PPF
+
+1)
+'false should be false' FAILED
+expected: true,
+     got: false (using ==)
+./spec/autotest/rspec_spec.rb:203:
+
+Finished in 0.158674 seconds
+
+16 examples, 1 failure, 2 pending
+
+Pending:
+Autotest::Rspec handling failed results should return an array of failed examples and errors (TODO)
+Autotest::Rspec tests/specs for a given file should find all the specs for a given file (TODO)
+HERE
+    end
+    
+    
+    def common_setup
+      @proc = mock Proc
+      @kernel = mock Kernel
+      @kernel.stub!(:proc).and_return @proc
+
+      File.stub!(:exists).and_return true
+      @windows_alt_separator = "\\"
+      @posix_separator = '/'
+
+      @rspec_output = rspec_output
+    end
+  end
+
+  describe Rspec, "rspec_commands" do
+    it "should contain the various commands, ordered by preference" do
+      Rspec.new.spec_commands.should == [
+        File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec"),
+        "#{Config::CONFIG['bindir']}/spec"
+      ]
+    end
+  end
+  
+  describe Rspec, "selection of rspec command" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+      @rspec_autotest = Rspec.new(@kernel)
+    end
+    
+    it "should try to find the spec command if it exists in ./bin and use it above everything else" do
+      File.stub!(:exists?).and_return true
+
+      spec_path = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec")
+      File.should_receive(:exists?).with(spec_path).and_return true
+      @rspec_autotest.spec_command.should == spec_path
+    end
+
+    it "should otherwise select the default spec command in gem_dir/bin/spec" do
+      @rspec_autotest.stub!(:spec_commands).and_return ["/foo/spec"]
+      Config::CONFIG.stub!(:[]).and_return "/foo"
+      File.should_receive(:exists?).with("/foo/spec").and_return(true)
+
+      @rspec_autotest.spec_command.should == "/foo/spec"
+    end
+    
+    it "should raise an error if no spec command is found at all" do
+      File.stub!(:exists?).and_return false
+      
+      lambda {
+        @rspec_autotest.spec_command
+      }.should raise_error(RspecCommandError, "No spec command could be found!")
+    end
+    
+  end
+  
+  describe Rspec, "selection of rspec command (windows compatibility issues)" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+    end
+    
+    it "should use the ALT_SEPARATOR if it is non-nil" do
+      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec")
+      @rspec_autotest.stub!(:spec_commands).and_return [spec_command]
+      @rspec_autotest.spec_command.should == spec_command.gsub('/', '\\')
+    end
+    
+    it "should not use the ALT_SEPATOR if it is nil" do
+      @windows_alt_separator = nil
+      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec")
+      @rspec_autotest.stub!(:spec_commands).and_return [spec_command]
+      @rspec_autotest.spec_command.should == spec_command
+    end
+  end
+
+  describe Rspec, "adding spec.opts --options" do 
+    before :each do
+      @rspec_autotest = Rspec.new
+    end
+
+    it "should return the command line option to add spec.opts if the options file exists" do
+      File.stub!(:exist?).and_return true
+      @rspec_autotest.add_options_if_present.should == "-O spec/spec.opts "
+    end
+
+    it "should return an empty string if no spec.opts exists" do
+      File.stub!(:exist?).and_return false
+      Rspec.new.add_options_if_present.should == ""
+    end
+  end  
+  
+  describe Rspec do
+    before :each do
+      @rspec_autotest = Rspec.new
+      @rspec_autotest.stub!(:ruby).and_return "ruby"
+      @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts"
+      
+      @ruby = @rspec_autotest.ruby
+      @spec_command = @rspec_autotest.spec_command
+      @options = @rspec_autotest.add_options_if_present
+      @files_to_test = {
+        :spec => ["file_one", "file_two"]
+      }
+      # this is not the inner representation of Autotest!
+      @rspec_autotest.stub!(:files_to_test).and_return @files_to_test
+      @files_to_test.stub!(:keys).and_return @files_to_test[:spec]
+      @to_test = @files_to_test.keys.flatten.join ' '
+    end
+    
+    it "should make the apropriate test command" do
+      @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} -S #{@spec_command} #{@options} #{@to_test}"
+    end
+  end
+  
+  describe Rspec, "test mappings" do
+    before :each do
+      @proc = mock Proc
+      @kernel = mock Kernel
+      @kernel.stub!(:proc).and_return @proc
+      @rspec_autotest = Rspec.new(@kernel)
+    end
+      
+    it "should map all filenames in spec/ which end in .rb" do
+      @rspec_autotest.test_mappings[%r%^spec/.*\.rb$%].should == @proc
+    end
+    
+    it "should map all names in lib which end in .rb to the corresponding ones in spec/" do
+      @rspec_autotest.test_mappings[%r%^lib/(.*)\.rb$%].should == @proc
+    end
+    
+    it "should find all files in spec/shares/* and the spec helper in spec/spec_helper"  do
+      @rspec_autotest.test_mappings[%r%^spec/(spec_helper|shared/.*)\.rb$%].should == @proc
+    end
+  end
+  
+  describe Rspec, "handling results" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      @rspec_autotest.stub!(:hook)
+      
+      @results = mock String
+      @results.stub!(:scan).and_return ""
+    end
+    
+    it "should call hook(:red) if there are failures" do
+      @rspec_autotest.stub!(:consolidate_failures).and_return ["spec/some_spec.rb"]
+      
+      @rspec_autotest.should_receive(:hook).with(:red)
+      @rspec_autotest.handle_results(@results)
+    end
+    
+    it "should call hook(:green) if there are no failures" do
+      @rspec_autotest.stub!(:consolidate_failures).and_return []
+      @rspec_autotest.should_receive(:hook).with(:green)
+      @rspec_autotest.handle_results(@results)
+    end
+  end
+  
+  describe Rspec, "handling failed results" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+    end
+    
+    it %(should scan the output into a multi-dimensional array, 
+        consisting of the failing spec's name as the first element, 
+        and the failure as the second) do
+      @rspec_autotest = Rspec.new
+      @rspec_autotest.failed_results(@rspec_output).should == [
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:"
+        ]
+      ]
+    end
+  end
+  
+  describe Rspec, "specs for a given file" do
+    before :each do
+      @lib_file = "lib/something.rb"
+      @spec_file = "spec/something_spec.rb"
+      @rspec_autotest = Rspec.new
+
+      @rspec_autotest.instance_variable_set("@files", {@lib_file => Time.now, @spec_file => Time.now})
+      @rspec_autotest.stub!(:find_files_to_test).and_return true
+    end
+    
+    it "should find the spec file for a given lib file" do
+      @rspec_autotest.specs_for_file(@lib_file).should == [@spec_file]
+    end
+    
+    it "should find the spec file if given a spec file" do
+      @rspec_autotest.specs_for_file(@spec_file).should == [@spec_file]
+    end
+    
+    it "should only find the file if the file is being tracked (in @file)"  do
+      @other_file = "lib/some_non_tracked_file"
+      @rspec_autotest.specs_for_file(@other_file).should == []
+    end
+  end
+  
+  describe Rspec, "consolidating failures" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+      @rspec_autotest = Rspec.new
+      
+      @spec_file = "./spec/autotest/rspec_spec.rb"
+      @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now})
+      @rspec_autotest.stub!(:find_files_to_test).and_return true
+    end
+    
+    it "should return no failures if no failures were given in the output" do
+      @rspec_autotest.stub!(:failed_results).and_return [[]]
+      @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {}
+    end
+    
+    it "should return a hash with the spec filename => spec name for each failure or error" do
+      @rspec_autotest.stub!(:failed_results).and_return([
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:"
+        ]
+      ])
+      @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {@spec_file => ["false should be false"]}
+    end
+    
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/autotest_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/autotest_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/autotest_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/autotest_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+require "rubygems"
+require 'autotest'
+dir = File.dirname(__FILE__)
+require "#{dir}/spec_helper"
+require File.expand_path("#{dir}/../lib/autotest/rspec")
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/rspec_suite.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/rspec_suite.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/rspec_suite.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/rspec_suite.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+if __FILE__ == $0
+  dir = File.dirname(__FILE__)
+  Dir["#{dir}/**/*_spec.rb"].each do |file|
+#    puts "require '#{file}'"
+    require file
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/configuration_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/configuration_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/configuration_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/configuration_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,290 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Example
+    ConfigurationSpec =
+      describe Configuration, :shared => true do
+        before(:each) do
+          @config = Configuration.new
+          @behaviour = mock("behaviour")
+        end
+      end
+    
+    describe Configuration, "#mock_with" do
+      include ConfigurationSpec
+      it "should default mock framework to rspec" do
+        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
+      end
+
+      it "should let you set rspec mocking explicitly" do
+        @config.mock_with(:rspec)
+        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rspec$/
+      end
+
+      it "should let you set mocha" do
+        @config.mock_with(:mocha)
+        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/mocha$/
+      end
+
+      it "should let you set flexmock" do
+        @config.mock_with(:flexmock)
+        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/flexmock$/
+      end
+
+      it "should let you set rr" do
+        @config.mock_with(:rr)
+        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rr$/
+      end
+
+      it "should let you set an arbitrary adapter module" do
+        adapter = Module.new
+        @config.mock_with(adapter)
+        @config.mock_framework.should == adapter
+      end
+    end
+
+    describe Configuration, "#include" do
+      include ConfigurationSpec
+
+      before do
+        @original_configuration = Spec::Runner.configuration
+        spec_configuration = @config
+        Spec::Runner.instance_eval {@configuration = spec_configuration}
+        @example_group_class = Class.new(ExampleGroup) do
+          class << self
+            def this_class_has_special_methods
+            end
+          end
+        end
+        ExampleGroupFactory.register(:foobar, @example_group_class)
+      end
+
+      after do
+        original_configuration = @original_configuration
+        Spec::Runner.instance_eval {@configuration = original_configuration}
+        ExampleGroupFactory.reset
+      end
+
+      it "should include the submitted module in ExampleGroup subclasses" do
+        mod = Module.new
+        @config.include mod
+        Class.new(@example_group_class).included_modules.should include(mod)
+      end
+
+      it "should let you define modules to be included for a specific type" do
+        mod = Module.new
+        @config.include mod, :behaviour_type => :foobar
+        Class.new(@example_group_class).included_modules.should include(mod)
+      end
+
+      it "should not include modules in a type they are not intended for" do
+        mod = Module.new
+        @other_example_group_class = Class.new(ExampleGroup)
+        ExampleGroupFactory.register(:baz, @other_example_group_class)
+
+        @config.include mod, :behaviour_type => :foobar
+
+        Class.new(@other_example_group_class).included_modules.should_not include(mod)
+      end
+      
+      it "should not extend the ExampleGroup baseclass (to enable the included hook to work properly)" do
+        pending("need to figure out how to best express this one")
+      end
+    end
+
+    ConfigurationCallbacksSpec =
+      describe Configuration, " callbacks", :shared => true do
+        before do
+          @config = Configuration.new
+          @special_behaviour = Class.new(ExampleGroup)
+          @special_child_behaviour = Class.new(@special_behaviour)
+          @nonspecial_behaviour = Class.new(ExampleGroup)
+          ExampleGroupFactory.register(:special, @special_behaviour)
+          ExampleGroupFactory.register(:special_child, @special_child_behaviour)
+          ExampleGroupFactory.register(:non_special, @nonspecial_behaviour)
+          @behaviour = @special_child_behaviour.describe "Special Example Group"
+          @unselected_behaviour = Class.new(@nonspecial_behaviour).describe "Non Special Example Group"
+        end
+
+        after do
+          ExampleGroupFactory.reset
+        end
+      end
+
+    describe Configuration, "#prepend_before" do
+      include ConfigurationCallbacksSpec
+
+      it "prepends the before block on all instances of the passed in behaviour_type" do
+        order = []
+        @config.prepend_before(:all) do
+          order << :prepend__before_all
+        end
+        @config.prepend_before(:all, :behaviour_type => :special) do
+          order << :special_prepend__before_all
+        end
+        @config.prepend_before(:all, :behaviour_type => :special_child) do
+          order << :special_child_prepend__before_all
+        end
+        @config.prepend_before(:each) do
+          order << :prepend__before_each
+        end
+        @config.prepend_before(:each, :behaviour_type => :special) do
+          order << :special_prepend__before_each
+        end
+        @config.prepend_before(:each, :behaviour_type => :special_child) do
+          order << :special_child_prepend__before_each
+        end
+        @config.prepend_before(:all, :behaviour_type => :non_special) do
+          order << :special_prepend__before_all
+        end
+        @config.prepend_before(:each, :behaviour_type => :non_special) do
+          order << :special_prepend__before_each
+        end
+        @behaviour.it "calls prepend_before" do
+        end
+        
+        @behaviour.suite.run
+        order.should == [
+          :prepend__before_all,
+          :special_prepend__before_all,
+          :special_child_prepend__before_all,
+          :prepend__before_each,
+          :special_prepend__before_each,
+          :special_child_prepend__before_each
+        ]
+      end
+    end
+
+    describe Configuration, "#append_before" do
+      include ConfigurationCallbacksSpec
+
+      it "calls append_before on the behaviour_type" do
+        order = []
+        @config.append_before(:all) do
+          order << :append_before_all
+        end
+        @config.append_before(:all, :behaviour_type => :special) do
+          order << :special_append_before_all
+        end
+        @config.append_before(:all, :behaviour_type => :special_child) do
+          order << :special_child_append_before_all
+        end
+        @config.append_before(:each) do
+          order << :append_before_each
+        end
+        @config.append_before(:each, :behaviour_type => :special) do
+          order << :special_append_before_each
+        end
+        @config.append_before(:each, :behaviour_type => :special_child) do
+          order << :special_child_append_before_each
+        end
+        @config.append_before(:all, :behaviour_type => :non_special) do
+          order << :special_append_before_all
+        end
+        @config.append_before(:each, :behaviour_type => :non_special) do
+          order << :special_append_before_each
+        end
+        @behaviour.it "calls append_before" do
+        end
+
+        @behaviour.suite.run
+        order.should == [
+          :append_before_all,
+          :special_append_before_all,
+          :special_child_append_before_all,
+          :append_before_each,
+          :special_append_before_each,
+          :special_child_append_before_each
+        ]
+      end
+    end
+
+    describe Configuration, "#prepend_after" do
+      include ConfigurationCallbacksSpec
+
+      it "prepends the after block on all instances of the passed in behaviour_type" do
+        order = []
+        @config.prepend_after(:all) do
+          order << :prepend__after_all
+        end
+        @config.prepend_after(:all, :behaviour_type => :special) do
+          order << :special_prepend__after_all
+        end
+        @config.prepend_after(:all, :behaviour_type => :special) do
+          order << :special_child_prepend__after_all
+        end
+        @config.prepend_after(:each) do
+          order << :prepend__after_each
+        end
+        @config.prepend_after(:each, :behaviour_type => :special) do
+          order << :special_prepend__after_each
+        end
+        @config.prepend_after(:each, :behaviour_type => :special) do
+          order << :special_child_prepend__after_each
+        end
+        @config.prepend_after(:all, :behaviour_type => :non_special) do
+          order << :special_prepend__after_all
+        end
+        @config.prepend_after(:each, :behaviour_type => :non_special) do
+          order << :special_prepend__after_each
+        end
+        @behaviour.it "calls prepend_after" do
+        end
+
+        @behaviour.suite.run
+        order.should == [
+          :special_child_prepend__after_each,
+          :special_prepend__after_each,
+          :prepend__after_each,
+          :special_child_prepend__after_all,
+          :special_prepend__after_all,
+          :prepend__after_all
+        ]
+      end
+    end
+
+    describe Configuration, "#append_after" do
+      include ConfigurationCallbacksSpec
+
+      it "calls append_after on the behaviour_type" do
+        order = []
+        @config.append_after(:all) do
+          order << :append__after_all
+        end
+        @config.append_after(:all, :behaviour_type => :special) do
+          order << :special_append__after_all
+        end
+        @config.append_after(:all, :behaviour_type => :special_child) do
+          order << :special_child_append__after_all
+        end
+        @config.append_after(:each) do
+          order << :append__after_each
+        end
+        @config.append_after(:each, :behaviour_type => :special) do
+          order << :special_append__after_each
+        end
+        @config.append_after(:each, :behaviour_type => :special_child) do
+          order << :special_child_append__after_each
+        end
+        @config.append_after(:all, :behaviour_type => :non_special) do
+          order << :non_special_append_after_all
+        end
+        @config.append_after(:each, :behaviour_type => :non_special) do
+          order << :non_special_append_after_each
+        end
+        @behaviour.it "calls append_after" do
+        end
+
+        @behaviour.suite.run
+        order.should == [
+          :special_child_append__after_each,
+          :special_append__after_each,
+          :append__after_each,
+          :special_child_append__after_all,
+          :special_append__after_all,
+          :append__after_all
+        ]
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    class ExampleGroupSubclass < ExampleGroup
+      class << self
+        attr_accessor :examples_ran
+      end
+
+      @@klass_variable_set = true
+      CONSTANT = :foobar
+
+      before do
+        @instance_variable = :hello
+      end
+
+      it "should run" do
+        self.class.examples_ran = true
+      end
+
+      it "should have access to instance variables" do
+        @instance_variable.should == :hello
+      end
+
+      it "should have access to class variables" do
+        @@klass_variable_set.should == true
+      end
+
+      it "should have access to constants" do
+        CONSTANT.should == :foobar
+      end
+
+      it "should have access to methods defined in the Example Group" do
+        a_method.should == 22
+      end
+
+      def a_method
+        22
+      end
+    end
+
+    describe ExampleGroupSubclass do
+      it "should run" do
+        ExampleGroupSubclass.examples_ran.should be_true
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_description_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_description_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_description_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_description_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,98 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe ExampleGroupDescription, " constructed with a single String" do
+      before(:each) {@description = ExampleGroupDescription.new("abc")}
+      
+      it "should provide that string as its name" do
+        @description.description.should == "abc"
+      end
+      it "should provide nil as its type" do
+        @description.described_type.should be_nil
+      end
+      it "should respond to []" do
+        @description[:key].should be_nil
+      end
+      it "should respond to []=" do
+        @description[:key] = :value
+        @description[:key].should == :value
+      end
+      it "should return for == when value matches description" do
+        @description.should == "abc"
+      end
+      it "should return for == when value is other description that matches description" do
+        @description.should == ExampleGroupDescription.new("abc")
+      end
+    end
+    
+    describe ExampleGroupDescription, " constructed with a Type" do
+      before(:each) {@description = ExampleGroupDescription.new(ExampleGroup)}
+
+      it "should provide a String representation of that type (fully qualified) as its name" do
+        @description.description.should == "Spec::Example::ExampleGroup"
+      end
+      it "should provide that type (fully qualified) as its type" do
+        @description.described_type.should == Spec::Example::ExampleGroup
+      end
+    end
+    
+    describe ExampleGroupDescription, " constructed with a Type and a String" do
+      before(:each) {@description = ExampleGroupDescription.new(ExampleGroup, " behaving")}
+      
+      it "should include the type and second String in its name" do
+        @description.description.should == "Spec::Example::ExampleGroup behaving"
+      end
+      it "should provide that type (fully qualified) as its type" do
+        @description.described_type.should == Spec::Example::ExampleGroup
+      end
+    end
+
+    describe ExampleGroupDescription, "constructed with a Type and a String not starting with a space" do
+      before(:each) {@description = ExampleGroupDescription.new(ExampleGroup, "behaving")}
+
+      it "should include the type and second String with a space in its name" do
+        @description.description.should == "Spec::Example::ExampleGroup behaving"
+      end
+    end
+
+    describe ExampleGroupDescription, "constructed with a Type and a String starting with a ." do
+      before(:each) {@description = ExampleGroupDescription.new(ExampleGroup, ".behaving")}
+
+      it "should include the type and second String with a space in its name" do
+        @description.description.should == "Spec::Example::ExampleGroup.behaving"
+      end
+    end
+
+    describe ExampleGroupDescription, "constructed with a Type and a String starting with a #" do
+      before(:each) {@description = ExampleGroupDescription.new(ExampleGroup, "#behaving")}
+
+      it "should include the type and second String with a space in its name" do
+        @description.description.should == "Spec::Example::ExampleGroup#behaving"
+      end
+    end
+
+    describe ExampleGroupDescription, "constructed with String, Type, String" do
+      before(:each) {@description = ExampleGroupDescription.new("A", Hash, "with one entry")}
+
+      it "should include create a description with all arguments" do
+        @description.description.should == "A Hash with one entry"
+      end
+    end
+    
+    describe ExampleGroupDescription, " constructed with options" do
+      before(:each) do
+        @description = ExampleGroupDescription.new(ExampleGroup, :a => "b", :spec_path => "blah")
+      end
+
+      it "should expose its options" do
+        @description[:a].should == "b"
+      end
+      
+      it "should wrap spec path using File.expand_path" do
+        @description[:spec_path].should == File.expand_path("blah")
+      end
+    end
+    
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,145 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe ExampleGroupFactory, "with :foobar registered as custom type" do
+
+      before do
+        @behaviour = Class.new(ExampleGroup)
+        ExampleGroupFactory.register(:foobar, @behaviour)
+      end
+
+      after do
+        ExampleGroupFactory.reset
+      end
+
+      it "should #get the default behaviour type when passed nil" do
+        ExampleGroupFactory.get(nil).should == ExampleGroup
+      end
+
+      it "should #get custom type for :foobar" do
+        ExampleGroupFactory.get(:foobar).should == @behaviour
+      end
+
+      it "should #get the actual type when that is passed in" do
+        ExampleGroupFactory.get(@behaviour).should == @behaviour
+      end
+
+      it "should #get nil for unregistered non-nil values" do
+        ExampleGroupFactory.get(:does_not_exist).should be_nil
+      end
+
+      it "should raise error for #get! with unknown key" do
+        proc do
+          ExampleGroupFactory.get!(:does_not_exist)
+        end.should raise_error
+      end
+    end    
+
+    describe ExampleGroupFactory, "#create_example_group" do
+      it "should create a uniquely named class" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group("behaviour") {}
+        behaviour.name.should =~ /Spec::Example::ExampleGroup::Subclass_\d+/
+      end
+
+      it "should create a Spec::Example::Example subclass by default" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group("behaviour") {}
+        behaviour.superclass.should == Spec::Example::ExampleGroup
+      end
+
+      it "should create a Spec::Example::Example when :type => :default" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "behaviour", :type => :default
+        ) {}
+        behaviour.superclass.should == Spec::Example::ExampleGroup
+      end
+
+      it "should create a Spec::Example::Example when :behaviour_type => :default" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "behaviour", :behaviour_type => :default
+        ) {}
+        behaviour.superclass.should == Spec::Example::ExampleGroup
+      end
+
+      it "should create specified type when :type => :something_other_than_default" do
+        klass = Class.new(ExampleGroup) do
+          def initialize(*args, &block); end
+        end
+        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "behaviour", :type => :something_other_than_default
+        ) {}
+        behaviour.superclass.should == klass
+      end
+
+      it "should create specified type when :behaviour_type => :something_other_than_default" do
+        klass = Class.new(ExampleGroup) do
+          def initialize(*args, &block); end
+        end
+        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "behaviour", :behaviour_type => :something_other_than_default
+        ) {}
+        behaviour.superclass.should == klass
+      end
+      
+      it "should create a type indicated by :spec_path" do
+        klass = Class.new(ExampleGroup) do
+          def initialize(*args, &block); end
+        end
+        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "behaviour", :spec_path => "./spec/something_other_than_default/some_spec.rb"
+        ) {}
+        behaviour.superclass.should == klass
+      end
+      
+      it "should create a type indicated by :spec_path (with spec_path generated by caller on windows)" do
+        klass = Class.new(ExampleGroup) do
+          def initialize(*args, &block); end
+        end
+        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "behaviour", :spec_path => "./spec\\something_other_than_default\\some_spec.rb"
+        ) {}
+        behaviour.superclass.should == klass
+      end
+      
+      it "should create and register a Spec::Example::Example if :shared => true" do
+        shared_example_group = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/models/blah.rb', :behaviour_type => :controller, :shared => true
+        ) {}
+        shared_example_group.should be_an_instance_of(Spec::Example::SharedExampleGroup)
+        SharedExampleGroup.shared_example_groups.should include(shared_example_group)
+      end
+
+      it "should favor the :behaviour_type over the :spec_path" do
+        klass = Class.new(ExampleGroup) do
+          def initialize(*args, &block); end
+        end
+        Spec::Example::ExampleGroupFactory.register(:something_other_than_default, klass)
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/models/blah.rb', :behaviour_type => :something_other_than_default
+        ) {}
+        behaviour.superclass.should == klass
+      end
+
+      it "should register ExampleGroup by default" do
+        example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
+        end
+        rspec_options.example_groups.should include(example_group)
+      end
+
+      it "should enable unregistering of ExampleGroups" do
+        example_group = Spec::Example::ExampleGroupFactory.create_example_group("The ExampleGroup") do
+          unregister
+        end
+        rspec_options.example_groups.should_not include(example_group)
+      end
+      
+      after(:each) do
+        Spec::Example::ExampleGroupFactory.reset
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_group_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_group_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,468 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe ExampleGroup do
+      attr_reader :options, :example_group, :result, :reporter
+      before(:all) do
+        @original_rspec_options = $rspec_options
+      end
+
+      before(:each) do
+        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+        $rspec_options = @options
+        options.formatters << mock("formatter", :null_object => true)
+        options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
+        @reporter = FakeReporter.new(@options)
+        options.reporter = reporter
+        @example_group = Class.new(ExampleGroup) do
+          describe("example")
+          it "does nothing"
+        end
+        class << example_group
+          public :include
+        end
+        @result = nil
+      end
+
+      after(:each) do
+        $rspec_options = @original_rspec_options
+        ExampleGroup.reset
+      end
+
+      describe ExampleGroup, ".describe" do
+        attr_reader :child_example_group
+        before do
+          @child_example_group = @example_group.describe("Another ExampleGroup") do
+            it "should pass" do
+              true.should be_true
+            end
+          end
+        end
+
+        it "should create a subclass of the ExampleGroup when passed a block" do
+          child_example_group.superclass.should == @example_group
+          @options.example_groups.should include(child_example_group)
+        end
+
+        it "should not inherit examples" do
+          child_example_group.examples.length.should == 1
+        end
+      end
+
+      describe ExampleGroup, ".it" do
+        it "should should create an example instance" do
+          lambda {
+            @example_group.it("")
+          }.should change { @example_group.examples.length }.by(1)
+        end
+      end
+
+      describe ExampleGroup, ".xit" do
+        before(:each) do
+          Kernel.stub!(:warn)
+        end
+
+        it "should NOT  should create an example instance" do
+          lambda {
+            @example_group.xit("")
+          }.should_not change(@example_group.examples, :length)
+        end
+
+        it "should warn that it is disabled" do
+          Kernel.should_receive(:warn).with("Example disabled: foo")
+          @example_group.xit("foo")
+        end
+      end
+
+      describe ExampleGroup, ".suite" do
+        it "should return an empty ExampleSuite when there is no description" do
+          ExampleGroup.description.should be_nil
+          ExampleGroup.suite.should be_instance_of(ExampleSuite)
+          ExampleGroup.suite.tests.should be_empty
+        end
+
+        it "should return an ExampleSuite with Examples" do
+          behaviour = Class.new(ExampleGroup) do
+            describe('example')
+            it "should pass" do
+              1.should == 1
+            end
+          end
+          suite = behaviour.suite
+          suite.tests.length.should == 1
+          suite.tests.first._example.description.should == "should pass"
+        end
+
+        it "should include methods that begin with test and has an arity of 0 in suite" do
+          behaviour = Class.new(ExampleGroup) do
+            describe('example')
+            def test_any_args(*args)
+              true.should be_true
+            end
+            def test_something
+              1.should == 1
+            end
+            def test
+              raise "This is not a real test"
+            end
+            def testify
+              raise "This is not a real test"
+            end
+          end
+          suite = behaviour.suite
+          suite.tests.length.should == 2
+          descriptions = suite.tests.collect {|test| test._example.description}.sort
+          descriptions.should == ["test_any_args", "test_something"]
+          suite.run.should be_true
+        end
+
+        it "should include methods that begin with should and has an arity of 0 in suite" do
+          behaviour = Class.new(ExampleGroup) do
+            describe('example')
+            def shouldCamelCase
+              true.should be_true
+            end
+            def should_any_args(*args)
+              true.should be_true
+            end
+            def should_something
+              1.should == 1
+            end
+            def should_not_something
+              1.should_not == 2
+            end
+            def should
+              raise "This is not a real example"
+            end
+            def should_not
+              raise "This is not a real example"
+            end
+          end
+          behaviour = behaviour.dup
+          suite = behaviour.suite
+          suite.tests.length.should == 4
+          descriptions = suite.tests.collect {|test| test._example.description}.sort
+          descriptions.should include("shouldCamelCase")
+          descriptions.should include("should_any_args")
+          descriptions.should include("should_something")
+          descriptions.should include("should_not_something")
+        end
+
+        it "should not include methods that begin with test_ and has an arity > 0 in suite" do
+          behaviour = Class.new(ExampleGroup) do
+            describe('example')
+            def test_invalid(foo)
+              1.should == 1
+            end
+            def testInvalidCamelCase(foo)
+              1.should == 1
+            end
+          end
+          suite = behaviour.suite
+          suite.tests.length.should == 0
+        end
+
+        it "should not include methods that begin with should_ and has an arity > 0 in suite" do
+          behaviour = Class.new(ExampleGroup) do
+            describe('example')
+            def should_invalid(foo)
+              1.should == 1
+            end
+            def shouldInvalidCamelCase(foo)
+              1.should == 1
+            end
+            def should_not_invalid(foo)
+              1.should == 1
+            end
+          end
+          suite = behaviour.suite
+          suite.tests.length.should == 0
+        end
+      end
+
+      describe ExampleGroup, ".description" do
+        it "should return the same description instance for each call" do
+          @example_group.description.should eql(@example_group.description)
+        end
+      end
+
+      describe ExampleGroup, ".remove_after" do
+        it "should unregister a given after(:each) block" do
+          after_all_ran = false
+          @example_group.it("example") {}
+          proc = Proc.new { after_all_ran = true }
+          ExampleGroup.after(:each, &proc)
+          suite = @example_group.suite
+          suite.run
+          after_all_ran.should be_true
+
+          after_all_ran = false
+          ExampleGroup.remove_after(:each, &proc)
+          suite = @example_group.suite
+          suite.run
+          after_all_ran.should be_false
+        end
+      end
+
+      describe ExampleGroup, ".include" do
+        it "should have accessible class methods from included module" do
+          mod1_method_called = false
+          mod1 = Module.new do
+            class_methods = Module.new do
+              define_method :mod1_method do
+                mod1_method_called = true
+              end
+            end
+
+            metaclass.class_eval do
+              define_method(:included) do |receiver|
+                receiver.extend class_methods
+              end
+            end
+          end
+
+          mod2_method_called = false
+          mod2 = Module.new do
+            class_methods = Module.new do
+              define_method :mod2_method do
+                mod2_method_called = true
+              end
+            end
+
+            metaclass.class_eval do
+              define_method(:included) do |receiver|
+                receiver.extend class_methods
+              end
+            end
+          end
+
+          @example_group.include mod1, mod2
+
+          @example_group.mod1_method
+          @example_group.mod2_method
+          mod1_method_called.should be_true
+          mod2_method_called.should be_true
+        end
+      end
+
+      describe ExampleGroup, ".number_of_examples" do
+        it "should count number of specs" do
+          proc do
+            @example_group.it("one") {}
+            @example_group.it("two") {}
+            @example_group.it("three") {}
+            @example_group.it("four") {}
+          end.should change {@example_group.number_of_examples}.by(4)
+        end
+      end
+
+      describe ExampleGroup, ".class_eval" do
+        it "should allow constants to be defined" do
+          behaviour = Class.new(ExampleGroup) do
+            describe('example')
+            FOO = 1
+            it "should reference FOO" do
+              FOO.should == 1
+            end
+          end
+          suite = behaviour.suite
+          suite.run
+          Object.const_defined?(:FOO).should == false
+        end
+      end
+
+      describe ExampleGroup, '.register' do
+        it "should add ExampleGroup to set of ExampleGroups to be run" do
+          example_group.register
+          options.example_groups.should include(example_group)
+        end
+      end
+
+      describe ExampleGroup, '.unregister' do
+        before do
+          example_group.register
+          options.example_groups.should include(example_group)
+        end
+
+        it "should remove ExampleGroup from set of ExampleGroups to be run" do
+          example_group.unregister
+          options.example_groups.should_not include(example_group)
+        end
+      end
+    end
+
+    class ExampleModuleScopingSpec < ExampleGroup
+      describe ExampleGroup, " via a class definition"
+
+      module Foo
+        module Bar
+          def self.loaded?
+            true
+          end
+        end
+      end
+      include Foo
+
+      it "should understand module scoping" do
+        Bar.should be_loaded
+      end
+
+      @@foo = 1
+
+      it "should allow class variables to be defined" do
+        @@foo.should == 1
+      end
+    end
+
+    class ExampleClassVariablePollutionSpec < ExampleGroup
+      describe ExampleGroup, " via a class definition without a class variable"
+
+      it "should not retain class variables from other Example classes" do
+        proc do
+          @@foo
+        end.should raise_error
+      end
+    end
+
+    describe ExampleGroup, '.run functional example' do
+      def count
+        @count ||= 0
+        @count = @count + 1
+        @count
+      end
+
+      before(:all) do
+        count.should == 1
+      end
+
+      before(:all) do
+        count.should == 2
+      end
+
+      before(:each) do
+        count.should == 3
+      end
+
+      before(:each) do
+        count.should == 4
+      end
+
+      it "should run before(:all), before(:each), example, after(:each), after(:all) in order" do
+        count.should == 5
+      end
+
+      after(:each) do
+        count.should == 7
+      end
+
+      after(:each) do
+        count.should == 6
+      end
+
+      after(:all) do
+        count.should == 9
+      end
+
+      after(:all) do
+        count.should == 8
+      end
+    end
+
+    describe ExampleGroup, "#initialize" do
+      the_behaviour = self
+      it "should have copy of behaviour" do
+        the_behaviour.superclass.should == ExampleGroup
+      end
+    end
+
+    describe ExampleGroup, "#pending" do
+      it "should raise a Pending error when its block fails" do
+        block_ran = false
+        lambda {
+          pending("something") do
+            block_ran = true
+            raise "something wrong with my example"
+          end
+        }.should raise_error(Spec::Example::ExamplePendingError, "something")
+        block_ran.should == true
+      end
+
+      it "should raise Spec::Example::PendingExampleFixedError when its block does not fail" do
+        block_ran = false
+        lambda {
+          pending("something") do
+            block_ran = true
+          end
+        }.should raise_error(Spec::Example::PendingExampleFixedError, "Expected pending 'something' to fail. No Error was raised.")
+        block_ran.should == true
+      end
+    end
+
+    describe ExampleGroup, "#run" do
+      before do
+        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+        @original_rspec_options = $rspec_options
+        $rspec_options = @options
+      end
+
+      after do
+        $rspec_options = @original_rspec_options
+      end
+
+      it "should not run when there are no examples" do
+        behaviour = Class.new(ExampleGroup) do
+          describe("Foobar")
+        end
+        behaviour.examples.should be_empty
+
+        reporter = mock("Reporter")
+        reporter.should_not_receive(:add_example_group)
+        suite = behaviour.suite
+        suite.run
+      end
+    end
+
+    class ExampleSubclass < ExampleGroup
+    end
+
+    describe ExampleGroup, "subclasses" do
+      after do
+        ExampleGroupFactory.reset
+      end
+
+      it "should have access to the described_type" do
+        behaviour = Class.new(ExampleSubclass) do
+          describe(Array)
+        end
+        behaviour.send(:described_type).should == Array
+      end
+    end
+
+    describe Enumerable do
+      def each(&block)
+        ["4", "2", "1"].each(&block)
+      end
+
+      it "should be included in examples because it is a module" do
+        map{|e| e.to_i}.should == [4,2,1]
+      end
+    end
+
+    describe "An", Enumerable, "as a second argument" do
+      def each(&block)
+        ["4", "2", "1"].each(&block)
+      end
+
+      it "should be included in examples because it is a module" do
+        map{|e| e.to_i}.should == [4,2,1]
+      end
+    end
+
+    describe String do
+      it "should not be included in examples because it is not a module" do
+        lambda{self.map}.should raise_error(NoMethodError, /undefined method `map' for/)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_matcher_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_matcher_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_matcher_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_matcher_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Example
+    module ExampleMatcherSpecHelper
+      class MatchDescription
+        def initialize(description)
+          @description = description
+        end
+        
+        def matches?(matcher)
+          matcher.matches?(@description)
+        end
+        
+        def failure_message
+          "expected matcher.matches?(#{@description.inspect}) to return true, got false"
+        end
+        
+        def negative_failure_message
+          "expected matcher.matches?(#{@description.inspect}) to return false, got true"
+        end
+      end
+      def match_description(description)
+        MatchDescription.new(description)
+      end
+    end
+
+    describe ExampleMatcher, "#matches?" do
+      include ExampleMatcherSpecHelper
+      
+      it "should match correct behaviour and example" do
+        matcher = ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("behaviour example")
+      end
+      
+      it "should not match wrong example" do
+        matcher = ExampleMatcher.new("behaviour", "other example")
+        matcher.should_not match_description("behaviour example")
+      end
+      
+      it "should not match wrong behaviour" do
+        matcher = ExampleMatcher.new("other behaviour", "example")
+        matcher.should_not match_description("behaviour example")
+      end
+      
+      it "should match example only" do
+        matcher = ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("example")
+      end
+
+      it "should match behaviour only" do
+        matcher = ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("behaviour")
+      end
+
+      it "should match behaviour ending with before(:all)" do
+        matcher = ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("behaviour before(:all)")
+      end
+      
+      it "should escape regexp chars" do
+        matcher = ExampleMatcher.new("(con|text)", "[example]")
+        matcher.should_not match_description("con p")
+      end
+      
+      it "should match when behaviour is modularized" do
+        matcher = ExampleMatcher.new("MyModule::MyClass", "example")
+        matcher.should match_description("MyClass example")
+      end      
+    end
+
+    describe ExampleMatcher, "#matches? normal case" do
+      it "matches when passed in example matches" do
+        matcher = ExampleMatcher.new("Foo", "bar")
+        matcher.matches?(["no match", "Foo bar"]).should == true
+      end
+
+      it "does not match when no passed in examples match" do
+        matcher = ExampleMatcher.new("Foo", "bar")
+        matcher.matches?(["no match1", "no match2"]).should == false
+      end
+    end
+
+    describe ExampleMatcher, "#matches? where description has '::' in it" do
+      it "matches when passed in example matches" do
+        matcher = ExampleMatcher.new("Foo::Bar", "baz")
+        matcher.matches?(["no match", "Foo::Bar baz"]).should == true
+      end
+
+      it "does not match when no passed in examples match" do
+        matcher = ExampleMatcher.new("Foo::Bar", "baz")
+        matcher.matches?(["no match1", "no match2"]).should == false
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    module ModuleThatIsReopened
+    end
+
+    module ExampleMethods
+      include ModuleThatIsReopened
+    end
+
+    module ModuleThatIsReopened
+      def module_that_is_reopened_method
+      end
+    end
+
+    describe "ExampleMethods with an included module that is reopened" do
+      it "should have repoened methods" do
+        method(:module_that_is_reopened_method).should_not be_nil
+      end
+    end
+
+    describe ExampleMethods, " lifecycle" do
+      before do
+        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+        @options.formatters << mock("formatter", :null_object => true)
+        @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
+        @reporter = FakeReporter.new(@options)
+        @options.reporter = @reporter
+
+        ExampleMethods.before_all_parts.should == []
+        ExampleMethods.before_each_parts.should == []
+        ExampleMethods.after_each_parts.should == []
+        ExampleMethods.after_all_parts.should == []
+        def ExampleMethods.count
+          @count ||= 0
+          @count = @count + 1
+          @count
+        end
+      end
+
+      after do
+        ExampleMethods.instance_variable_set("@before_all_parts", [])
+        ExampleMethods.instance_variable_set("@before_each_parts", [])
+        ExampleMethods.instance_variable_set("@after_each_parts", [])
+        ExampleMethods.instance_variable_set("@after_all_parts", [])
+      end
+
+      it "should pass before and after callbacks to all ExampleGroup subclasses" do
+        ExampleMethods.before(:all) do
+          ExampleMethods.count.should == 1
+        end
+
+        ExampleMethods.before(:each) do
+          ExampleMethods.count.should == 2
+        end
+
+        ExampleMethods.after(:each) do
+          ExampleMethods.count.should == 3
+        end
+
+        ExampleMethods.after(:all) do
+          ExampleMethods.count.should == 4
+        end
+
+        @example_group = Class.new(ExampleGroup) do
+          it "should use ExampleMethods callbacks" do
+          end
+        end
+        @example_group.suite.run
+        ExampleMethods.count.should == 5
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_runner_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_runner_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_runner_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_runner_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,250 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Example
+    describe ExampleRunner, "#run", :shared => true do
+      before(:each) do
+        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+        @reporter = ::Spec::Runner::Reporter.new(@options)
+        @options.reporter = @reporter
+        @example_group_class = Class.new(ExampleGroup) do
+          describe("Some Examples")
+        end
+      end
+
+      def create_runner(example_definition)
+        example = @example_group_class.new(example_definition)
+        runner = ExampleRunner.new(@options, example)
+        runner.stub!(:verify_mocks)
+        runner.stub!(:teardown_mocks)
+        runner
+      end
+    end
+
+    describe ExampleRunner, "#run with blank passing example" do
+      it_should_behave_like "Spec::Example::ExampleRunner#run"
+
+      before do
+        @e = @example_group_class.it("example") {}
+        @runner = create_runner(@e)
+      end
+      
+      it "should send reporter example_started" do
+        @reporter.should_receive(:example_started).with(equal(@e))
+        @runner.run
+      end
+
+      it "should report its name for dry run" do
+        @options.dry_run = true
+        @reporter.should_receive(:example_finished).with(equal(@e), nil, "example")
+        @runner.run
+      end
+
+      it "should report success" do
+        @reporter.should_receive(:example_finished).with(equal(@e), nil, nil)
+        @runner.run
+      end
+    end
+
+    describe ExampleRunner, "#run with a failing example" do
+      predicate_matchers[:is_a] = [:is_a?]
+      it_should_behave_like "Spec::Example::ExampleRunner#run"
+
+      before do
+        @e = @example_group_class.it("example") do
+          (2+2).should == 5
+        end
+        @runner = create_runner(@e)
+      end
+
+      it "should report failure due to failure" do
+        @reporter.should_receive(:example_finished).with(
+          equal(@e),
+          is_a(Spec::Expectations::ExpectationNotMetError),
+          "example"
+        )
+        @runner.run
+      end
+    end
+
+    describe ExampleRunner, "#run with a erroring example" do
+      it_should_behave_like "Spec::Example::ExampleRunner#run"
+
+      before do
+        @error = error = NonStandardError.new("in body")
+        @example_definition = @example_group_class.it("example") do
+          raise(error)
+        end
+        @runner = create_runner(@example_definition)
+      end
+
+      it "should report failure due to error" do
+        @reporter.should_receive(:example_finished).with(
+          equal(@example_definition),
+          @error,
+          "example"
+        )
+        @runner.run
+      end
+
+      it "should run after_each block" do
+        @example_group_class.after(:each) do
+          raise("in after_each")
+        end
+        @reporter.should_receive(:example_finished) do |example_definition, error, location|
+          example_definition.should equal(@example_definition)
+          location.should eql("example")
+          error.message.should eql("in body")
+        end
+        @runner.run
+      end      
+    end
+
+    describe ExampleRunner, "#run where before_each fails" do
+      it_should_behave_like "Spec::Example::ExampleRunner#run"
+
+      before do
+        @example_ran = example_ran = false
+        @example_definition = @example_group_class.it("should not run") do
+          example_ran = true
+        end
+        @runner = create_runner(@example_definition)
+        @example_group_class.before(:each) {raise NonStandardError, "in before_each"}
+      end
+
+      it "should not run example block if before_each fails" do
+        @runner.run
+        @example_ran.should == false
+      end
+
+      it "should run after_each block" do
+        after_each_ran = false
+        @example_group_class.after(:each) {after_each_ran = true}
+        @runner.run
+        after_each_ran.should == true
+      end
+
+      it "should report failure location when in before_each" do
+        @reporter.should_receive(:example_finished) do |example_definition, error, location|
+          example_definition.should equal(@example_definition)
+          error.message.should eql("in before_each")
+          location.should eql("before(:each)")
+        end
+        @runner.run
+      end
+    end
+
+    describe ExampleRunner, "#run where after_each fails" do
+      it_should_behave_like "Spec::Example::ExampleRunner#run"
+
+      before do
+        @example_ran = example_ran = false
+        @example_definition = @example_group_class.it("should not run") do
+          example_ran = true
+        end
+        @runner = create_runner(@example_definition)
+        @example_group_class.after(:each) { raise(NonStandardError.new("in after_each")) }
+      end
+
+      it "should report failure location when in after_each" do
+        @reporter.should_receive(:example_finished) do |example_definition, error, location|
+          example_definition.should equal(@example_definition)
+          error.message.should eql("in after_each")
+          location.should eql("after(:each)")
+        end
+        @runner.run
+      end
+    end
+
+    describe ExampleRunner, "#run with use cases" do
+      predicate_matchers[:is_a] = [:is_a?]
+      it_should_behave_like "Spec::Example::ExampleRunner#run"
+
+      it "should run example block in scope of example" do
+        scope_object = nil
+        @example_definition = @example_group_class.it("should pass") do
+          self.instance_of?(Example).should == false
+          scope_object = self
+        end
+        @runner = create_runner(@example_definition)
+        @example_group_instance = @runner.example_group_instance
+
+        @reporter.should_receive(:example_finished).with(equal(@example_definition), nil, nil)
+        @runner.run
+        
+        scope_object.should == @example_group_instance
+        scope_object.should be_instance_of(@example_group_class)
+      end
+
+      it "should report NO NAME when told to use generated description with --dry-run" do
+        @options.dry_run = true
+        example_definition = @example_group_class.it(:__generate_docstring) do
+          5.should == 5
+        end
+        runner = create_runner(example_definition)
+
+        @reporter.should_receive(:example_finished) do |example_definition, error, location|
+          example_definition.description.should == "NO NAME (Because of --dry-run)"
+          location.should == "NO NAME (Because of --dry-run)"
+         end
+        runner.run
+      end
+
+      it "should report given name if present with --dry-run" do
+        @options.dry_run = true
+        example_definition = @example_group_class.it("example name") do
+          5.should == 5
+        end
+        runner = create_runner(example_definition)
+
+        @reporter.should_receive(:example_finished) do |example_definition, error, location|
+          example_definition.description.should == "example name"
+          location.should == "example name"
+         end
+        runner.run
+      end
+
+      it "should report NO NAME when told to use generated description with no expectations" do
+        example_definition = @example_group_class.it(:__generate_docstring) {}
+        runner = create_runner(example_definition)
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should == "NO NAME (Because there were no expectations)"
+        end
+        runner.run
+      end
+
+      it "should report NO NAME when told to use generated description and matcher fails" do
+        example_definition = @example_group_class.it(:__generate_docstring) do
+          5.should "" # Has no matches? method..
+        end
+        runner = create_runner(example_definition)
+
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example_definition.description.should == "NO NAME (Because of Error raised in matcher)"
+          location.should == "NO NAME (Because of Error raised in matcher)"
+        end
+        runner.run
+      end
+
+      it "should report generated description when told to and it is available" do
+        example_definition = @example_group_class.it(:__generate_docstring) {
+          5.should == 5
+        }
+        runner = create_runner(example_definition)
+        
+        @reporter.should_receive(:example_finished) do |example_definition, error, location|
+          example_definition.description.should == "should == 5"
+        end
+        runner.run
+      end
+
+      it "should unregister description_generated callback (lest a memory leak should build up)" do
+        example_definition = @example_group_class.it("something")
+        runner = create_runner(example_definition)
+
+        Spec::Matchers.should_receive(:clear_generated_description)
+        runner.run
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe Example do
+      before(:each) do
+        @example = Example.new "example" do
+          foo
+        end
+      end
+      
+      it "should tell you its docstring" do
+        @example.description.should == "example"
+      end
+
+      it "should execute its block in the context provided" do
+        context = Class.new do
+          def foo
+            "foo"
+          end
+        end.new
+        @example.run_in(context).should == "foo"
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_suite_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_suite_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/example_suite_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/example_suite_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,593 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe ExampleSuite, "#run", :shared => true do
+      before :all do
+        @original_rspec_options = $rspec_options
+      end
+
+      before :each do
+        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+        $rspec_options = @options
+        @formatter = mock("formatter", :null_object => true)
+        @options.formatters << @formatter
+        @options.backtrace_tweaker = mock("backtrace_tweaker", :null_object => true)
+        @reporter = FakeReporter.new(@options)
+        @options.reporter = @reporter
+        @behaviour = Class.new(ExampleGroup) do
+          describe("example")
+          it "does nothing" do
+          end
+        end
+        class << @behaviour
+          public :include
+        end
+      end
+
+      after :each do
+        $rspec_options = @original_rspec_options
+        ExampleGroup.reset
+      end
+    end
+
+    describe ExampleSuite, "#run without failure in example", :shared => true do
+      it_should_behave_like "Spec::Example::ExampleSuite#run"
+
+      it "should not add an example failure to the TestResult" do
+        suite = @behaviour.suite
+        suite.run.should be_true
+      end
+    end
+
+    describe ExampleSuite, "#run with failure in example", :shared => true do
+      it_should_behave_like "Spec::Example::ExampleSuite#run"
+      
+      it "should add an example failure to the TestResult" do
+        suite = @behaviour.suite
+        suite.run.should be_false
+      end
+    end
+
+    describe ExampleSuite, "#run on dry run" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run"
+
+      before do
+        @options.dry_run = true
+      end
+    
+      it "should not run before(:all) or after(:all)" do
+        before_all_ran = false
+        after_all_ran = false
+        ExampleGroup.before(:all) { before_all_ran = true }
+        ExampleGroup.after(:all) { after_all_ran = true }
+        @behaviour.it("should") {}
+        suite = @behaviour.suite
+        suite.run
+        before_all_ran.should be_false
+        after_all_ran.should be_false
+      end
+
+      it "should not run example" do
+        example_ran = false
+        @behaviour.it("should") {example_ran = true}
+        suite = @behaviour.suite
+        suite.run
+        example_ran.should be_false
+      end
+    end
+
+    describe ExampleSuite, "#run with success" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run without failure in example"
+
+      before do
+        @special_behaviour = Class.new(ExampleGroup)
+        ExampleGroupFactory.register(:special, @special_behaviour)
+        @not_special_behaviour = Class.new(ExampleGroup)
+        ExampleGroupFactory.register(:not_special, @not_special_behaviour)
+      end
+
+      after do
+        ExampleGroupFactory.reset
+      end
+
+      it "should send reporter add_example_group" do
+        suite = @behaviour.suite
+        suite.run
+        @reporter.added_behaviour.should == "example"
+      end
+
+      it "should run example on run" do
+        example_ran = false
+        @behaviour.it("should") {example_ran = true}
+        suite = @behaviour.suite
+        suite.run
+        example_ran.should be_true
+      end
+
+      it "should run before(:all) block only once" do
+        before_all_run_count_run_count = 0
+        @behaviour.before(:all) {before_all_run_count_run_count += 1}
+        @behaviour.it("test") {true}
+        @behaviour.it("test2") {true}
+        suite = @behaviour.suite
+        suite.run
+        before_all_run_count_run_count.should == 1
+      end
+
+      it "should run after(:all) block only once" do
+        after_all_run_count = 0
+        @behaviour.after(:all) {after_all_run_count += 1}
+        @behaviour.it("test") {true}
+        @behaviour.it("test2") {true}
+        suite = @behaviour.suite
+        suite.run
+        after_all_run_count.should == 1
+        @reporter.rspec_verify
+      end
+
+      it "after(:all) should have access to all instance variables defined in before(:all)" do
+        context_instance_value_in = "Hello there"
+        context_instance_value_out = ""
+        @behaviour.before(:all) { @instance_var = context_instance_value_in }
+        @behaviour.after(:all) { context_instance_value_out = @instance_var }
+        @behaviour.it("test") {true}
+        suite = @behaviour.suite
+        suite.run
+        context_instance_value_in.should == context_instance_value_out
+      end
+
+      it "should copy instance variables from before(:all)'s execution context into spec's execution context" do
+        context_instance_value_in = "Hello there"
+        context_instance_value_out = ""
+        @behaviour.before(:all) { @instance_var = context_instance_value_in }
+        @behaviour.it("test") {context_instance_value_out = @instance_var}
+        suite = @behaviour.suite
+        suite.run
+        context_instance_value_in.should == context_instance_value_out
+      end
+
+      it "should not add global before callbacks for untargetted behaviours" do
+        fiddle = []
+
+        ExampleGroup.before(:all) { fiddle << "Example.before(:all)" }
+        ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" }
+        @special_behaviour.before(:each) { fiddle << "Example.before(:each, :behaviour_type => :special)" }
+        @special_behaviour.prepend_before(:each) { fiddle << "Example.prepend_before(:each, :behaviour_type => :special)" }
+        @special_behaviour.before(:all) { fiddle << "Example.before(:all, :behaviour_type => :special)" }
+        @special_behaviour.prepend_before(:all) { fiddle << "Example.prepend_before(:all, :behaviour_type => :special)" }
+
+        behaviour = Class.new(ExampleGroup) do
+          describe("I'm not special", :behaviour_type => :not_special)
+          it "does nothing"
+        end
+        suite = behaviour.suite
+        suite.run
+        fiddle.should == [
+          'Example.prepend_before(:all)',
+          'Example.before(:all)',
+        ]
+      end
+
+      it "should add global before callbacks for targetted behaviours" do
+        fiddle = []
+
+        ExampleGroup.before(:all) { fiddle << "Example.before(:all)" }
+        ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" }
+        @special_behaviour.before(:each) { fiddle << "special.before(:each, :behaviour_type => :special)" }
+        @special_behaviour.prepend_before(:each) { fiddle << "special.prepend_before(:each, :behaviour_type => :special)" }
+        @special_behaviour.before(:all) { fiddle << "special.before(:all, :behaviour_type => :special)" }
+        @special_behaviour.prepend_before(:all) { fiddle << "special.prepend_before(:all, :behaviour_type => :special)" }
+        @special_behaviour.append_before(:each) { fiddle << "special.append_before(:each, :behaviour_type => :special)" }
+        
+        behaviour = Class.new(@special_behaviour).describe("I'm a special behaviour") {}
+        behaviour.it("test") {true}
+        suite = behaviour.suite
+        suite.run
+        fiddle.should == [
+          'Example.prepend_before(:all)',
+          'Example.before(:all)',
+          'special.prepend_before(:all, :behaviour_type => :special)',
+          'special.before(:all, :behaviour_type => :special)',
+          'special.prepend_before(:each, :behaviour_type => :special)',
+          'special.before(:each, :behaviour_type => :special)',
+          'special.append_before(:each, :behaviour_type => :special)',
+        ]
+      end
+
+      it "should order before callbacks from global to local" do
+        fiddle = []
+        ExampleGroup.prepend_before(:all) { fiddle << "Example.prepend_before(:all)" }
+        ExampleGroup.before(:all) { fiddle << "Example.before(:all)" }
+        @behaviour.prepend_before(:all) { fiddle << "prepend_before(:all)" }
+        @behaviour.before(:all) { fiddle << "before(:all)" }
+        @behaviour.prepend_before(:each) { fiddle << "prepend_before(:each)" }
+        @behaviour.before(:each) { fiddle << "before(:each)" }
+        suite = @behaviour.suite
+        suite.run
+        fiddle.should == [
+          'Example.prepend_before(:all)',
+          'Example.before(:all)',
+          'prepend_before(:all)',
+          'before(:all)',
+          'prepend_before(:each)',
+          'before(:each)'
+        ]
+      end
+
+      it "should order after callbacks from local to global" do
+        @reporter.should_receive(:add_example_group).with any_args()
+        @reporter.should_receive(:example_finished).with any_args()
+
+        fiddle = []
+        @behaviour.after(:each) { fiddle << "after(:each)" }
+        @behaviour.append_after(:each) { fiddle << "append_after(:each)" }
+        @behaviour.after(:all) { fiddle << "after(:all)" }
+        @behaviour.append_after(:all) { fiddle << "append_after(:all)" }
+        ExampleGroup.after(:all) { fiddle << "Example.after(:all)" }
+        ExampleGroup.append_after(:all) { fiddle << "Example.append_after(:all)" }
+        suite = @behaviour.suite
+        suite.run
+        fiddle.should == [
+          'after(:each)',
+          'append_after(:each)',
+          'after(:all)',
+          'append_after(:all)',
+          'Example.after(:all)',
+          'Example.append_after(:all)'
+        ]
+      end
+
+      it "should have accessible instance methods from included module" do
+        @reporter.should_receive(:add_example_group).with any_args()
+        @reporter.should_receive(:example_finished).with any_args()
+
+        mod1_method_called = false
+        mod1 = Module.new do
+          define_method :mod1_method do
+            mod1_method_called = true
+          end
+        end
+
+        mod2_method_called = false
+        mod2 = Module.new do
+          define_method :mod2_method do
+            mod2_method_called = true
+          end
+        end
+
+        @behaviour.include mod1, mod2
+
+        @behaviour.it("test") do
+          mod1_method
+          mod2_method
+        end
+        suite = @behaviour.suite
+        suite.run
+        mod1_method_called.should be_true
+        mod2_method_called.should be_true
+      end
+
+      it "should include targetted modules included using configuration" do
+        mod1 = Module.new
+        mod2 = Module.new
+        mod3 = Module.new
+        Spec::Runner.configuration.include(mod1, mod2)
+        Spec::Runner.configuration.include(mod3, :behaviour_type => :not_special)
+
+        behaviour = Class.new(@special_behaviour).describe("I'm special", :behaviour_type => :special) do
+          it "does nothing"
+        end
+        suite = behaviour.suite
+        suite.run
+
+        behaviour.included_modules.should include(mod1)
+        behaviour.included_modules.should include(mod2)
+        behaviour.included_modules.should_not include(mod3)
+      end
+
+      it "should include any predicate_matchers included using configuration" do
+        $included_predicate_matcher_found = false
+        Spec::Runner.configuration.predicate_matchers[:do_something] = :does_something?
+        behaviour = Class.new(ExampleGroup) do
+          describe('example')
+          it "should respond to do_something" do
+            $included_predicate_matcher_found = respond_to?(:do_something)
+          end
+        end
+        suite = behaviour.suite
+        suite.run
+        $included_predicate_matcher_found.should be(true)
+      end
+
+      it "should use a mock framework set up in config" do
+        mod = Module.new do
+          class << self
+            def included(mod)
+              $included_module = mod
+            end
+          end
+        end
+
+        begin
+          $included_module = nil
+          Spec::Runner.configuration.mock_with mod
+
+          behaviour = Class.new(ExampleGroup) do
+            describe('example')
+            it "does nothing"
+          end
+          suite = behaviour.suite
+          suite.run
+
+          $included_module.should_not be_nil
+        ensure
+          Spec::Runner.configuration.mock_with :rspec
+        end
+      end
+    end
+
+    describe ExampleSuite, "#run with pending example that has a failing assertion" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run without failure in example"
+
+      before do
+        @behaviour.it("should be pending") do
+          pending("Example fails") {false.should be_true}
+        end
+      end
+
+      it "should send example_pending to formatter" do
+        @formatter.should_receive(:example_pending).with("example", "should be pending", "Example fails")
+        suite = @behaviour.suite
+        suite.run
+      end
+    end
+
+    describe ExampleSuite, "#run with pending example that does not have a failing assertion" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run with failure in example"
+
+      before do
+        @behaviour.it("should be pending") do
+          pending("Example passes") {true.should be_true}
+        end
+      end
+
+      it "should send example_pending to formatter" do
+        @formatter.should_receive(:example_pending).with("example", "should be pending", "Example passes")
+        suite = @behaviour.suite
+        suite.run
+      end
+    end
+
+    describe ExampleSuite, "#run when before(:all) fails" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run"
+
+      before do
+        ExampleGroup.before(:all) { raise NonStandardError, "before(:all) failure" }
+      end
+
+      it "should not run any example" do
+        spec_ran = false
+        @behaviour.it("test") {spec_ran = true}
+        suite = @behaviour.suite
+        suite.run
+        spec_ran.should be_false
+      end
+
+      it "should run ExampleGroup after(:all)" do
+        after_all_ran = false
+        ExampleGroup.after(:all) { after_all_ran = true }
+        suite = @behaviour.suite
+        suite.run
+        after_all_ran.should be_true
+      end
+
+      it "should run behaviour after(:all)" do
+        after_all_ran = false
+        @behaviour.after(:all) { after_all_ran = true }
+        suite = @behaviour.suite
+        suite.run
+        after_all_ran.should be_true
+      end
+
+      it "should supply before(:all) as description" do
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should eql("before(:all)")
+          error.message.should eql("before(:all) failure")
+          location.should eql("before(:all)")
+        end
+
+        @behaviour.it("test") {true}
+        suite = @behaviour.suite
+        suite.run
+      end
+    end
+
+    describe ExampleSuite, "#run when before(:each) fails" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run with failure in example"
+
+      before do
+        ExampleGroup.before(:each) { raise NonStandardError }
+      end
+      
+      it "should run after(:all)" do
+        after_all_ran = false
+        ExampleGroup.after(:all) { after_all_ran = true }
+        suite = @behaviour.suite
+        suite.run
+        after_all_ran.should be_true
+      end
+    end
+
+    describe ExampleSuite, "#run when any example fails" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run with failure in example"
+
+      before do
+        @behaviour.it("should") { raise NonStandardError }
+      end
+      
+      it "should run after(:all)" do
+        after_all_ran = false
+        ExampleGroup.after(:all) { after_all_ran = true }
+        suite = @behaviour.suite
+        suite.run
+        after_all_ran.should be_true
+      end
+    end
+
+    describe ExampleSuite, "#run when first after(:each) block fails" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run"
+
+      it "should add an example failure to the TestResult" do
+        second_after_ran = false
+        @behaviour.after(:each) do
+          second_after_ran = true
+        end
+        first_after_ran = false
+        @behaviour.after(:each) do
+          first_after_ran = true
+          raise "first"
+        end
+        
+        suite = @behaviour.suite
+        suite.run.should be_false
+      end      
+      
+      it "should run second after(:each) block" do
+        second_after_ran = false
+        @behaviour.after(:each) do
+          second_after_ran = true
+        end
+        first_after_ran = false
+        @behaviour.after(:each) do
+          first_after_ran = true
+          raise "first"
+        end
+
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.should equal(example)
+          error.message.should eql("first")
+          location.should eql("after(:each)")
+        end
+        suite = @behaviour.suite
+        suite.run
+        first_after_ran.should be_true
+        second_after_ran.should be_true
+      end
+    end
+
+    describe ExampleSuite, "#run when first before(:each) block fails" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run"
+
+      it "should add an example failure to the TestResult" do
+        first_before_ran = false
+        @behaviour.before(:each) do
+          first_before_ran = true
+          raise "first"
+        end
+        second_before_ran = false
+        @behaviour.before(:each) do
+          second_before_ran = true
+        end
+        
+        suite = @behaviour.suite
+        suite.run.should be_false
+      end
+
+      it "should not run second before(:each)" do
+        first_before_ran = false
+        @behaviour.before(:each) do
+          first_before_ran = true
+          raise "first"
+        end
+        second_before_ran = false
+        @behaviour.before(:each) do
+          second_before_ran = true
+        end
+
+        @reporter.should_receive(:example_finished) do |name, error, location, example_not_implemented|
+          name.should eql("example")
+          error.message.should eql("first")
+          location.should eql("before(:each)")
+          example_not_implemented.should be_false
+        end
+        suite = @behaviour.suite
+        suite.run
+        first_before_ran.should be_true
+        second_before_ran.should be_false
+      end
+    end
+
+    describe ExampleSuite, "#run when failure in after(:all)" do
+      it_should_behave_like "Spec::Example::ExampleSuite#run"
+
+      before do
+        ExampleGroup.after(:all) { raise NonStandardError, "in after(:all)" }
+      end
+
+      it "should return false" do
+        suite = @behaviour.suite
+        suite.run.should be_false
+      end      
+
+      it "should provide after(:all) as description" do
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should eql("after(:all)")
+          error.message.should eql("in after(:all)")
+          location.should eql("after(:all)")
+        end
+
+        suite = @behaviour.suite
+        suite.run
+      end
+    end
+
+    describe ExampleSuite, "#size" do
+      it "returns the number of examples in the behaviour" do
+        behaviour = Class.new(ExampleGroup) do
+          describe("Some Examples")
+          it("does something") {}
+          it("does something else") {}
+        end
+        suite = behaviour.suite
+        suite.size.should == 2
+      end
+    end
+
+    describe ExampleSuite, "#empty?" do
+      it "when there are examples; returns true" do
+        behaviour = Class.new(ExampleGroup) do
+          describe("Some Examples")
+          it("does something") {}
+        end
+        suite = behaviour.suite
+        suite.size.should be > 0
+
+        suite.should_not be_empty
+      end
+
+      it "when there are no examples; returns true" do
+        behaviour = Class.new(ExampleGroup) do
+          describe("Some Examples")
+        end
+        suite = behaviour.suite
+        suite.size.should == 0
+
+        suite.should be_empty
+      end
+    end
+
+    describe ExampleSuite, "#delete" do
+      it "removes the passed in example" do
+        behaviour = Class.new(ExampleGroup) do
+          describe("Some Examples")
+          it("does something") {}
+        end
+        suite = behaviour.suite
+        suite.delete(suite.examples.first)
+
+        suite.should be_empty
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe 'Nested Example Groups' do
+      parent = self
+      
+      def count
+        @count ||= 0
+        @count = @count + 1
+        @count
+      end
+
+      before(:all) do
+        count.should == 1
+      end
+
+      before(:all) do
+        count.should == 2
+      end
+
+      before(:each) do
+        count.should == 3
+      end
+
+      before(:each) do
+        count.should == 4
+      end
+
+      it "should run before(:all), before(:each), example, after(:each), after(:all) in order" do
+        count.should == 5
+      end
+
+      after(:each) do
+        count.should == 7
+      end
+
+      after(:each) do
+        count.should == 6
+      end
+
+      after(:all) do
+        count.should == 9
+      end
+
+      after(:all) do
+        count.should == 8
+      end
+
+      describe 'nested example group' do
+        self.superclass.should == parent
+        
+        it "should run all before and after callbacks" do
+          count.should == 5
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+module Spec
+  module Example
+    describe Pending do
+      
+      it 'should raise an ExamplePendingError if no block is supplied' do
+        lambda {
+          include Pending
+          pending "TODO"
+        }.should raise_error(ExamplePendingError, /TODO/)
+      end
+      
+      it 'should raise an ExamplePendingError if a supplied block fails as expected' do
+        lambda {
+          include Pending
+          pending "TODO" do
+            raise "oops"
+          end
+        }.should raise_error(ExamplePendingError, /TODO/)
+      end
+      
+      it 'should raise a PendingExampleFixedError if a supplied block starts working' do
+        lambda {
+          include Pending
+          pending "TODO" do
+            # success!
+          end
+        }.should raise_error(PendingExampleFixedError, /TODO/)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/predicate_matcher_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/predicate_matcher_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/predicate_matcher_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/predicate_matcher_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    class Fish
+      def can_swim?(distance_in_yards)
+        distance_in_yards < 1000
+      end
+    end
+    
+    describe "predicate_matcher[method_on_object] = matcher_method" do
+      predicate_matchers[:swim] = :can_swim?
+      it "should match matcher_method if method_on_object returns true" do
+        swim(100).matches?(Fish.new).should be_true
+      end
+      it "should not match matcher_method if method_on_object returns false" do
+        swim(10000).matches?(Fish.new).should be_false
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,272 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe ExampleGroup, "with :shared => true" do
+      before(:each) do
+        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+        @original_rspec_options = $rspec_options
+        $rspec_options = @options
+        @formatter = Spec::Mocks::Mock.new("formatter", :null_object => true)
+        @options.formatters << @formatter
+        @behaviour = Class.new(ExampleGroup).describe("behaviour")
+        class << @behaviour
+          public :include
+        end
+      end
+
+      after(:each) do
+        $rspec_options = @original_rspec_options
+        @formatter.rspec_verify
+        @behaviour = nil
+        $shared_example_groups.clear unless $shared_example_groups.nil?
+      end
+
+      def make_shared_example_group(name, opts=nil, &block)
+        behaviour = SharedExampleGroup.new(name, :shared => true, &block)
+        SharedExampleGroup.add_shared_example_group(behaviour)
+        behaviour
+      end
+
+      def non_shared_example_group()
+        @non_shared_example_group ||= Class.new(ExampleGroup).describe("behaviour")
+      end
+
+      it "should accept an optional options hash" do
+        lambda { Class.new(ExampleGroup).describe("context") }.should_not raise_error(Exception)
+        lambda { Class.new(ExampleGroup).describe("context", :shared => true) }.should_not raise_error(Exception)
+      end
+
+      it "should return all shared behaviours" do
+        b1 = make_shared_example_group("b1", :shared => true) {}
+        b2 = make_shared_example_group("b2", :shared => true) {}
+
+        b1.should_not be(nil)
+        b2.should_not be(nil)
+
+        SharedExampleGroup.find_shared_example_group("b1").should equal(b1)
+        SharedExampleGroup.find_shared_example_group("b2").should equal(b2)
+      end
+
+      it "should register as shared behaviour" do
+        behaviour = make_shared_example_group("behaviour") {}
+        SharedExampleGroup.shared_example_groups.should include(behaviour)
+      end
+
+      it "should not be shared when not configured as shared" do
+        behaviour = non_shared_example_group
+        SharedExampleGroup.shared_example_groups.should_not include(behaviour)
+      end
+
+      it "should raise if run when shared" do
+        behaviour = make_shared_example_group("context") {}
+        $example_ran = false
+        behaviour.it("test") {$example_ran = true}
+        lambda { behaviour.run(@formatter) }.should raise_error
+        $example_ran.should be_false
+      end
+
+      it "should contain examples when shared" do
+        shared_example_group = make_shared_example_group("shared behaviour") {}
+        shared_example_group.it("shared example") {}
+        shared_example_group.number_of_examples.should == 1
+      end
+
+      it "should complain when adding a second shared behaviour with the same description" do
+        describe "shared behaviour", :shared => true do
+        end
+        lambda do
+          describe "shared behaviour", :shared => true do
+          end
+        end.should raise_error(ArgumentError)
+      end
+
+      it "should NOT complain when adding the same shared behaviour instance again" do
+        shared_example_group = Class.new(ExampleGroup).describe("shared behaviour", :shared => true)
+        SharedExampleGroup.add_shared_example_group(shared_example_group)
+        SharedExampleGroup.add_shared_example_group(shared_example_group)
+      end
+
+      it "should NOT complain when adding the same shared behaviour again (i.e. file gets reloaded)" do
+        lambda do
+          2.times do
+            describe "shared behaviour which gets loaded twice", :shared => true do
+            end
+          end
+        end.should_not raise_error(ArgumentError)
+      end
+
+      it "should NOT complain when adding the same shared behaviour in same file with different absolute path" do
+        shared_example_group_1 = Class.new(ExampleGroup).describe("shared behaviour", :shared => true)
+        shared_example_group_2 = Class.new(ExampleGroup).describe("shared behaviour", :shared => true)
+
+        shared_example_group_1.description[:spec_path] = "/my/spec/a/../shared.rb"
+        shared_example_group_2.description[:spec_path] = "/my/spec/b/../shared.rb"
+
+        SharedExampleGroup.add_shared_example_group(shared_example_group_1)
+        SharedExampleGroup.add_shared_example_group(shared_example_group_2)
+      end
+
+      it "should complain when adding a different shared behaviour with the same name in a different file with the same basename" do
+        shared_example_group_1 = Class.new(ExampleGroup).describe("shared behaviour", :shared => true)
+        shared_example_group_2 = Class.new(ExampleGroup).describe("shared behaviour", :shared => true)
+
+        shared_example_group_1.description[:spec_path] = "/my/spec/a/shared.rb"
+        shared_example_group_2.description[:spec_path] = "/my/spec/b/shared.rb"
+
+        SharedExampleGroup.add_shared_example_group(shared_example_group_1)
+        lambda do
+          SharedExampleGroup.add_shared_example_group(shared_example_group_2)
+        end.should raise_error(ArgumentError, /already exists/)
+      end
+
+      it "should add examples to current behaviour using it_should_behave_like" do
+        shared_example_group = make_shared_example_group("shared behaviour") {}
+        shared_example_group.it("shared example") {}
+        shared_example_group.it("shared example 2") {}
+
+        @behaviour.it("example") {}
+        @behaviour.number_of_examples.should == 1
+        @behaviour.it_should_behave_like("shared behaviour")
+        @behaviour.number_of_examples.should == 3
+      end
+
+      it "should add examples to current behaviour using include" do
+        shared_example_group = describe "all things", :shared => true do
+          it "should do stuff" do end
+        end
+        
+        behaviour = describe "one thing" do
+          include shared_example_group
+        end
+        
+        behaviour.number_of_examples.should == 1
+      end
+
+      it "should add examples to current behaviour using it_should_behave_like with a module" do
+        AllThings = describe "all things", :shared => true do
+          it "should do stuff" do end
+        end
+        
+        behaviour = describe "one thing" do
+          it_should_behave_like AllThings
+        end
+        
+        behaviour.number_of_examples.should == 1
+      end
+
+      it "should run shared examples" do
+        shared_example_ran = false
+        shared_example_group = make_shared_example_group("shared behaviour") {}
+        shared_example_group.it("shared example") { shared_example_ran = true }
+
+        example_ran = false
+
+        @behaviour.it_should_behave_like("shared behaviour")
+        @behaviour.it("example") {example_ran = true}
+        suite = @behaviour.suite
+        suite.run
+        example_ran.should be_true
+        shared_example_ran.should be_true
+      end
+
+      it "should run setup and teardown from shared behaviour" do
+        shared_setup_ran = false
+        shared_teardown_ran = false
+        shared_example_group = make_shared_example_group("shared behaviour") {}
+        shared_example_group.before { shared_setup_ran = true }
+        shared_example_group.after { shared_teardown_ran = true }
+        shared_example_group.it("shared example") { shared_example_ran = true }
+
+        example_ran = false
+
+        @behaviour.it_should_behave_like("shared behaviour")
+        @behaviour.it("example") {example_ran = true}
+        suite = @behaviour.suite
+        suite.run
+        example_ran.should be_true
+        shared_setup_ran.should be_true
+        shared_teardown_ran.should be_true
+      end
+
+      it "should run before(:all) and after(:all) only once from shared behaviour" do
+        shared_before_all_run_count = 0
+        shared_after_all_run_count = 0
+        shared_example_group = make_shared_example_group("shared behaviour") {}
+        shared_example_group.before(:all) { shared_before_all_run_count += 1}
+        shared_example_group.after(:all) { shared_after_all_run_count += 1}
+        shared_example_group.it("shared example") { shared_example_ran = true }
+
+        example_ran = false
+
+        @behaviour.it_should_behave_like("shared behaviour")
+        @behaviour.it("example") {example_ran = true}
+        suite = @behaviour.suite
+        suite.run
+        example_ran.should be_true
+        shared_before_all_run_count.should == 1
+        shared_after_all_run_count.should == 1
+      end
+
+      it "should include modules, included into shared behaviour, into current behaviour" do
+        @formatter.should_receive(:add_example_group).with(any_args)
+        @formatter.should_receive(:example_finished).twice.with(any_args)
+
+        shared_example_group = make_shared_example_group("shared behaviour") {}
+        shared_example_group.it("shared example") { shared_example_ran = true }
+
+        mod1_method_called = false
+        mod1 = Module.new do
+          define_method :mod1_method do
+            mod1_method_called = true
+          end
+        end
+
+        mod2_method_called = false
+        mod2 = Module.new do
+          define_method :mod2_method do
+            mod2_method_called = true
+          end
+        end
+
+        shared_example_group.include mod2
+
+        @behaviour.it_should_behave_like("shared behaviour")
+        @behaviour.include mod1
+
+        @behaviour.it("test") do
+          mod1_method
+          mod2_method
+        end
+        suite = @behaviour.suite
+        suite.run
+        mod1_method_called.should be_true
+        mod2_method_called.should be_true
+      end
+
+      it "should make methods defined in the shared behaviour available in consuming behaviour" do
+        shared_example_group = make_shared_example_group("shared behaviour xyz") do
+          def a_shared_helper_method
+            "this got defined in a shared behaviour"
+          end
+        end
+        @behaviour.it_should_behave_like("shared behaviour xyz")
+        success = false
+        @behaviour.it("should access a_shared_helper_method") do
+          a_shared_helper_method
+          success = true
+        end
+        suite = @behaviour.suite
+        suite.run
+        success.should be_true
+      end
+
+      it "should raise when named shared behaviour can not be found" do
+        lambda {
+          @behaviour.it_should_behave_like("non-existent shared example group")
+          violated
+        }.should raise_error("Shared Example Group 'non-existent shared example group' can not be found")
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,109 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+module Spec
+  module Fixtures
+    class Animal
+      def initialize(name,species)
+        @name,@species = name,species
+      end
+
+      def inspect
+        <<-EOA
+<Animal
+  name=#{@name},
+  species=#{@species}
+>
+        EOA
+      end
+    end
+  end
+end
+
+describe "Diff" do
+  before(:each) do
+    @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+    @differ = Spec::Expectations::Differs::Default.new(@options)
+  end
+
+  it "should output unified diff of two strings" do
+    expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
+    actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
+    expected_diff="\n\n@@ -1,6 +1,6 @@\n foo\n-bar\n zap\n+bar\n this\n is\n soo\n@@ -9,5 +9,6 @@\n equal\n insert\n a\n+another\n line\n"
+    diff = @differ.diff_as_string(expected, actual)
+    diff.should eql(expected_diff)
+  end
+
+  it "should output unified diff message of two arrays" do
+    expected = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'charlie', :width, 'quite wide' ]
+    actual   = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'tango'  , :width, 'very wide'  ]
+
+    expected_diff = <<'EOD'
+
+
+@@ -5,7 +5,7 @@
+  :metasyntactic,
+  "variable",
+  :delta,
+- "charlie",
++ "tango",
+  :width,
+- "quite wide"]
++ "very wide"]
+EOD
+
+
+    diff = @differ.diff_as_object(expected,actual)
+    diff.should == expected_diff
+  end
+
+  it "should output unified diff message of two objects" do
+    expected = Spec::Fixtures::Animal.new "bob", "giraffe"
+    actual   = Spec::Fixtures::Animal.new "bob", "tortoise"
+
+    expected_diff = <<'EOD'
+
+@@ -1,5 +1,5 @@
+ <Animal
+   name=bob,
+-  species=giraffe
++  species=tortoise
+ >
+EOD
+
+    diff = @differ.diff_as_object(expected,actual)
+    diff.should == expected_diff
+  end
+
+end
+
+
+describe "Diff in context format" do
+  before(:each) do
+    @options = Spec::Runner::Options.new(StringIO.new, StringIO.new)
+    @options.diff_format = :context
+    @differ = Spec::Expectations::Differs::Default.new(@options)
+  end
+
+  it "should output unified diff message of two objects" do
+    expected = Spec::Fixtures::Animal.new "bob", "giraffe"
+    actual   = Spec::Fixtures::Animal.new "bob", "tortoise"
+
+    expected_diff = <<'EOD'
+
+***************
+*** 1,5 ****
+  <Animal
+    name=bob,
+!   species=giraffe
+  >
+--- 1,5 ----
+  <Animal
+    name=bob,
+!   species=tortoise
+  >
+EOD
+
+    diff = @differ.diff_as_object(expected,actual)
+    diff.should == expected_diff
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/expectations/extensions/object_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/expectations/extensions/object_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/expectations/extensions/object_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/expectations/extensions/object_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,107 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+describe Object, "#should" do
+  before(:each) do
+    @target = "target"
+    @matcher = mock("matcher")
+    @matcher.stub!(:matches?).and_return(true)
+    @matcher.stub!(:failure_message)
+  end
+  
+  it "should accept and interact with a matcher" do
+    @matcher.should_receive(:matches?).with(@target).and_return(true)    
+    @target.should @matcher
+  end
+  
+  it "should ask for a failure_message when matches? returns false" do
+    @matcher.should_receive(:matches?).with(@target).and_return(false)
+    @matcher.should_receive(:failure_message).and_return("the failure message")
+    lambda {
+      @target.should @matcher
+    }.should fail_with("the failure message")
+  end
+  
+  it "should raise error if it receives false directly" do
+    lambda {
+      @target.should false
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+  
+  it "should raise error if it receives false (evaluated)" do
+    lambda {
+      @target.should eql?("foo")
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+  
+  it "should raise error if it receives true" do
+    lambda {
+      @target.should true
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+  
+  it "should raise error if it receives nil" do
+    lambda {
+      @target.should nil
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+
+  it "should raise error if it receives no argument and it is not used as a left side of an operator" do
+    pending "Is it even possible to catch this?"
+    lambda {
+      @target.should
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+end
+
+describe Object, "#should_not" do
+  before(:each) do
+    @target = "target"
+    @matcher = mock("matcher")
+  end
+  
+  it "should accept and interact with a matcher" do
+    @matcher.should_receive(:matches?).with(@target).and_return(false)
+    @matcher.stub!(:negative_failure_message)
+    
+    @target.should_not @matcher
+  end
+  
+  it "should ask for a negative_failure_message when matches? returns true" do
+    @matcher.should_receive(:matches?).with(@target).and_return(true)
+    @matcher.should_receive(:negative_failure_message).and_return("the negative failure message")
+    lambda {
+      @target.should_not @matcher
+    }.should fail_with("the negative failure message")
+  end
+
+  it "should raise error if it receives false directly" do
+    lambda {
+      @target.should_not false
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+  
+  it "should raise error if it receives false (evaluated)" do
+    lambda {
+      @target.should_not eql?("foo")
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+  
+  it "should raise error if it receives true" do
+    lambda {
+      @target.should_not true
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+
+  it "should raise error if it receives nil" do
+    lambda {
+      @target.should_not nil
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+
+  it "should raise error if it receives no argument and it is not used as a left side of an operator" do
+    pending "Is it even possible to catch this?"
+    lambda {
+      @target.should_not
+    }.should raise_error(Spec::Expectations::InvalidMatcherError)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/expectations/fail_with_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/expectations/fail_with_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/expectations/fail_with_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/expectations/fail_with_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe Spec::Expectations, "#fail_with with no diff" do
+  before(:each) do
+    @old_differ = Spec::Expectations.differ
+    Spec::Expectations.differ = nil
+  end
+  
+  it "should handle just a message" do
+    lambda {
+      Spec::Expectations.fail_with "the message"
+    }.should fail_with("the message")
+  end
+  
+  it "should handle an Array" do
+    lambda {
+      Spec::Expectations.fail_with ["the message","expected","actual"]
+    }.should fail_with("the message")
+  end
+
+  after(:each) do
+    Spec::Expectations.differ = @old_differ
+  end
+end
+
+describe Spec::Expectations, "#fail_with with diff" do
+  before(:each) do
+    @old_differ = Spec::Expectations.differ
+    @differ = mock("differ")
+    Spec::Expectations.differ = @differ
+  end
+  
+  it "should not call differ if no expected/actual" do
+    lambda {
+      Spec::Expectations.fail_with "the message"
+    }.should fail_with("the message")
+  end
+  
+  it "should call differ if expected/actual are presented separately" do
+    @differ.should_receive(:diff_as_string).and_return("diff")
+    lambda {
+      Spec::Expectations.fail_with "the message", "expected", "actual"
+    }.should fail_with("the message\nDiff:diff")
+  end
+  
+  it "should call differ if expected/actual are not strings" do
+    @differ.should_receive(:diff_as_object).and_return("diff")
+    lambda {
+      Spec::Expectations.fail_with "the message", :expected, :actual
+    }.should fail_with("the message\nDiff:diff")
+  end
+  
+  it "should not call differ if expected or actual are procs" do
+    @differ.should_not_receive(:diff_as_string)
+    @differ.should_not_receive(:diff_as_object)
+    lambda {
+      Spec::Expectations.fail_with "the message", lambda {}, lambda {}
+    }.should fail_with("the message")
+  end
+  
+  it "should call differ if expected/actual are presented in an Array with message" do
+    @differ.should_receive(:diff_as_string).with("actual","expected").and_return("diff")
+    lambda {
+      Spec::Expectations.fail_with(["the message", "expected", "actual"])
+    }.should fail_with(/the message\nDiff:diff/)
+  end
+  
+  after(:each) do
+    Spec::Expectations.differ = @old_differ
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/extensions/main_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/extensions/main_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/extensions/main_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/extensions/main_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Extensions
+    describe Main do
+      before(:each) do
+        @main = Class.new do; include Main; end
+        @original_rspec_options, $rspec_options = $rspec_options, nil
+      end
+
+      after(:each) do
+        $rspec_options = @original_rspec_options
+        $rspec_story_steps = @original_rspec_story_steps
+      end
+
+      it "should create an Options object" do
+        @main.send(:rspec_options).should be_instance_of(Spec::Runner::Options)
+        @main.send(:rspec_options).should === $rspec_options
+      end
+  
+      specify {@main.should respond_to(:describe)}
+      specify {@main.should respond_to(:context)}
+
+      it "should raise when no block given to describe" do
+        lambda { @main.describe "foo" }.should raise_error(ArgumentError)
+      end
+
+      it "should raise when no description given to describe" do
+        lambda { @main.describe do; end }.should raise_error(ArgumentError)
+      end
+
+      it "should registered ExampleGroups by default" do
+        example_group = @main.describe("The ExampleGroup") do
+        end
+
+        rspec_options.example_groups.should include(example_group)
+      end
+
+      it "should not run unregistered ExampleGroups" do
+        example_group = @main.describe("The ExampleGroup") do
+          unregister
+        end
+
+        rspec_options.example_groups.should_not include(example_group)
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/be_close_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/be_close_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/be_close_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/be_close_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+module Spec
+  module Matchers
+    describe BeClose do
+      it "should match when value == target" do
+        BeClose.new(5.0, 0.5).matches?(5.0).should be_true
+      end
+      it "should match when value < (target + delta)" do
+        BeClose.new(5.0, 0.5).matches?(5.49).should be_true
+      end
+      it "should match when value > (target - delta)" do
+        BeClose.new(5.0, 0.5).matches?(4.51).should be_true
+      end
+      it "should not match when value == (target - delta)" do
+        BeClose.new(5.0, 0.5).matches?(4.5).should be_false
+      end
+      it "should not match when value < (target - delta)" do
+        BeClose.new(5.0, 0.5).matches?(4.49).should be_false
+      end
+      it "should not match when value == (target + delta)" do
+        BeClose.new(5.0, 0.5).matches?(5.5).should be_false
+      end
+      it "should not match when value > (target + delta)" do
+        BeClose.new(5.0, 0.5).matches?(5.51).should be_false
+      end
+      it "should provide a useful failure message" do
+        #given
+          matcher = BeClose.new(5.0, 0.5)
+        #when
+          matcher.matches?(5.51)
+        #then
+          matcher.failure_message.should == "expected 5.0 +/- (< 0.5), got 5.51"
+      end
+      it "should describe itself" do
+        BeClose.new(5.0, 0.5).description.should == "be close to 5.0 (within +- 0.5)"
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/be_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/be_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/be_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/be_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,209 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should be_predicate" do  
+  it "should pass when actual returns true for :predicate?" do
+    actual = stub("actual", :happy? => true)
+    actual.should be_happy
+  end
+
+  it "should pass when actual returns true for :predicates? (present tense)" do
+    actual = stub("actual", :exists? => true)
+    actual.should be_exist
+  end
+
+  it "should fail when actual returns false for :predicate?" do
+    actual = stub("actual", :happy? => false)
+    lambda {
+      actual.should be_happy
+    }.should fail_with("expected happy? to return true, got false")
+  end
+  
+  it "should fail when actual does not respond to :predicate?" do
+    lambda {
+      Object.new.should be_happy
+    }.should raise_error(NameError)
+  end
+end
+
+describe "should_not be_predicate" do
+  it "should pass when actual returns false for :sym?" do
+    actual = stub("actual", :happy? => false)
+    actual.should_not be_happy
+  end
+  
+  it "should fail when actual returns true for :sym?" do
+    actual = stub("actual", :happy? => true)
+    lambda {
+      actual.should_not be_happy
+    }.should fail_with("expected happy? to return false, got true")
+  end
+
+  it "should fail when actual does not respond to :sym?" do
+    lambda {
+      Object.new.should_not be_happy
+    }.should raise_error(NameError)
+  end
+end
+
+describe "should be_predicate(*args)" do
+  it "should pass when actual returns true for :predicate?(*args)" do
+    actual = mock("actual")
+    actual.should_receive(:older_than?).with(3).and_return(true)
+    actual.should be_older_than(3)
+  end
+
+  it "should fail when actual returns false for :predicate?(*args)" do
+    actual = mock("actual")
+    actual.should_receive(:older_than?).with(3).and_return(false)
+    lambda {
+      actual.should be_older_than(3)
+    }.should fail_with("expected older_than?(3) to return true, got false")
+  end
+  
+  it "should fail when actual does not respond to :predicate?" do
+    lambda {
+      Object.new.should be_older_than(3)
+    }.should raise_error(NameError)
+  end
+end
+
+describe "should_not be_predicate(*args)" do
+  it "should pass when actual returns false for :predicate?(*args)" do
+    actual = mock("actual")
+    actual.should_receive(:older_than?).with(3).and_return(false)
+    actual.should_not be_older_than(3)
+  end
+  
+  it "should fail when actual returns true for :predicate?(*args)" do
+    actual = mock("actual")
+    actual.should_receive(:older_than?).with(3).and_return(true)
+    lambda {
+      actual.should_not be_older_than(3)
+    }.should fail_with("expected older_than?(3) to return false, got true")
+  end
+
+  it "should fail when actual does not respond to :predicate?" do
+    lambda {
+      Object.new.should_not be_older_than(3)
+    }.should raise_error(NameError)
+  end
+end
+
+describe "should be_true" do
+  it "should pass when actual equal(true)" do
+    true.should be_true
+  end
+
+  it "should fail when actual equal(false)" do
+    lambda {
+      false.should be_true
+    }.should fail_with("expected true, got false")
+  end
+end
+
+describe "should be_false" do
+  it "should pass when actual equal(false)" do
+    false.should be_false
+  end
+
+  it "should fail when actual equal(true)" do
+    lambda {
+      true.should be_false
+    }.should fail_with("expected false, got true")
+  end
+end
+
+describe "should be_nil" do
+  it "should pass when actual is nil" do
+    nil.should be_nil
+  end
+
+  it "should fail when actual is not nil" do
+    lambda {
+      :not_nil.should be_nil
+    }.should fail_with("expected nil, got :not_nil")
+  end
+end
+
+describe "should_not be_nil" do
+  it "should pass when actual is not nil" do
+    :not_nil.should_not be_nil
+  end
+
+  it "should fail when actual is nil" do
+    lambda {
+      nil.should_not be_nil
+    }.should fail_with("expected not nil, got nil")
+  end
+end
+
+describe "should be <" do
+  it "should pass when < operator returns true" do
+    3.should be < 4
+  end
+
+  it "should fail when < operator returns false" do
+    lambda { 3.should be < 3 }.should fail_with("expected < 3, got 3")
+  end
+end
+
+describe "should be <=" do
+  it "should pass when <= operator returns true" do
+    3.should be <= 4
+    4.should be <= 4
+  end
+
+  it "should fail when <= operator returns false" do
+    lambda { 3.should be <= 2 }.should fail_with("expected <= 2, got 3")
+  end
+end
+
+describe "should be >=" do
+  it "should pass when >= operator returns true" do
+    4.should be >= 4
+    5.should be >= 4
+  end
+
+  it "should fail when >= operator returns false" do
+    lambda { 3.should be >= 4 }.should fail_with("expected >= 4, got 3")
+  end
+end
+
+describe "should be >" do
+  it "should pass when > operator returns true" do
+    5.should be > 4
+  end
+
+  it "should fail when > operator returns false" do
+    lambda { 3.should be > 4 }.should fail_with("expected > 4, got 3")
+  end
+end
+
+describe "should be ==" do
+  it "should pass when == operator returns true" do
+    5.should be == 5
+  end
+
+  it "should fail when == operator returns false" do
+    lambda { 3.should be == 4 }.should fail_with("expected == 4, got 3")
+  end
+end
+
+describe "should be ===" do
+  it "should pass when === operator returns true" do
+    Hash.should be === Hash.new
+  end
+
+  it "should fail when === operator returns false" do
+    lambda { Hash.should be === "not a hash" }.should fail_with(%[expected === "not a hash", got Hash])
+  end
+end
+
+describe "should be(value)" do
+  it "should pass if actual.equal?(value)" do
+    5.should be(5)
+  end
+  it "should fail if !actual.equal?(value)" do
+    lambda { 5.should be(6) }.should fail_with("expected 6, got 5")
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/change_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/change_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/change_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/change_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,319 @@
+#Based on patch from Wilson Bilkovich
+
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+class SomethingExpected
+  attr_accessor :some_value
+end
+
+describe "should change(actual, message)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when actual is modified by the block" do
+    lambda {@instance.some_value = 6}.should change(@instance, :some_value)
+  end
+
+  it "should fail when actual is not modified by the block" do
+    lambda do
+      lambda {}.should change(@instance, :some_value)
+    end.should fail_with("some_value should have changed, but is still 5")
+  end
+end
+
+describe "should_not change(actual, message)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when actual is not modified by the block" do
+    lambda { }.should_not change(@instance, :some_value)
+  end
+
+  it "should fail when actual is not modified by the block" do
+    lambda do
+      lambda {@instance.some_value = 6}.should_not change(@instance, :some_value)
+    end.should fail_with("some_value should not have changed, but did change from 5 to 6")
+  end
+end
+
+describe "should change { block }" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when actual is modified by the block" do
+    lambda {@instance.some_value = 6}.should change { @instance.some_value }
+  end
+
+  it "should fail when actual is not modified by the block" do
+    lambda do
+      lambda {}.should change{ @instance.some_value }
+    end.should fail_with("result should have changed, but is still 5")
+  end
+  
+  it "should warn if passed a block using do/end" do
+    lambda do
+      lambda {}.should change do
+      end
+    end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
+  end
+end
+
+describe "should_not change { block }" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when actual is modified by the block" do
+    lambda {}.should_not change{ @instance.some_value }
+  end
+
+  it "should fail when actual is not modified by the block" do
+    lambda do
+      lambda {@instance.some_value = 6}.should_not change { @instance.some_value }
+    end.should fail_with("result should not have changed, but did change from 5 to 6")
+  end
+  
+  it "should warn if passed a block using do/end" do
+    lambda do
+      lambda {}.should_not change do
+      end
+    end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
+  end
+end
+
+describe "should change(actual, message).by(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by expected amount" do
+    lambda { @instance.some_value += 1 }.should change(@instance, :some_value).by(1)
+  end
+
+  it "should fail when the attribute is changed by unexpected amount" do
+    lambda do
+      lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by(1)
+    end.should fail_with("some_value should have been changed by 1, but was changed by 2")
+  end
+
+  it "should fail when the attribute is changed by unexpected amount in the opposite direction" do
+    lambda do
+      lambda { @instance.some_value -= 1 }.should change(@instance, :some_value).by(1)
+    end.should fail_with("some_value should have been changed by 1, but was changed by -1")
+  end
+end
+
+describe "should change{ block }.by(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by expected amount" do
+    lambda { @instance.some_value += 1 }.should change{@instance.some_value}.by(1)
+  end
+
+  it "should fail when the attribute is changed by unexpected amount" do
+    lambda do
+      lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by(1)
+    end.should fail_with("result should have been changed by 1, but was changed by 2")
+  end
+
+  it "should fail when the attribute is changed by unexpected amount in the opposite direction" do
+    lambda do
+      lambda { @instance.some_value -= 1 }.should change{@instance.some_value}.by(1)
+    end.should fail_with("result should have been changed by 1, but was changed by -1")
+  end
+end
+
+describe "should change(actual, message).by_at_least(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by greater than the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(1)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(2)
+  end  
+
+  it "should fail when the attribute is changed by less than the expected amount" do
+    lambda do
+      lambda { @instance.some_value += 1 }.should change(@instance, :some_value).by_at_least(2)
+    end.should fail_with("some_value should have been changed by at least 2, but was changed by 1")
+  end
+
+end
+
+describe "should change{ block }.by_at_least(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by greater than expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(1)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(2)
+  end  
+
+  it "should fail when the attribute is changed by less than the unexpected amount" do
+    lambda do
+      lambda { @instance.some_value += 1 }.should change{@instance.some_value}.by_at_least(2)
+    end.should fail_with("result should have been changed by at least 2, but was changed by 1")
+  end
+end
+
+
+describe "should change(actual, message).by_at_most(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by less than the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(3)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(2)
+  end  
+
+  it "should fail when the attribute is changed by greater than the expected amount" do
+    lambda do
+      lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(1)
+    end.should fail_with("some_value should have been changed by at most 1, but was changed by 2")
+  end
+
+end
+
+describe "should change{ block }.by_at_most(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by less than expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(3)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(2)
+  end  
+
+  it "should fail when the attribute is changed by greater than the unexpected amount" do
+    lambda do
+      lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(1)
+    end.should fail_with("result should have been changed by at most 1, but was changed by 2")
+  end
+end
+
+describe "should change(actual, message).from(old)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 'string'
+  end
+
+  it "should pass when attribute is == to expected value before executing block" do
+    lambda { @instance.some_value = "astring" }.should change(@instance, :some_value).from("string")
+  end
+
+  it "should fail when attribute is not == to expected value before executing block" do
+    lambda do
+      lambda { @instance.some_value = "knot" }.should change(@instance, :some_value).from("cat")
+    end.should fail_with("some_value should have initially been \"cat\", but was \"string\"")
+  end
+end
+
+describe "should change{ block }.from(old)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 'string'
+  end
+
+  it "should pass when attribute is == to expected value before executing block" do
+    lambda { @instance.some_value = "astring" }.should change{@instance.some_value}.from("string")
+  end
+
+  it "should fail when attribute is not == to expected value before executing block" do
+    lambda do
+      lambda { @instance.some_value = "knot" }.should change{@instance.some_value}.from("cat")
+    end.should fail_with("result should have initially been \"cat\", but was \"string\"")
+  end
+end
+
+describe "should change(actual, message).to(new)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 'string'
+  end
+  
+  it "should pass when attribute is == to expected value after executing block" do
+    lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).to("cat")
+  end
+
+  it "should fail when attribute is not == to expected value after executing block" do
+    lambda do
+      lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("dog")
+    end.should fail_with("some_value should have been changed to \"dog\", but is now \"cat\"")
+  end
+end
+
+describe "should change{ block }.to(new)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 'string'
+  end
+  
+  it "should pass when attribute is == to expected value after executing block" do
+    lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.to("cat")
+  end
+
+  it "should fail when attribute is not == to expected value after executing block" do
+    lambda do
+      lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.from("string").to("dog")
+    end.should fail_with("result should have been changed to \"dog\", but is now \"cat\"")
+  end
+end
+
+describe "should change(actual, message).from(old).to(new)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 'string'
+  end
+  
+  it "should pass when #to comes before #from" do
+    lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).to("cat").from("string")
+  end
+
+  it "should pass when #from comes before #to" do
+    lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("cat")
+  end
+end
+
+describe "should change{ block }.from(old).to(new)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 'string'
+  end
+  
+  it "should pass when #to comes before #from" do
+    lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.to("cat").from("string")
+  end
+
+  it "should pass when #from comes before #to" do
+    lambda { @instance.some_value = "cat" }.should change{@instance.some_value}.from("string").to("cat")
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/description_generation_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/description_generation_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/description_generation_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/description_generation_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,157 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "Matchers should be able to generate their own descriptions" do
+  before(:each) do
+    Spec::Matchers.clear_generated_description
+  end
+
+  after(:each) do
+    Spec::Matchers.clear_generated_description
+  end
+  
+  it "should == expected" do
+    "this".should == "this"
+    Spec::Matchers.generated_description.should == "should == \"this\""
+  end
+  
+  it "should not == expected" do
+    "this".should_not == "that"
+    Spec::Matchers.generated_description.should == "should not == \"that\""
+  end
+  
+  it "should be empty (arbitrary predicate)" do
+    [].should be_empty
+    Spec::Matchers.generated_description.should == "should be empty"
+  end
+  
+  it "should not be empty (arbitrary predicate)" do
+    [1].should_not be_empty
+    Spec::Matchers.generated_description.should == "should not be empty"
+  end
+  
+  it "should be true" do
+    true.should be_true
+    Spec::Matchers.generated_description.should == "should be true"
+  end
+  
+  it "should be false" do
+    false.should be_false
+    Spec::Matchers.generated_description.should == "should be false"
+  end
+  
+  it "should be nil" do
+    nil.should be_nil
+    Spec::Matchers.generated_description.should == "should be nil"
+  end
+  
+  it "should be > n" do
+    5.should be > 3
+    Spec::Matchers.generated_description.should == "should be > 3"
+  end
+  
+  it "should be predicate arg1, arg2 and arg3" do
+    5.0.should be_between(0,10)
+    Spec::Matchers.generated_description.should == "should be between 0 and 10"
+  end
+
+  it "should be_few_words predicate should be transformed to 'be few words'" do
+    5.should be_kind_of(Fixnum)
+    Spec::Matchers.generated_description.should == "should be kind of Fixnum"
+  end
+
+  it "should preserve a proper prefix for be predicate" do
+    5.should be_a_kind_of(Fixnum)
+    Spec::Matchers.generated_description.should == "should be a kind of Fixnum"
+    5.should be_an_instance_of(Fixnum)
+    Spec::Matchers.generated_description.should == "should be an instance of Fixnum"
+  end
+  
+  it "should equal" do
+    expected = "expected"
+    expected.should equal(expected)
+    Spec::Matchers.generated_description.should == "should equal \"expected\""
+  end
+  
+  it "should_not equal" do
+    5.should_not equal(37)
+    Spec::Matchers.generated_description.should == "should not equal 37"
+  end
+  
+  it "should eql" do
+    "string".should eql("string")
+    Spec::Matchers.generated_description.should == "should eql \"string\""
+  end
+  
+  it "should not eql" do
+    "a".should_not eql(:a)
+    Spec::Matchers.generated_description.should == "should not eql :a"
+  end
+  
+  it "should have_key" do
+    {:a => "a"}.should have_key(:a)
+    Spec::Matchers.generated_description.should == "should have key :a"
+  end
+  
+  it "should have n items" do
+    team.should have(3).players
+    Spec::Matchers.generated_description.should == "should have 3 players"
+  end
+  
+  it "should have at least n items" do
+    team.should have_at_least(2).players
+    Spec::Matchers.generated_description.should == "should have at least 2 players"
+  end
+  
+  it "should have at most n items" do
+    team.should have_at_most(4).players
+    Spec::Matchers.generated_description.should == "should have at most 4 players"
+  end
+  
+  it "should include" do
+    [1,2,3].should include(3)
+    Spec::Matchers.generated_description.should == "should include 3"
+  end
+  
+  it "should match" do
+    "this string".should match(/this string/)
+    Spec::Matchers.generated_description.should == "should match /this string/"
+  end
+  
+  it "should raise_error" do
+    lambda { raise }.should raise_error
+    Spec::Matchers.generated_description.should == "should raise Exception"
+  end
+  
+  it "should raise_error with type" do
+    lambda { raise }.should raise_error(RuntimeError)
+    Spec::Matchers.generated_description.should == "should raise RuntimeError"
+  end
+  
+  it "should raise_error with type and message" do
+    lambda { raise "there was an error" }.should raise_error(RuntimeError, "there was an error")
+    Spec::Matchers.generated_description.should == "should raise RuntimeError with \"there was an error\""
+  end
+  
+  it "should respond_to" do
+    [].should respond_to(:insert)
+    Spec::Matchers.generated_description.should == "should respond to #insert"
+  end
+  
+  it "should throw symbol" do
+    lambda { throw :what_a_mess }.should throw_symbol
+    Spec::Matchers.generated_description.should == "should throw a Symbol"
+  end
+  
+  it "should throw symbol (with named symbol)" do
+    lambda { throw :what_a_mess }.should throw_symbol(:what_a_mess)
+    Spec::Matchers.generated_description.should == "should throw :what_a_mess"
+  end
+  
+  def team
+    Class.new do
+      def players
+        [1,2,3]
+      end
+    end.new
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/eql_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/eql_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/eql_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/eql_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    describe Eql do
+      it "should match when actual.eql?(expected)" do
+        Eql.new(1).matches?(1).should be_true
+      end
+      it "should not match when !actual.eql?(expected)" do
+        Eql.new(1).matches?(2).should be_false
+      end
+      it "should describe itself" do
+        matcher = Eql.new(1)
+        matcher.description.should == "eql 1"
+      end
+      it "should provide message, expected and actual on #failure_message" do
+        matcher = Eql.new("1")
+        matcher.matches?(1)
+        matcher.failure_message.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
+      end
+      it "should provide message, expected and actual on #negative_failure_message" do
+        matcher = Eql.new(1)
+        matcher.matches?(1)
+        matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/equal_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/equal_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/equal_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/equal_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    describe Equal do
+      it "should match when actual.equal?(expected)" do
+        Equal.new(1).matches?(1).should be_true
+      end
+      it "should not match when !actual.equal?(expected)" do
+        Equal.new("1").matches?("1").should be_false
+      end
+      it "should describe itself" do
+        matcher = Equal.new(1)
+        matcher.description.should == "equal 1"
+      end
+      it "should provide message, expected and actual on #failure_message" do
+        matcher = Equal.new("1")
+        matcher.matches?(1)
+        matcher.failure_message.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
+      end
+      it "should provide message, expected and actual on #negative_failure_message" do
+        matcher = Equal.new(1)
+        matcher.matches?(1)
+        matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/exist_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/exist_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/exist_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/exist_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+# NOTE - this was initially handled by an explicit matcher, but is now
+# handled by a default set of predicate_matchers.
+
+# module Spec
+#   module Matchers
+#     class Exist
+#       def matches? actual
+#         @actual = actual
+#         @actual.exist?
+#       end
+#       def failure_message
+#         "expected #{@actual.inspect} to exist, but it doesn't."
+#       end
+#       def negative_failure_message
+#         "expected #{@actual.inspect} to not exist, but it does."
+#       end
+#     end
+#     def exist; Exist.new; end
+#   end
+# end
+
+
+class Substance
+  def initialize exists, description
+    @exists = exists
+    @description = description
+  end
+  def exist?
+    @exists
+  end
+  def inspect
+    @description
+  end
+end
+  
+class SubstanceTester
+  include Spec::Matchers
+  def initialize substance
+    @substance = substance
+  end
+  def should_exist
+    @substance.should exist
+  end
+end
+
+describe "should exist" do
+  before(:each) do
+    @real = Substance.new true, 'something real'
+    @imaginary = Substance.new false, 'something imaginary'
+  end
+  
+  it "should pass if target exists" do
+    @real.should exist
+  end
+  
+  it "should fail if target does not exist" do
+    lambda { @imaginary.should exist }.
+      should fail
+  end
+end
+
+describe "should exist, outside of a behavior" do
+  before(:each) do
+    @real = Substance.new true, 'something real'
+    @imaginary = Substance.new false, 'something imaginary'
+  end
+  it "should pass if target exists" do
+    pending("need to either find a way to include stock predicate matchers in Spec::Matchers or add Bret's Exist matcher") do
+      real_tester = SubstanceTester.new @real
+      real_tester.should_exist
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/handler_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/handler_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/handler_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/handler_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,129 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module ExampleExpectations
+  
+  class ArbitraryMatcher
+    def initialize(*args, &block)
+      if args.last.is_a? Hash
+        @expected = args.last[:expected]
+      end
+      if block_given?
+        @expected = block.call
+      end
+      @block = block
+    end
+    
+    def matches?(target)
+      @target = target
+      return @expected == target
+    end
+    
+    def with(new_value)
+      @expected = new_value
+      self
+    end
+    
+    def failure_message
+      "expected #{@expected}, got #{@target}"
+    end
+    
+    def negative_failure_message
+      "expected not #{@expected}, got #{@target}"
+    end
+  end
+  
+  class PositiveOnlyMatcher < ArbitraryMatcher
+    undef negative_failure_message rescue nil
+  end
+  
+  def arbitrary_matcher(*args, &block)
+    ArbitraryMatcher.new(*args, &block)
+  end
+  
+  def positive_only_matcher(*args, &block)
+    PositiveOnlyMatcher.new(*args, &block)
+  end
+  
+end
+
+module Spec
+  module Expectations
+    describe ExpectationMatcherHandler, ".handle_matcher" do
+      it "should ask the matcher if it matches" do
+        matcher = mock("matcher")
+        actual = Object.new
+        matcher.should_receive(:matches?).with(actual).and_return(true)
+        ExpectationMatcherHandler.handle_matcher(actual, matcher)
+      end
+      
+      it "should explain when the matcher parameter is not a matcher" do
+        begin
+          nonmatcher = mock("nonmatcher")
+          actual = Object.new
+          ExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
+        rescue Spec::Expectations::InvalidMatcherError => e
+        end
+
+        e.message.should =~ /^Expected a matcher, got /
+      end
+    end
+
+    describe NegativeExpectationMatcherHandler, ".handle_matcher" do
+      it "should explain when matcher does not support should_not" do
+        matcher = mock("matcher")
+        matcher.stub!(:matches?)
+        actual = Object.new
+        lambda {
+          NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+        }.should fail_with(/Matcher does not support should_not.\n/)
+      end      
+      
+      it "should ask the matcher if it matches" do
+        matcher = mock("matcher")
+        actual = Object.new
+        matcher.stub!(:negative_failure_message)
+        matcher.should_receive(:matches?).with(actual).and_return(false)
+        NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+      end
+      
+      it "should explain when the matcher parameter is not a matcher" do
+        begin
+          nonmatcher = mock("nonmatcher")
+          actual = Object.new
+          NegativeExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
+        rescue Spec::Expectations::InvalidMatcherError => e
+        end
+
+        e.message.should =~ /^Expected a matcher, got /
+      end
+    end
+    
+    describe ExpectationMatcherHandler do
+      include ExampleExpectations
+      
+      it "should handle submitted args" do
+        5.should arbitrary_matcher(:expected => 5)
+        5.should arbitrary_matcher(:expected => "wrong").with(5)
+        lambda { 5.should arbitrary_matcher(:expected => 4) }.should fail_with("expected 4, got 5")
+        lambda { 5.should arbitrary_matcher(:expected => 5).with(4) }.should fail_with("expected 4, got 5")
+        5.should_not arbitrary_matcher(:expected => 4)
+        5.should_not arbitrary_matcher(:expected => 5).with(4)
+        lambda { 5.should_not arbitrary_matcher(:expected => 5) }.should fail_with("expected not 5, got 5")
+        lambda { 5.should_not arbitrary_matcher(:expected => 4).with(5) }.should fail_with("expected not 5, got 5")
+      end
+
+      it "should handle the submitted block" do
+        5.should arbitrary_matcher { 5 }
+        5.should arbitrary_matcher(:expected => 4) { 5 }
+        5.should arbitrary_matcher(:expected => 4).with(5) { 3 }
+      end
+  
+      it "should explain when matcher does not support should_not" do
+        lambda {
+          5.should_not positive_only_matcher(:expected => 5)
+        }.should fail_with(/Matcher does not support should_not.\n/)
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/has_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/has_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/has_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/has_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should have_sym(*args)" do
+  it "should pass if #has_sym?(*args) returns true" do
+    {:a => "A"}.should have_key(:a)
+  end
+
+  it "should fail if #has_sym?(*args) returns false" do
+    lambda {
+      {:b => "B"}.should have_key(:a)
+    }.should fail_with("expected #has_key?(:a) to return true, got false")
+  end
+
+  it "should fail if target does not respond to #has_sym?" do
+    lambda {
+      Object.new.should have_key(:a)
+    }.should raise_error(NoMethodError)
+  end
+end
+
+describe "should_not have_sym(*args)" do
+  it "should pass if #has_sym?(*args) returns false" do
+    {:a => "A"}.should_not have_key(:b)
+  end
+
+  it "should fail if #has_sym?(*args) returns true" do
+    lambda {
+      {:a => "A"}.should_not have_key(:a)
+    }.should fail_with("expected #has_key?(:a) to return false, got true")
+  end
+
+  it "should fail if target does not respond to #has_sym?" do
+    lambda {
+      Object.new.should have_key(:a)
+    }.should raise_error(NoMethodError)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/have_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,272 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module HaveSpecHelper
+  def create_collection_owner_with(n)
+    owner = Spec::Expectations::Helper::CollectionOwner.new
+    (1..n).each do |n|
+      owner.add_to_collection_with_length_method(n)
+      owner.add_to_collection_with_size_method(n)
+    end
+    owner
+  end
+end
+
+describe "should have(n).items" do
+  include HaveSpecHelper
+
+  it "should pass if target has a collection of items with n members" do
+    owner = create_collection_owner_with(3)
+    owner.should have(3).items_in_collection_with_length_method
+    owner.should have(3).items_in_collection_with_size_method
+  end
+
+  it "should convert :no to 0" do
+    owner = create_collection_owner_with(0)
+    owner.should have(:no).items_in_collection_with_length_method
+    owner.should have(:no).items_in_collection_with_size_method
+  end
+
+  it "should fail if target has a collection of items with < n members" do
+    owner = create_collection_owner_with(3)
+    lambda {
+      owner.should have(4).items_in_collection_with_length_method
+    }.should fail_with("expected 4 items_in_collection_with_length_method, got 3")
+    lambda {
+      owner.should have(4).items_in_collection_with_size_method
+    }.should fail_with("expected 4 items_in_collection_with_size_method, got 3")
+  end
+  
+  it "should fail if target has a collection of items with > n members" do
+    owner = create_collection_owner_with(3)
+    lambda {
+      owner.should have(2).items_in_collection_with_length_method
+    }.should fail_with("expected 2 items_in_collection_with_length_method, got 3")
+    lambda {
+      owner.should have(2).items_in_collection_with_size_method
+    }.should fail_with("expected 2 items_in_collection_with_size_method, got 3")
+  end
+end
+
+describe "should have(n).items where result responds to items but returns something other than a collection" do
+  it "should provide a meaningful error" do
+    owner = Class.new do
+      def items
+        Object.new
+      end
+    end.new
+    lambda do
+      owner.should have(3).items
+    end.should raise_error("expected items to be a collection but it does not respond to #length or #size")
+  end
+end
+
+describe "should_not have(n).items" do
+  include HaveSpecHelper
+
+  it "should pass if target has a collection of items with < n members" do
+    owner = create_collection_owner_with(3)
+    owner.should_not have(4).items_in_collection_with_length_method
+    owner.should_not have(4).items_in_collection_with_size_method
+  end
+  
+  it "should pass if target has a collection of items with > n members" do
+    owner = create_collection_owner_with(3)
+    owner.should_not have(2).items_in_collection_with_length_method
+    owner.should_not have(2).items_in_collection_with_size_method
+  end
+
+  it "should fail if target has a collection of items with n members" do
+    owner = create_collection_owner_with(3)
+    lambda {
+      owner.should_not have(3).items_in_collection_with_length_method
+    }.should fail_with("expected target not to have 3 items_in_collection_with_length_method, got 3")
+    lambda {
+      owner.should_not have(3).items_in_collection_with_size_method
+      }.should fail_with("expected target not to have 3 items_in_collection_with_size_method, got 3")
+  end
+end
+
+describe "should have_exactly(n).items" do
+  include HaveSpecHelper
+
+  it "should pass if target has a collection of items with n members" do
+    owner = create_collection_owner_with(3)
+    owner.should have_exactly(3).items_in_collection_with_length_method
+    owner.should have_exactly(3).items_in_collection_with_size_method
+  end
+
+  it "should convert :no to 0" do
+    owner = create_collection_owner_with(0)
+    owner.should have_exactly(:no).items_in_collection_with_length_method
+    owner.should have_exactly(:no).items_in_collection_with_size_method
+  end
+
+  it "should fail if target has a collection of items with < n members" do
+    owner = create_collection_owner_with(3)
+    lambda {
+      owner.should have_exactly(4).items_in_collection_with_length_method
+    }.should fail_with("expected 4 items_in_collection_with_length_method, got 3")
+    lambda {
+      owner.should have_exactly(4).items_in_collection_with_size_method
+    }.should fail_with("expected 4 items_in_collection_with_size_method, got 3")
+  end
+  
+  it "should fail if target has a collection of items with > n members" do
+    owner = create_collection_owner_with(3)
+    lambda {
+      owner.should have_exactly(2).items_in_collection_with_length_method
+    }.should fail_with("expected 2 items_in_collection_with_length_method, got 3")
+    lambda {
+      owner.should have_exactly(2).items_in_collection_with_size_method
+    }.should fail_with("expected 2 items_in_collection_with_size_method, got 3")
+  end
+end
+
+describe "should have_at_least(n).items" do
+  include HaveSpecHelper
+
+  it "should pass if target has a collection of items with n members" do
+    owner = create_collection_owner_with(3)
+    owner.should have_at_least(3).items_in_collection_with_length_method
+    owner.should have_at_least(3).items_in_collection_with_size_method
+  end
+  
+  it "should pass if target has a collection of items with > n members" do
+    owner = create_collection_owner_with(3)
+    owner.should have_at_least(2).items_in_collection_with_length_method
+    owner.should have_at_least(2).items_in_collection_with_size_method
+  end
+
+  it "should fail if target has a collection of items with < n members" do
+    owner = create_collection_owner_with(3)
+    lambda {
+      owner.should have_at_least(4).items_in_collection_with_length_method
+    }.should fail_with("expected at least 4 items_in_collection_with_length_method, got 3")
+    lambda {
+      owner.should have_at_least(4).items_in_collection_with_size_method
+    }.should fail_with("expected at least 4 items_in_collection_with_size_method, got 3")
+  end
+  
+  it "should provide educational negative failure messages" do
+    #given
+    owner = create_collection_owner_with(3)
+    length_matcher = have_at_least(3).items_in_collection_with_length_method
+    size_matcher = have_at_least(3).items_in_collection_with_size_method
+    
+    #when
+    length_matcher.matches?(owner)
+    size_matcher.matches?(owner)
+    
+    #then
+    length_matcher.negative_failure_message.should == <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_least(3).items_in_collection_with_length_method
+We recommend that you use this instead:
+  should have_at_most(2).items_in_collection_with_length_method
+EOF
+
+    size_matcher.negative_failure_message.should == <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_least(3).items_in_collection_with_size_method
+We recommend that you use this instead:
+  should have_at_most(2).items_in_collection_with_size_method
+EOF
+  end
+end
+
+describe "should have_at_most(n).items" do
+  include HaveSpecHelper
+
+  it "should pass if target has a collection of items with n members" do
+    owner = create_collection_owner_with(3)
+    owner.should have_at_most(3).items_in_collection_with_length_method
+    owner.should have_at_most(3).items_in_collection_with_size_method
+  end
+
+  it "should fail if target has a collection of items with > n members" do
+    owner = create_collection_owner_with(3)
+    lambda {
+      owner.should have_at_most(2).items_in_collection_with_length_method
+    }.should fail_with("expected at most 2 items_in_collection_with_length_method, got 3")
+    lambda {
+      owner.should have_at_most(2).items_in_collection_with_size_method
+    }.should fail_with("expected at most 2 items_in_collection_with_size_method, got 3")
+  end
+  
+  it "should pass if target has a collection of items with < n members" do
+    owner = create_collection_owner_with(3)
+    owner.should have_at_most(4).items_in_collection_with_length_method
+    owner.should have_at_most(4).items_in_collection_with_size_method
+  end
+
+  it "should provide educational negative failure messages" do
+    #given
+    owner = create_collection_owner_with(3)
+    length_matcher = have_at_most(3).items_in_collection_with_length_method
+    size_matcher = have_at_most(3).items_in_collection_with_size_method
+    
+    #when
+    length_matcher.matches?(owner)
+    size_matcher.matches?(owner)
+    
+    #then
+    length_matcher.negative_failure_message.should == <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_most(3).items_in_collection_with_length_method
+We recommend that you use this instead:
+  should have_at_least(4).items_in_collection_with_length_method
+EOF
+    
+    size_matcher.negative_failure_message.should == <<-EOF
+Isn't life confusing enough?
+Instead of having to figure out the meaning of this:
+  should_not have_at_most(3).items_in_collection_with_size_method
+We recommend that you use this instead:
+  should have_at_least(4).items_in_collection_with_size_method
+EOF
+  end
+end
+
+describe "have(n).items(args, block)" do
+  it "should pass args to target" do
+    target = mock("target")
+    target.should_receive(:items).with("arg1","arg2").and_return([1,2,3])
+    target.should have(3).items("arg1","arg2")
+  end
+
+  it "should pass block to target" do
+    target = mock("target")
+    block = lambda { 5 }
+    target.should_receive(:items).with("arg1","arg2", block).and_return([1,2,3])
+    target.should have(3).items("arg1","arg2", block)
+  end
+end
+
+describe "have(n).items where target IS a collection" do
+  it "should reference the number of items IN the collection" do
+    [1,2,3].should have(3).items
+  end
+
+  it "should fail when the number of items IN the collection is not as expected" do
+    lambda { [1,2,3].should have(7).items }.should fail_with("expected 7 items, got 3")
+  end
+end
+
+describe "have(n).characters where target IS a String" do
+  it "should pass if the length is correct" do
+    "this string".should have(11).characters
+  end
+
+  it "should fail if the length is incorrect" do
+    lambda { "this string".should have(12).characters }.should fail_with("expected 12 characters, got 11")
+  end
+end
+
+describe "have(n).things on an object which is not a collection nor contains one" do
+  it "should fail" do
+    lambda { Object.new.should have(2).things }.should raise_error(NoMethodError, /undefined method `things' for #<Object:/)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/include_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/include_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/include_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/include_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should include(expected)" do
+  it "should pass if target includes expected" do
+    [1,2,3].should include(3)
+    "abc".should include("a")
+  end
+
+  it "should fail if target does not include expected" do
+    lambda {
+      [1,2,3].should include(4)
+    }.should fail_with("expected [1, 2, 3] to include 4")
+    lambda {
+      "abc".should include("d")
+    }.should fail_with("expected \"abc\" to include \"d\"")
+  end
+end
+
+describe "should include(with, multiple, args)" do
+  it "should pass if target includes all items" do
+    [1,2,3].should include(1,2,3)
+  end
+
+  it "should fail if target does not include any one of the items" do
+    lambda {
+      [1,2,3].should include(1,2,4)
+    }.should fail_with("expected [1, 2, 3] to include 1, 2 and 4")
+  end
+end
+
+describe "should_not include(expected)" do
+  it "should pass if target does not include expected" do
+    [1,2,3].should_not include(4)
+    "abc".should_not include("d")
+  end
+
+  it "should fail if target includes expected" do
+    lambda {
+      [1,2,3].should_not include(3)
+    }.should fail_with("expected [1, 2, 3] not to include 3")
+    lambda {
+      "abc".should_not include("c")
+    }.should fail_with("expected \"abc\" not to include \"c\"")
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/match_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/match_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/match_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/match_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should match(expected)" do
+  it "should pass when target (String) matches expected (Regexp)" do
+    "string".should match(/tri/)
+  end
+
+  it "should fail when target (String) matches expected (Regexp)" do
+    lambda {
+      "string".should match(/rings/)
+    }.should fail
+  end
+
+  it "should provide message, expected and actual on failure" do
+    matcher = match(/rings/)
+    matcher.matches?("string")
+    matcher.failure_message.should == ["expected \"string\" to match /rings/", /rings/, "string"]
+  end
+end
+
+describe "should_not match(expected)" do
+  it "should pass when target (String) matches expected (Regexp)" do
+    "string".should_not match(/rings/)
+  end
+
+  it "should fail when target (String) matches expected (Regexp)" do
+    lambda {
+      "string".should_not match(/tri/)
+    }.should fail
+  end
+
+  it "should provide message, expected and actual on failure" do
+    matcher = match(/tri/)
+    matcher.matches?("string")
+    matcher.negative_failure_message.should == ["expected \"string\" not to match /tri/", /tri/, "string"]
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    context %Q{The Spec::Matchers module gets included in the execution context of every spec.
+This module should provide the following methods, each of which returns a Matcher object.} do
+      it "be_true" do
+        be_true.should be_an_instance_of(Be)
+      end
+      it "be_false" do
+        be_false.should be_an_instance_of(Be)
+      end
+      it "be_nil" do
+        be_nil.should be_an_instance_of(Be)
+      end
+      it "be_arbitrary_predicate" do
+        be_arbitrary_predicate.should be_an_instance_of(Be)
+      end
+      it "be_close" do
+        be_close(1,2).should be_an_instance_of(BeClose)
+      end
+      it "change" do
+        change("target", :message).should be_an_instance_of(Change)
+      end
+      it "eql" do
+        eql(:expected).should be_an_instance_of(Eql)
+      end
+      it "equal" do
+        equal(:expected).should be_an_instance_of(Equal)
+      end
+      it "have" do
+        have(0).should be_an_instance_of(Have)
+      end
+      it "have_exactly" do
+        have_exactly(0).should be_an_instance_of(Have)
+      end
+      it "have_at_least" do
+        have_at_least(0).should be_an_instance_of(Have)
+      end
+      it "have_at_most" do
+        have_at_most(0).should be_an_instance_of(Have)
+      end
+      it "include" do
+        include(:value).should be_an_instance_of(Include)
+      end
+      it "match" do
+        match(:value).should be_an_instance_of(Match)
+      end
+      it "raise_error" do
+        raise_error.should be_an_instance_of(RaiseError)
+        raise_error(NoMethodError).should be_an_instance_of(RaiseError)
+        raise_error(NoMethodError, "message").should be_an_instance_of(RaiseError)
+      end
+      it "satisfy" do
+        satisfy{}.should be_an_instance_of(Satisfy)
+      end
+      it "throw_symbol" do
+        throw_symbol.should be_an_instance_of(ThrowSymbol)
+        throw_symbol(:sym).should be_an_instance_of(ThrowSymbol)
+      end
+      it "respond_to" do
+        respond_to(:sym).should be_an_instance_of(RespondTo)
+      end
+    end
+    
+    describe "Spec::Matchers#method_missing" do
+      it "should convert be_xyz to Be(:be_xyz)" do
+        Be.should_receive(:new).with(:be_whatever)
+        be_whatever
+      end
+
+      it "should convert have_xyz to Has(:have_xyz)" do
+        Has.should_receive(:new).with(:have_whatever)
+        have_whatever
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/mock_constraint_matchers_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/mock_constraint_matchers_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/mock_constraint_matchers_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/mock_constraint_matchers_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "The anything() mock argument constraint matcher" do
+  specify { anything.should == Object.new }
+  specify { anything.should == Class }
+  specify { anything.should == 1 }
+  specify { anything.should == "a string" }
+  specify { anything.should == :a_symbol }
+end
+
+describe "The boolean() mock argument constraint matcher" do
+  specify { boolean.should == true }
+  specify { boolean.should == false }
+  specify { boolean.should_not == Object.new }
+  specify { boolean.should_not == Class }
+  specify { boolean.should_not == 1 }
+  specify { boolean.should_not == "a string" }
+  specify { boolean.should_not == :a_symbol }
+end
+
+describe "The an_instance_of() mock argument constraint matcher" do
+  # NOTE - this is implemented as a predicate_matcher - see behaviour.rb
+  specify { an_instance_of(String).should == "string"  }
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,158 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+require 'spec/expectations/differs/default'
+
+describe "should ==" do
+  
+  it "should delegate message to target" do
+    subject = "apple"
+    subject.should_receive(:==).with("apple").and_return(true)
+    subject.should == "apple"
+  end
+  
+  it "should fail when target.==(actual) returns false" do
+    subject = "apple"
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ==)], "orange", "apple")
+    subject.should == "orange"
+  end
+
+end
+
+describe "should_not ==" do
+  
+  it "should delegate message to target" do
+    subject = "orange"
+    subject.should_receive(:==).with("apple").and_return(false)
+    subject.should_not == "apple"
+  end
+  
+  it "should fail when target.==(actual) returns false" do
+    subject = "apple"
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple",\n         got:    "apple"], "apple", "apple")
+    subject.should_not == "apple"
+  end
+
+end
+
+describe "should ===" do
+  
+  it "should delegate message to target" do
+    subject = "apple"
+    subject.should_receive(:===).with("apple").and_return(true)
+    subject.should === "apple"
+  end
+  
+  it "should fail when target.===(actual) returns false" do
+    subject = "apple"
+    subject.should_receive(:===).with("orange").and_return(false)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ===)], "orange", "apple")
+    subject.should === "orange"
+  end
+  
+end
+
+describe "should_not ===" do
+  
+  it "should delegate message to target" do
+    subject = "orange"
+    subject.should_receive(:===).with("apple").and_return(false)
+    subject.should_not === "apple"
+  end
+  
+  it "should fail when target.===(actual) returns false" do
+    subject = "apple"
+    subject.should_receive(:===).with("apple").and_return(true)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not: === "apple",\n         got:     "apple"], "apple", "apple")
+    subject.should_not === "apple"
+  end
+
+end
+
+describe "should =~" do
+  
+  it "should delegate message to target" do
+    subject = "foo"
+    subject.should_receive(:=~).with(/oo/).and_return(true)
+    subject.should =~ /oo/
+  end
+  
+  it "should fail when target.=~(actual) returns false" do
+    subject = "fu"
+    subject.should_receive(:=~).with(/oo/).and_return(false)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: /oo/,\n     got: "fu" (using =~)], /oo/, "fu")
+    subject.should =~ /oo/
+  end
+
+end
+
+describe "should_not =~" do
+  
+  it "should delegate message to target" do
+    subject = "fu"
+    subject.should_receive(:=~).with(/oo/).and_return(false)
+    subject.should_not =~ /oo/
+  end
+  
+  it "should fail when target.=~(actual) returns false" do
+    subject = "foo"
+    subject.should_receive(:=~).with(/oo/).and_return(true)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not: =~ /oo/,\n         got:    "foo"], /oo/, "foo")
+    subject.should_not =~ /oo/
+  end
+
+end
+
+describe "should >" do
+  
+  it "should pass if > passes" do
+    4.should > 3
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: > 5,\n     got:   4], 5, 4)
+    4.should > 5
+  end
+
+end
+
+describe "should >=" do
+  
+  it "should pass if >= passes" do
+    4.should > 3
+    4.should >= 4
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: >= 5,\n     got:    4], 5, 4)
+    4.should >= 5
+  end
+
+end
+
+describe "should <" do
+  
+  it "should pass if < passes" do
+    4.should < 5
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: < 3,\n     got:   4], 3, 4)
+    4.should < 3
+  end
+
+end
+
+describe "should <=" do
+  
+  it "should pass if <= passes" do
+    4.should <= 5
+    4.should <= 4
+  end
+
+  it "should fail if > fails" do
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: <= 3,\n     got:    4], 3, 4)
+    4.should <= 3
+  end
+
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,185 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should raise_error" do
+  it "should pass if anything is raised" do
+    lambda {raise}.should raise_error
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda {}.should raise_error
+    }.should fail_with("expected Exception but nothing was raised")
+  end
+end
+
+describe "should_not raise_error" do
+  it "should pass if nothing is raised" do
+    lambda {}.should_not raise_error
+  end
+  
+  it "should fail if anything is raised" do
+    lambda {
+      lambda {raise}.should_not raise_error
+    }.should fail_with("expected no Exception, got RuntimeError")
+  end
+end
+
+describe "should raise_error(message)" do
+  it "should pass if RuntimeError is raised with the right message" do
+    lambda {raise 'blah'}.should raise_error('blah')
+  end
+  it "should pass if any other error is raised with the right message" do
+    lambda {raise NameError.new('blah')}.should raise_error('blah')
+  end
+  it "should fail if RuntimeError error is raised with the wrong message" do
+    lambda do
+      lambda {raise 'blarg'}.should raise_error('blah')
+    end.should fail_with("expected Exception with \"blah\", got #<RuntimeError: blarg>")
+  end
+  it "should fail if any other error is raised with the wrong message" do
+    lambda do
+      lambda {raise NameError.new('blarg')}.should raise_error('blah')
+    end.should fail_with("expected Exception with \"blah\", got #<NameError: blarg>")
+  end
+end
+
+describe "should_not raise_error(message)" do
+  it "should pass if RuntimeError error is raised with the different message" do
+    lambda {raise 'blarg'}.should_not raise_error('blah')
+  end
+  it "should pass if any other error is raised with the wrong message" do
+    lambda {raise NameError.new('blarg')}.should_not raise_error('blah')
+  end
+  it "should fail if RuntimeError is raised with message" do
+    lambda do
+      lambda {raise 'blah'}.should_not raise_error('blah')
+    end.should fail_with(%Q|expected no Exception with "blah", got #<RuntimeError: blah>|)
+  end
+  it "should fail if any other error is raised with message" do
+    lambda do
+      lambda {raise NameError.new('blah')}.should_not raise_error('blah')
+    end.should fail_with(%Q|expected no Exception with "blah", got #<NameError: blah>|)
+  end
+end
+
+describe "should raise_error(NamedError)" do
+  it "should pass if named error is raised" do
+    lambda { non_existent_method }.should raise_error(NameError)
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda { }.should raise_error(NameError)
+    }.should fail_with("expected NameError but nothing was raised")
+  end
+  
+  it "should fail if another error is raised" do
+    lambda {
+      lambda { raise }.should raise_error(NameError)
+    }.should fail_with("expected NameError, got RuntimeError")
+  end
+end
+
+describe "should_not raise_error(NamedError)" do
+  it "should pass if nothing is raised" do
+    lambda { }.should_not raise_error(NameError)
+  end
+  
+  it "should pass if another error is raised" do
+    lambda { raise }.should_not raise_error(NameError)
+  end
+  
+  it "should fail if named error is raised" do
+    lambda {
+      lambda { non_existent_method }.should_not raise_error(NameError)
+    }.should fail_with(/expected no NameError, got #<NameError: undefined/)
+  end  
+end
+
+describe "should raise_error(NamedError, error_message) with String" do
+  it "should pass if named error is raised with same message" do
+    lambda { raise "example message" }.should raise_error(RuntimeError, "example message")
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda {}.should raise_error(RuntimeError, "example message")
+    }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised")
+  end
+  
+  it "should fail if incorrect error is raised" do
+    lambda {
+      lambda { raise }.should raise_error(NameError, "example message")
+    }.should fail_with("expected NameError with \"example message\", got RuntimeError")
+  end
+  
+  it "should fail if correct error is raised with incorrect message" do
+    lambda {
+      lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, "example message")
+    }.should fail_with(/expected RuntimeError with \"example message\", got #<RuntimeError: not the example message/)
+  end
+end
+
+describe "should_not raise_error(NamedError, error_message) with String" do
+  it "should pass if nothing is raised" do
+    lambda {}.should_not raise_error(RuntimeError, "example message")
+  end
+  
+  it "should pass if a different error is raised" do
+    lambda { raise }.should_not raise_error(NameError, "example message")
+  end
+  
+  it "should pass if same error is raised with different message" do
+    lambda { raise RuntimeError.new("not the example message") }.should_not raise_error(RuntimeError, "example message")
+  end
+  
+  it "should fail if named error is raised with same message" do
+    lambda {
+      lambda { raise "example message" }.should_not raise_error(RuntimeError, "example message")
+    }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>")
+  end
+end
+
+describe "should raise_error(NamedError, error_message) with Regexp" do
+  it "should pass if named error is raised with matching message" do
+    lambda { raise "example message" }.should raise_error(RuntimeError, /ample mess/)
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda {}.should raise_error(RuntimeError, /ample mess/)
+    }.should fail_with("expected RuntimeError with message matching /ample mess/ but nothing was raised")
+  end
+  
+  it "should fail if incorrect error is raised" do
+    lambda {
+      lambda { raise }.should raise_error(NameError, /ample mess/)
+    }.should fail_with("expected NameError with message matching /ample mess/, got RuntimeError")
+  end
+  
+  it "should fail if correct error is raised with incorrect message" do
+    lambda {
+      lambda { raise RuntimeError.new("not the example message") }.should raise_error(RuntimeError, /less than ample mess/)
+    }.should fail_with("expected RuntimeError with message matching /less than ample mess/, got #<RuntimeError: not the example message>")
+  end
+end
+
+describe "should_not raise_error(NamedError, error_message) with Regexp" do
+  it "should pass if nothing is raised" do
+    lambda {}.should_not raise_error(RuntimeError, /ample mess/)
+  end
+  
+  it "should pass if a different error is raised" do
+    lambda { raise }.should_not raise_error(NameError, /ample mess/)
+  end
+  
+  it "should pass if same error is raised with non-matching message" do
+    lambda { raise RuntimeError.new("non matching message") }.should_not raise_error(RuntimeError, /ample mess/)
+  end
+  
+  it "should fail if named error is raised with matching message" do
+    lambda {
+      lambda { raise "example message" }.should_not raise_error(RuntimeError, /ample mess/)
+    }.should fail_with("expected no RuntimeError with message matching /ample mess/, got #<RuntimeError: example message>")
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/respond_to_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/respond_to_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/respond_to_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/respond_to_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should respond_to(:sym)" do
+  
+  it "should pass if target responds to :sym" do
+    Object.new.should respond_to(:methods)
+  end
+  
+  it "should fail target does not respond to :sym" do
+    lambda {
+      Object.new.should respond_to(:some_method)
+    }.should fail_with("expected target to respond to :some_method")
+  end
+  
+end
+
+describe "should respond_to(message1, message2)" do
+  
+  it "should pass if target responds to both messages" do
+    Object.new.should respond_to('methods', 'inspect')
+  end
+  
+  it "should fail target does not respond to first message" do
+    lambda {
+      Object.new.should respond_to('method_one', 'inspect')
+    }.should fail_with('expected target to respond to "method_one"')
+  end
+  
+  it "should fail target does not respond to second message" do
+    lambda {
+      Object.new.should respond_to('inspect', 'method_one')
+    }.should fail_with('expected target to respond to "method_one"')
+  end
+  
+  it "should fail target does not respond to either message" do
+    lambda {
+      Object.new.should respond_to('method_one', 'method_two')
+    }.should fail_with('expected target to respond to "method_one", "method_two"')
+  end
+end
+
+describe "should_not respond_to(:sym)" do
+  
+  it "should pass if target does not respond to :sym" do
+    Object.new.should_not respond_to(:some_method)
+  end
+  
+  it "should fail target responds to :sym" do
+    lambda {
+      Object.new.should_not respond_to(:methods)
+    }.should fail_with("expected target not to respond to :methods")
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/satisfy_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/satisfy_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/satisfy_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/satisfy_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "should satisfy { block }" do
+  it "should pass if block returns true" do
+    true.should satisfy { |val| val }
+    true.should satisfy do |val|
+      val
+    end
+  end
+
+  it "should fail if block returns false" do
+    lambda {
+      false.should satisfy { |val| val }
+    }.should fail_with("expected false to satisfy block")
+    lambda do
+      false.should satisfy do |val|
+        val
+      end
+    end.should fail_with("expected false to satisfy block")
+  end
+end
+
+describe "should_not satisfy { block }" do
+  it "should pass if block returns false" do
+    false.should_not satisfy { |val| val }
+    false.should_not satisfy do |val|
+      val
+    end
+  end
+
+  it "should fail if block returns true" do
+    lambda {
+      true.should_not satisfy { |val| val }
+    }.should fail_with("expected true not to satisfy block")
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Matchers
+    describe SimpleMatcher do
+      it "should match pass match arg to block" do
+        actual = nil
+        matcher = simple_matcher("message") do |given| actual = given end
+        matcher.matches?("foo")
+        actual.should == "foo"
+      end
+      
+      it "should provide a stock failure message" do
+        matcher = simple_matcher("thing") do end
+        matcher.matches?("other")
+        matcher.failure_message.should =~ /expected \"thing\" but got \"other\"/
+      end
+      
+      it "should provide a stock negative failure message" do
+        matcher = simple_matcher("thing") do end
+        matcher.matches?("other")
+        matcher.negative_failure_message.should =~ /expected not to get \"thing\", but got \"other\"/
+      end
+      
+      it "should provide a description" do
+        matcher = simple_matcher("thing") do end
+        matcher.description.should =="thing"
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    describe ThrowSymbol, "(constructed with no Symbol)" do
+      before(:each) { @matcher = ThrowSymbol.new }
+
+      it "should match if any Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :sym }).should be_true
+      end
+      it "should not match if no Symbol is thrown" do
+        @matcher.matches?(lambda{ }).should be_false
+      end
+      it "should provide a failure message" do
+        @matcher.matches?(lambda{})
+        @matcher.failure_message.should == "expected a Symbol but nothing was thrown"
+      end
+      it "should provide a negative failure message" do
+        @matcher.matches?(lambda{ throw :sym})
+        @matcher.negative_failure_message.should == "expected no Symbol, got :sym"
+      end
+    end
+    
+    describe ThrowSymbol, "(constructed with a Symbol)" do
+      before(:each) { @matcher = ThrowSymbol.new(:sym) }
+      
+      it "should match if correct Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :sym }).should be_true
+      end
+      it "should not match if no Symbol is thrown" do
+        @matcher.matches?(lambda{ }).should be_false
+      end
+      it "should not match if correct Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :other_sym }).should be_false
+        @matcher.failure_message.should == "expected :sym, got :other_sym"
+      end
+      it "should provide a failure message when no Symbol is thrown" do
+        @matcher.matches?(lambda{})
+        @matcher.failure_message.should == "expected :sym but nothing was thrown"
+      end
+      it "should provide a failure message when wrong Symbol is thrown" do
+        @matcher.matches?(lambda{ throw :other_sym })
+        @matcher.failure_message.should == "expected :sym, got :other_sym"
+      end
+      it "should provide a negative failure message" do
+        @matcher.matches?(lambda{ throw :sym })
+        @matcher.negative_failure_message.should == "expected :sym not to be thrown"
+      end
+      it "should only match NameErrors raised by uncaught throws" do
+        @matcher.matches?(lambda{ sym }).should be_false
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    
+    describe "AnyNumberOfTimes" do
+      before(:each) do
+        @mock = Mock.new("test mock")
+      end
+
+      it "should pass if any number of times method is called many times" do
+        @mock.should_receive(:random_call).any_number_of_times
+        (1..10).each do
+          @mock.random_call
+        end
+      end
+
+      it "should pass if any number of times method is called once" do
+        @mock.should_receive(:random_call).any_number_of_times
+        @mock.random_call
+      end
+      
+      it "should pass if any number of times method is not called" do
+        @mock.should_receive(:random_call).any_number_of_times
+      end
+    end
+
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/argument_expectation_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/argument_expectation_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/argument_expectation_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/argument_expectation_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe ArgumentExpectation do
+      it "should consider an object that responds to #matches? and #description to be a matcher" do
+        argument_expecatation = Spec::Mocks::ArgumentExpectation.new([])
+        obj = mock("matcher")
+        obj.should_receive(:respond_to?).with(:matches?).and_return(true)
+        obj.should_receive(:respond_to?).with(:description).and_return(true)
+        argument_expecatation.is_matcher?(obj).should be_true
+      end
+
+      it "should NOT consider an object that only responds to #matches? to be a matcher" do
+        argument_expecatation = Spec::Mocks::ArgumentExpectation.new([])
+        obj = mock("matcher")
+        obj.should_receive(:respond_to?).with(:matches?).and_return(true)
+        obj.should_receive(:respond_to?).with(:description).and_return(false)
+        argument_expecatation.is_matcher?(obj).should be_false
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/at_least_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/at_least_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/at_least_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/at_least_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "at_least" do
+      before(:each) do
+        @mock = Mock.new("test mock")
+      end
+
+      it "should fail if method is never called" do
+        @mock.should_receive(:random_call).at_least(4).times
+          lambda do
+        @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when called less than n times" do
+        @mock.should_receive(:random_call).at_least(4).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when at least once method is never called" do
+        @mock.should_receive(:random_call).at_least(:once)
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when at least twice method is called once" do
+        @mock.should_receive(:random_call).at_least(:twice)
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when at least twice method is never called" do
+        @mock.should_receive(:random_call).at_least(:twice)
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should pass when at least n times method is called exactly n times" do
+        @mock.should_receive(:random_call).at_least(4).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at least n times method is called n plus 1 times" do
+        @mock.should_receive(:random_call).at_least(4).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at least once method is called once" do
+        @mock.should_receive(:random_call).at_least(:once)
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at least once method is called twice" do
+        @mock.should_receive(:random_call).at_least(:once)
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at least twice method is called three times" do
+        @mock.should_receive(:random_call).at_least(:twice)
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at least twice method is called twice" do
+        @mock.should_receive(:random_call).at_least(:twice)
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/at_most_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/at_most_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/at_most_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/at_most_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "at_most" do
+      before(:each) do
+        @mock = Mock.new("test mock")
+      end
+
+      it "should fail when at most n times method is called n plus 1 times" do
+        @mock.should_receive(:random_call).at_most(4).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when at most once method is called twice" do
+        @mock.should_receive(:random_call).at_most(:once)
+        @mock.random_call
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when at most twice method is called three times" do
+        @mock.should_receive(:random_call).at_most(:twice)
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should pass when at most n times method is called exactly n times" do
+        @mock.should_receive(:random_call).at_most(4).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most n times method is called less than n times" do
+        @mock.should_receive(:random_call).at_most(4).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most n times method is never called" do
+        @mock.should_receive(:random_call).at_most(4).times
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most once method is called once" do
+        @mock.should_receive(:random_call).at_most(:once)
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most once method is never called" do
+        @mock.should_receive(:random_call).at_most(:once)
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most twice method is called once" do
+        @mock.should_receive(:random_call).at_most(:twice)
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most twice method is called twice" do
+        @mock.should_receive(:random_call).at_most(:twice)
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass when at most twice method is never called" do
+        @mock.should_receive(:random_call).at_most(:twice)
+        @mock.rspec_verify
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_10260_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_10260_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_10260_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_10260_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "An RSpec Mock" do
+  it "should hide internals in its inspect representation" do
+    m = mock('cup')
+    m.inspect.should =~ /#<Spec::Mocks::Mock:0x[a-f0-9.]+ @name="cup">/
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_10263.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_10263.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_10263.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_10263.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,24 @@
+describe "Mock" do
+  before do
+    @mock = mock("test mock")
+  end
+  
+  specify "when one example has an expectation (non-mock) inside the block passed to the mock" do
+    @mock.should_receive(:msg) do |b|
+      b.should be_true #this call exposes the problem
+    end
+    @mock.msg(false) rescue nil
+  end
+  
+  specify "then the next example should behave as expected instead of saying" do
+    @mock.should_receive(:foobar)
+    @mock.foobar
+    @mock.rspec_verify
+    begin
+      @mock.foobar
+    rescue => e
+      e.message.should == "Mock 'test mock' received unexpected message :foobar with (no args)"
+    end
+  end 
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+class LiarLiarPantsOnFire
+  def respond_to?(sym)
+    true
+  end
+  
+  def self.respond_to?(sym)
+    true
+  end
+end
+  
+describe 'should_receive' do
+  before(:each) do
+    @liar = LiarLiarPantsOnFire.new
+  end
+  
+  it "should work when object lies about responding to a method" do
+    @liar.should_receive(:something)
+    @liar.something
+  end
+
+  it 'should work when class lies about responding to a method' do
+    LiarLiarPantsOnFire.should_receive(:something)
+    LiarLiarPantsOnFire.something
+  end
+  
+  it 'should cleanup after itself' do
+    LiarLiarPantsOnFire.metaclass.instance_methods.should_not include("something")
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "mock failure" do
+      
+      it "should tell you when it receives the right message with the wrong args" do
+        m = mock("foo")
+        m.should_receive(:bar).with("message")
+        lambda {
+          m.bar("different message")
+        }.should raise_error(Spec::Mocks::MockExpectationError, %Q{Mock 'foo' expected :bar with ("message") but received it with ("different message")})
+        m.bar("message") # allows the spec to pass
+      end
+
+      it "should tell you when it receives the right message with the wrong args if you stub the method" do
+        pending("fix bug 15719")
+        # NOTE - for whatever reason, if you use a the block style of pending here,
+        # rcov gets unhappy. Don't know why yet.
+        m = mock("foo")
+        m.stub!(:bar)
+        m.should_receive(:bar).with("message")
+        lambda {
+          m.bar("different message")
+        }.should raise_error(Spec::Mocks::MockExpectationError, %Q{Mock 'foo' expected :bar with ("message") but received it with ("different message")})
+        m.bar("message") # allows the spec to pass
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Bug7611
+  class Foo
+  end
+
+  class Bar < Foo
+  end
+
+  describe "A Partial Mock" do
+    it "should respect subclasses" do
+      Foo.stub!(:new).and_return(Object.new)
+    end
+
+    it "should" do
+      Bar.new.class.should == Bar
+    end 
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_7805_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_7805_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_7805_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_7805_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Bug7805
+  #This is really a duplicate of 8302
+
+  describe "Stubs should correctly restore module methods" do
+    it "1 - stub the open method" do
+      File.stub!(:open).and_return("something")
+      File.open.should == "something"
+    end
+    it "2 - use File.open to create example.txt" do
+      filename = "#{File.dirname(__FILE__)}/example-#{Time.new.to_i}.txt"
+      File.exist?(filename).should be_false
+      file = File.open(filename,'w')
+      file.close
+      File.exist?(filename).should be_true
+      File.delete(filename)
+      File.exist?(filename).should be_false
+    end
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_8165_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_8165_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_8165_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_8165_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "An object where respond_to? is true and does not have method" do
+  # When should_receive(:sym) is sent to any object, the Proxy sends
+  # respond_to?(:sym) to that object to see if the method should be proxied.
+  #
+  # If respond_to? itself is proxied, then when the Proxy sends respond_to?
+  # to the object, the proxy is invoked and responds yes (if so set in the spec).
+  # When the object does NOT actually respond to :sym, an exception is thrown
+  # when trying to proxy it.
+  #
+  # The fix was to keep track of whether :respond_to? had been proxied and, if
+  # so, call the munged copy of :respond_to? on the object.
+
+  it "should not raise an exception for Object" do
+    obj = Object.new
+    obj.should_receive(:respond_to?).with(:foobar).and_return(true)
+    obj.should_receive(:foobar).and_return(:baz)
+    obj.respond_to?(:foobar).should be_true
+    obj.foobar.should == :baz
+  end
+
+  it "should not raise an exception for mock" do
+    obj = mock("obj")
+    obj.should_receive(:respond_to?).with(:foobar).and_return(true)
+    obj.should_receive(:foobar).and_return(:baz)
+    obj.respond_to?(:foobar).should be_true
+    obj.foobar.should == :baz
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Bug8302
+  class Foo
+    def Foo.class_method(arg)
+    end
+  
+    def instance_bar(arg)
+    end
+  end
+
+  describe "Bug report 8302:" do
+    it "class method is not restored correctly when proxied" do
+      Foo.should_not_receive(:class_method).with(Array.new)
+      Foo.rspec_verify
+      Foo.class_method(Array.new)
+    end
+
+    it "instance method is not restored correctly when proxied" do
+      foo = Foo.new
+      foo.should_not_receive(:instance_bar).with(Array.new)
+      foo.rspec_verify
+      foo.instance_bar(Array.new)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,115 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "failing MockArgumentConstraints" do
+      before(:each) do
+        @mock = mock("test mock")
+        @reporter = Mock.new("reporter", :null_object => true)
+      end
+      
+      after(:each) do
+        @mock.rspec_reset
+      end
+
+      it "should reject non boolean" do
+        @mock.should_receive(:random_call).with(boolean())
+        lambda do
+          @mock.random_call("false")
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should reject non numeric" do
+        @mock.should_receive(:random_call).with(an_instance_of(Numeric))
+        lambda do
+          @mock.random_call("1")
+        end.should raise_error(MockExpectationError)
+      end
+      
+      it "should reject non string" do
+        @mock.should_receive(:random_call).with(an_instance_of(String))
+        lambda do
+          @mock.random_call(123)
+        end.should raise_error(MockExpectationError)
+      end
+      
+      it "should reject goose when expecting a duck" do
+        @mock.should_receive(:random_call).with(duck_type(:abs, :div))
+        lambda { @mock.random_call("I don't respond to :abs or :div") }.should raise_error(MockExpectationError)
+      end
+
+      it "should fail if regexp does not match submitted string" do
+        @mock.should_receive(:random_call).with(/bcd/)
+        lambda { @mock.random_call("abc") }.should raise_error(MockExpectationError)
+      end
+      
+      it "should fail if regexp does not match submitted regexp" do
+        @mock.should_receive(:random_call).with(/bcd/)
+        lambda { @mock.random_call(/bcde/) }.should raise_error(MockExpectationError)
+      end
+      
+      it "should fail for a hash w/ wrong values" do
+        @mock.should_receive(:random_call).with(:a => "b", :c => "d")
+        lambda do
+          @mock.random_call(:a => "b", :c => "e")
+        end.should raise_error(MockExpectationError, /Mock 'test mock' expected :random_call with \(\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}\) but received it with \(\{(:a=>\"b\", :c=>\"e\"|:c=>\"e\", :a=>\"b\")\}\)/)
+      end
+      
+      it "should fail for a hash w/ wrong keys" do
+        @mock.should_receive(:random_call).with(:a => "b", :c => "d")
+        lambda do
+          @mock.random_call("a" => "b", "c" => "d")
+        end.should raise_error(MockExpectationError, /Mock 'test mock' expected :random_call with \(\{(:a=>\"b\", :c=>\"d\"|:c=>\"d\", :a=>\"b\")\}\) but received it with \(\{(\"a\"=>\"b\", \"c\"=>\"d\"|\"c\"=>\"d\", \"a\"=>\"b\")\}\)/)
+      end
+      
+      it "should match against a Matcher" do
+        lambda do
+          @mock.should_receive(:msg).with(equal(3))
+          @mock.msg(37)
+        end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (equal 3) but received it with (37)")
+      end
+      
+      it "should fail no_args with one arg" do
+        lambda do
+          @mock.should_receive(:msg).with(no_args)
+          @mock.msg(37)
+        end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (no args) but received it with (37)")
+      end
+    end
+      
+    describe "failing deprecated MockArgumentConstraints" do
+      before(:each) do
+        @mock = mock("test mock")
+        @reporter = Mock.new("reporter", :null_object => true)
+        Kernel.stub!(:warn)
+      end
+
+      after(:each) do
+        @mock.rspec_reset
+      end
+
+      it "should reject non boolean" do
+        @mock.should_receive(:random_call).with(:boolean)
+        lambda do
+          @mock.random_call("false")
+        end.should raise_error(MockExpectationError)
+      end
+      
+      it "should reject non numeric" do
+        @mock.should_receive(:random_call).with(:numeric)
+        lambda do
+          @mock.random_call("1")
+        end.should raise_error(MockExpectationError)
+      end
+      
+      it "should reject non string" do
+        @mock.should_receive(:random_call).with(:string)
+        lambda do
+          @mock.random_call(123)
+        end.should raise_error(MockExpectationError)
+      end
+      
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Mocks
+
+    describe "Mock ordering" do
+
+      before do
+        @mock = mock("test mock")
+      end
+      
+      after do
+        @mock.rspec_reset
+      end
+
+      it "should pass two calls in order" do
+        @mock.should_receive(:one).ordered
+        @mock.should_receive(:two).ordered
+        @mock.one
+        @mock.two
+        @mock.rspec_verify
+      end
+
+      it "should pass three calls in order" do
+        @mock.should_receive(:one).ordered
+        @mock.should_receive(:two).ordered
+        @mock.should_receive(:three).ordered
+        @mock.one
+        @mock.two
+        @mock.three
+        @mock.rspec_verify
+      end
+
+      it "should fail if second call comes first" do
+        @mock.should_receive(:one).ordered
+        @mock.should_receive(:two).ordered
+        lambda do
+          @mock.two
+        end.should raise_error(MockExpectationError, "Mock 'test mock' received :two out of order")
+      end
+
+      it "should fail if third call comes first" do
+        @mock.should_receive(:one).ordered
+        @mock.should_receive(:two).ordered
+        @mock.should_receive(:three).ordered
+        @mock.one
+        lambda do
+          @mock.three
+        end.should raise_error(MockExpectationError, "Mock 'test mock' received :three out of order")
+      end
+      
+      it "should fail if third call comes second" do
+        @mock.should_receive(:one).ordered
+        @mock.should_receive(:two).ordered
+        @mock.should_receive(:three).ordered
+        @mock.one
+        lambda do
+          @mock.three
+        end.should raise_error(MockExpectationError, "Mock 'test mock' received :three out of order")
+      end
+
+      it "should ignore order of non ordered calls" do
+        @mock.should_receive(:ignored_0)
+        @mock.should_receive(:ordered_1).ordered
+        @mock.should_receive(:ignored_1)
+        @mock.should_receive(:ordered_2).ordered
+        @mock.should_receive(:ignored_2)
+        @mock.should_receive(:ignored_3)
+        @mock.should_receive(:ordered_3).ordered
+        @mock.should_receive(:ignored_4)
+        @mock.ignored_3
+        @mock.ordered_1
+        @mock.ignored_0
+        @mock.ordered_2
+        @mock.ignored_4
+        @mock.ignored_2
+        @mock.ordered_3
+        @mock.ignored_1
+        @mock.rspec_verify
+      end
+            
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/mock_space_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/mock_space_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/mock_space_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/mock_space_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec/mocks'
+
+module Spec
+  module Mocks
+    describe Space do
+      before :each do
+        @space = Space.new
+        klazz = Class.new do
+          def rspec_verify
+            @verified = true
+          end
+          def verified?
+            @verified
+          end
+          def rspec_reset
+            @reset = true
+          end
+          def reset?
+            @reset
+          end
+        end
+        @m1 = klazz.new
+        @m2 = klazz.new
+      end
+      it "should verify all mocks within" do
+        @space.add(@m1)
+        @space.add(@m2)
+        @space.verify_all
+        @m1.should be_verified
+        @m2.should be_verified
+      end
+      it "should reset all mocks within" do
+        @space.add(m1 = mock("mock1"))
+        @space.add(m2 = mock("mock2"))
+        m1.should_receive(:rspec_reset)
+        m2.should_receive(:rspec_reset)
+        @space.reset_all
+      end
+      it "should clear internal mocks on reset_all" do
+        @space.add(m = mock("mock"))
+        @space.reset_all
+        @space.instance_eval { mocks.empty? }.should be_true
+      end
+      it "should only add an instance once" do
+        @space.add(m1 = mock("mock1"))
+        @space.add(m1)
+        m1.should_receive(:rspec_verify)
+        @space.verify_all
+      end
+    end
+  end
+end
+    
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,451 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Mocks
+    describe "a Mock expectation" do
+
+      before(:each) do
+        @mock = mock("test mock")
+      end
+      
+      after(:each) do
+        @mock.rspec_reset
+      end
+      
+      it "should report line number of expectation of unreceived message" do
+        expected_error_line = __LINE__; @mock.should_receive(:wont_happen).with("x", 3)
+        begin
+          @mock.rspec_verify
+          violated
+        rescue MockExpectationError => e
+          # NOTE - this regexp ended w/ $, but jruby adds extra info at the end of the line
+          e.backtrace[0].should match(/#{File.basename(__FILE__)}:#{expected_error_line}/)
+        end
+      end
+      
+      it "should pass when not receiving message specified as not to be received" do
+        @mock.should_not_receive(:not_expected)
+        @mock.rspec_verify
+      end
+      
+      it "should pass when receiving message specified as not to be received with different args" do
+        @mock.should_not_receive(:message).with("unwanted text")
+        @mock.should_receive(:message).with("other text")
+        @mock.message "other text"
+        @mock.rspec_verify
+      end
+      
+      it "should fail when receiving message specified as not to be received" do
+        @mock.should_not_receive(:not_expected)
+        @mock.not_expected
+        lambda {
+          @mock.rspec_verify
+          violated
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it once")
+      end
+      
+      it "should fail when receiving message specified as not to be received with args" do
+        @mock.should_not_receive(:not_expected).with("unexpected text")
+        @mock.not_expected("unexpected text")
+        lambda {
+          @mock.rspec_verify
+          violated
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (\"unexpected text\") 0 times, but received it once")
+      end
+      
+      it "should pass when receiving message specified as not to be received with wrong args" do
+        @mock.should_not_receive(:not_expected).with("unexpected text")
+        @mock.not_expected "really unexpected text"
+        @mock.rspec_verify
+      end
+      
+      it "should allow block to calculate return values" do
+        @mock.should_receive(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
+        @mock.something("a","b","c").should == "cba"
+        @mock.rspec_verify
+      end
+      
+      it "should allow parameter as return value" do
+        @mock.should_receive(:something).with("a","b","c").and_return("booh")
+        @mock.something("a","b","c").should == "booh"
+        @mock.rspec_verify
+      end
+      
+      it "should return nil if no return value set" do
+        @mock.should_receive(:something).with("a","b","c")
+        @mock.something("a","b","c").should be_nil
+        @mock.rspec_verify
+      end
+      
+      it "should raise exception if args dont match when method called" do
+        @mock.should_receive(:something).with("a","b","c").and_return("booh")
+        lambda {
+          @mock.something("a","d","c")
+          violated
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")")
+      end
+           
+      it "should fail if unexpected method called" do
+        lambda {
+          @mock.something("a","b","c")
+          violated
+        }.should raise_error(MockExpectationError, "Mock 'test mock' received unexpected message :something with (\"a\", \"b\", \"c\")")
+      end
+        
+      it "should use block for expectation if provided" do
+        @mock.should_receive(:something) do | a, b |
+          a.should == "a"
+          b.should == "b"
+          "booh"
+        end
+        @mock.something("a", "b").should == "booh"
+        @mock.rspec_verify
+      end
+        
+      it "should fail if expectation block fails" do
+        @mock.should_receive(:something) {| bool | bool.should be_true}
+        lambda {
+          @mock.something false
+        }.should raise_error(MockExpectationError, /Mock 'test mock' received :something but passed block failed with: expected true, got false/)
+      end
+        
+      it "should fail right away when method defined as never is received" do
+        pending "Used to pass (false positive). Which one is wrong, the spec or the actual behavior?"
+
+        @mock.should_receive(:not_expected).never
+        lambda {
+          @mock.not_expected
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected 0 times, but received it 1 times")
+      end
+      
+      it "should eventually fail when method defined as never is received" do
+        @mock.should_receive(:not_expected).never
+        @mock.not_expected
+          
+        lambda {
+          @mock.rspec_verify
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :not_expected with (any args) 0 times, but received it once")
+      end
+
+      it "should raise when told to" do
+        @mock.should_receive(:something).and_raise(RuntimeError)
+        lambda do
+          @mock.something
+        end.should raise_error(RuntimeError)
+      end
+       
+      it "should raise passed an Exception instance" do
+        error = RuntimeError.new("error message")
+        @mock.should_receive(:something).and_raise(error)
+        lambda {
+          @mock.something
+        }.should raise_error(RuntimeError, "error message")
+      end
+      
+      it "should raise RuntimeError with passed message" do
+        @mock.should_receive(:something).and_raise("error message")
+        lambda {
+          @mock.something
+        }.should raise_error(RuntimeError, "error message")
+      end
+       
+      it "should not raise when told to if args dont match" do
+        @mock.should_receive(:something).with(2).and_raise(RuntimeError)
+        lambda {
+          @mock.something 1
+        }.should raise_error(MockExpectationError)
+      end
+       
+      it "should throw when told to" do
+        @mock.should_receive(:something).and_throw(:blech)
+        lambda {
+          @mock.something
+        }.should throw_symbol(:blech)
+      end
+      
+      it "should raise when explicit return and block constrained" do
+        lambda {
+          @mock.should_receive(:fruit) do |colour|
+            :strawberry
+          end.and_return :apple
+        }.should raise_error(AmbiguousReturnError)
+      end
+      
+      it "should ignore args on any args" do
+        @mock.should_receive(:something).at_least(:once).with(any_args)
+        @mock.something
+        @mock.something 1
+        @mock.something "a", 2
+        @mock.something [], {}, "joe", 7
+        @mock.rspec_verify
+      end
+      
+      it "should fail on no args if any args received" do
+        @mock.should_receive(:something).with(no_args())
+        lambda {
+          @mock.something 1
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (no args) but received it with (1)")
+      end
+
+      it "should fail when args are expected but none are received" do
+        @mock.should_receive(:something).with(1)
+        lambda {
+          @mock.something
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (1) but received it with (no args)")
+      end
+      
+      it "should yield 0 args to blocks that take a variable number of arguments" do
+        @mock.should_receive(:yield_back).with(no_args()).once.and_yield
+        a = nil
+        @mock.yield_back {|*a|}
+        a.should == []
+        @mock.rspec_verify
+      end
+      
+      it "should yield 0 args multiple times to blocks that take a variable number of arguments" do
+        @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield.
+                                                                    and_yield
+        a = nil
+        b = []
+        @mock.yield_back {|*a| b << a}
+        b.should == [ [], [] ]
+        @mock.rspec_verify
+      end
+      
+      it "should yield one arg to blocks that take a variable number of arguments" do
+        @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99)
+        a = nil
+        @mock.yield_back {|*a|}
+        a.should == [99]
+        @mock.rspec_verify
+      end
+      
+      it "should yield one arg 3 times consecutively to blocks that take a variable number of arguments" do
+        @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield(99).
+                                                                    and_yield(43).
+                                                                    and_yield("something fruity")
+        a = nil
+        b = []
+        @mock.yield_back {|*a| b << a}
+        b.should == [[99], [43], ["something fruity"]]
+        @mock.rspec_verify
+      end
+      
+      it "should yield many args to blocks that take a variable number of arguments" do
+        @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99, 27, "go")
+        a = nil
+        @mock.yield_back {|*a|}
+        a.should == [99, 27, "go"]
+        @mock.rspec_verify
+      end
+
+      it "should yield many args 3 times consecutively to blocks that take a variable number of arguments" do
+        @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield(99, :green, "go").
+                                                                    and_yield("wait", :amber).
+                                                                    and_yield("stop", 12, :red)
+        a = nil
+        b = []
+        @mock.yield_back {|*a| b << a}
+        b.should == [[99, :green, "go"], ["wait", :amber], ["stop", 12, :red]]
+        @mock.rspec_verify
+      end
+      
+      it "should yield single value" do
+        @mock.should_receive(:yield_back).with(no_args()).once.and_yield(99)
+        a = nil
+        @mock.yield_back {|a|}
+        a.should == 99
+        @mock.rspec_verify
+      end
+      
+      it "should yield single value 3 times consecutively" do
+        @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield(99).
+                                                                    and_yield(43).
+                                                                    and_yield("something fruity")
+        a = nil
+        b = []
+        @mock.yield_back {|a| b << a}
+        b.should == [99, 43, "something fruity"]
+        @mock.rspec_verify
+      end
+      
+      it "should yield two values" do
+        @mock.should_receive(:yield_back).with(no_args()).once.and_yield('wha', 'zup')
+        a, b = nil
+        @mock.yield_back {|a,b|}
+        a.should == 'wha'
+        b.should == 'zup'
+        @mock.rspec_verify
+      end
+      
+      it "should yield two values 3 times consecutively" do
+        @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield('wha', 'zup').
+                                                                    and_yield('not', 'down').
+                                                                    and_yield(14, 65)
+        a, b = nil
+        c = []
+        @mock.yield_back {|a,b| c << [a, b]}
+        c.should == [['wha', 'zup'], ['not', 'down'], [14, 65]]
+        @mock.rspec_verify
+      end
+      
+      it "should fail when calling yielding method with wrong arity" do
+        @mock.should_receive(:yield_back).with(no_args()).once.and_yield('wha', 'zup')
+        lambda {
+          @mock.yield_back {|a|}
+        }.should raise_error(MockExpectationError, "Mock 'test mock' yielded |\"wha\", \"zup\"| to block with arity of 1")
+      end
+      
+      it "should fail when calling yielding method consecutively with wrong arity" do
+        @mock.should_receive(:yield_back).once.with(no_args()).once.and_yield('wha', 'zup').
+                                                                    and_yield('down').
+                                                                    and_yield(14, 65)
+        lambda {
+          a, b = nil
+          c = []
+          @mock.yield_back {|a,b| c << [a, b]}
+        }.should raise_error(MockExpectationError, "Mock 'test mock' yielded |\"down\"| to block with arity of 2")
+      end
+      
+      it "should fail when calling yielding method without block" do
+        @mock.should_receive(:yield_back).with(no_args()).once.and_yield('wha', 'zup')
+        lambda {
+          @mock.yield_back
+        }.should raise_error(MockExpectationError, "Mock 'test mock' asked to yield |[\"wha\", \"zup\"]| but no block was passed")
+      end
+      
+      it "should be able to mock send" do
+        @mock.should_receive(:send).with(any_args)
+        @mock.send 'hi'
+        @mock.rspec_verify
+      end
+      
+      it "should be able to raise from method calling yielding mock" do
+        @mock.should_receive(:yield_me).and_yield 44
+        
+        lambda {
+          @mock.yield_me do |x|
+            raise "Bang"
+          end
+        }.should raise_error(StandardError, "Bang")
+      
+        @mock.rspec_verify
+      end
+      
+      it "should clear expectations after verify" do
+        @mock.should_receive(:foobar)
+        @mock.foobar
+        @mock.rspec_verify
+        lambda {
+          @mock.foobar
+        }.should raise_error(MockExpectationError, "Mock 'test mock' received unexpected message :foobar with (no args)")
+      end
+      
+      it "should restore objects to their original state on rspec_reset" do
+        mock = mock("this is a mock")
+        mock.should_receive(:blah)
+        mock.rspec_reset
+        mock.rspec_verify #should throw if reset didn't work
+      end
+
+      it "should work even after method_missing starts raising NameErrors instead of NoMethodErrors" do
+        # Object#method_missing throws either NameErrors or NoMethodErrors.
+        #
+        # On a fresh ruby program Object#method_missing: 
+        #  * raises a NoMethodError when called directly
+        #  * raises a NameError when called indirectly
+        #
+        # Once Object#method_missing has been called at least once (on any object)
+        # it starts behaving differently: 
+        #  * raises a NameError when called directly
+        #  * raises a NameError when called indirectly
+        #
+        # There was a bug in Mock#method_missing that relied on the fact
+        # that calling Object#method_missing directly raises a NoMethodError.
+        # This example tests that the bug doesn't exist anymore.
+        
+        
+        # Ensures that method_missing always raises NameErrors.
+        a_method_that_doesnt_exist rescue
+        
+        
+        @mock.should_receive(:foobar)
+        @mock.foobar
+        @mock.rspec_verify
+                
+        lambda { @mock.foobar }.should_not raise_error(NameError)
+        lambda { @mock.foobar }.should raise_error(MockExpectationError)
+      end
+    end
+
+    describe "a mock message receiving a block" do
+      before(:each) do
+        @mock = mock("mock")
+        @calls = 0
+      end
+      
+      def add_call
+        @calls = @calls + 1
+      end
+      
+      it "should call the block after #should_receive" do
+        @mock.should_receive(:foo) { add_call }
+
+        @mock.foo
+
+        @calls.should == 1
+      end
+
+      it "should call the block after #once" do
+        @mock.should_receive(:foo).once { add_call }
+
+        @mock.foo
+
+        @calls.should == 1
+      end
+
+      it "should call the block after #twice" do
+        @mock.should_receive(:foo).twice { add_call }
+
+        @mock.foo
+        @mock.foo
+
+        @calls.should == 2
+      end
+
+      it "should call the block after #times" do
+        @mock.should_receive(:foo).exactly(10).times { add_call }
+        
+        (1..10).each { @mock.foo }
+
+        @calls.should == 10
+      end
+
+      it "should call the block after #any_number_of_times" do
+        @mock.should_receive(:foo).any_number_of_times { add_call }
+        
+        (1..7).each { @mock.foo }
+
+        @calls.should == 7
+      end
+
+      it "should call the block after #with" do
+        @mock.should_receive(:foo).with(:arg) { add_call }
+        
+        @mock.foo(:arg)
+
+        @calls.should == 1
+      end
+
+      it "should call the block after #ordered" do
+        @mock.should_receive(:foo).ordered { add_call }
+        @mock.should_receive(:bar).ordered { add_call }
+        
+        @mock.foo
+        @mock.bar
+
+        @calls.should == 2
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,113 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Mocks
+    describe "a Mock expectation with multiple return values and no specified count" do
+      before(:each) do
+        @mock = Mock.new("mock")
+        @return_values = ["1",2,Object.new]
+        @mock.should_receive(:message).and_return(@return_values[0],@return_values[1],@return_values[2])
+      end
+      
+      it "should return values in order to consecutive calls" do
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        @mock.message.should == @return_values[2]
+        @mock.rspec_verify
+      end
+
+      it "should complain when there are too few calls" do
+        third = Object.new
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it twice")
+      end
+
+      it "should complain when there are too many calls" do
+        third = Object.new
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        @mock.message.should == @return_values[2]
+        @mock.message.should == @return_values[2]
+        lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it 4 times")
+      end
+    end
+
+    describe "a Mock expectation with multiple return values with a specified count equal to the number of values" do
+      before(:each) do
+        @mock = Mock.new("mock")
+        @return_values = ["1",2,Object.new]
+        @mock.should_receive(:message).exactly(3).times.and_return(@return_values[0],@return_values[1],@return_values[2])
+      end
+
+      it "should return values in order to consecutive calls" do
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        @mock.message.should == @return_values[2]
+        @mock.rspec_verify
+      end
+
+      it "should complain when there are too few calls" do
+        third = Object.new
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it twice")
+      end
+
+      it "should complain when there are too many calls" do
+        third = Object.new
+        @mock.message.should == @return_values[0]
+        @mock.message.should == @return_values[1]
+        @mock.message.should == @return_values[2]
+        @mock.message.should == @return_values[2]
+        lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it 4 times")
+      end
+    end
+
+    describe "a Mock expectation with multiple return values specifying at_least less than the number of values" do
+      before(:each) do
+        @mock = Mock.new("mock")
+        @mock.should_receive(:message).at_least(:twice).with(no_args).and_return(11, 22)
+      end
+      
+      it "should use last return value for subsequent calls" do
+        @mock.message.should equal(11)
+        @mock.message.should equal(22)
+        @mock.message.should equal(22)
+        @mock.rspec_verify
+      end
+
+      it "should fail when called less than the specified number" do
+        @mock.message.should equal(11)
+        lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'mock' expected :message with (no args) twice, but received it once")
+      end
+    end
+    describe "a Mock expectation with multiple return values with a specified count larger than the number of values" do
+      before(:each) do
+        @mock = Mock.new("mock")
+        @mock.should_receive(:message).exactly(3).times.and_return(11, 22)
+      end
+      
+      it "should use last return value for subsequent calls" do
+        @mock.message.should equal(11)
+        @mock.message.should equal(22)
+        @mock.message.should equal(22)
+        @mock.rspec_verify
+      end
+
+      it "should fail when called less than the specified number" do
+        @mock.message.should equal(11)
+        lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it once")
+      end
+
+      it "should fail when called greater than the specified number" do
+        @mock.message.should equal(11)
+        @mock.message.should equal(22)
+        @mock.message.should equal(22)
+        @mock.message.should equal(22)
+        lambda { @mock.rspec_verify }.should raise_error(MockExpectationError, "Mock 'mock' expected :message with (any args) 3 times, but received it 4 times")
+      end
+    end
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "a mock acting as a NullObject" do
+      before(:each) do
+        @mock = Mock.new("null_object", :null_object => true)
+      end
+
+      it "should allow explicit expectation" do
+        @mock.should_receive(:something)
+        @mock.something
+      end
+
+      it "should fail verification when explicit exception not met" do
+        lambda do
+          @mock.should_receive(:something)
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should ignore unexpected methods" do
+        @mock.random_call("a", "d", "c")
+        @mock.rspec_verify
+      end
+
+      it "should expected message with different args first" do
+        @mock.should_receive(:message).with(:expected_arg)
+        @mock.message(:unexpected_arg)
+        @mock.message(:expected_arg)
+      end
+
+      it "should expected message with different args second" do
+        @mock.should_receive(:message).with(:expected_arg)
+        @mock.message(:expected_arg)
+        @mock.message(:unexpected_arg)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/once_counts_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/once_counts_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/once_counts_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/once_counts_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "OnceCounts" do
+      before(:each) do
+        @mock = mock("test mock")
+      end
+
+      it "once should fail when called once with wrong args" do
+        @mock.should_receive(:random_call).once.with("a", "b", "c")
+        lambda do
+          @mock.random_call("d", "e", "f")
+        end.should raise_error(MockExpectationError)
+        @mock.rspec_reset
+      end
+
+      it "once should fail when called twice" do
+        @mock.should_receive(:random_call).once
+        @mock.random_call
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+      
+      it "once should fail when not called" do
+        @mock.should_receive(:random_call).once
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "once should pass when called once" do
+        @mock.should_receive(:random_call).once
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "once should pass when called once with specified args" do
+        @mock.should_receive(:random_call).once.with("a", "b", "c")
+        @mock.random_call("a", "b", "c")
+        @mock.rspec_verify
+      end
+
+      it "once should pass when called once with unspecified args" do
+        @mock.should_receive(:random_call).once
+        @mock.random_call("a", "b", "c")
+        @mock.rspec_verify
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "calling :should_receive with an options hash" do
+      before do
+        @options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
+        @reporter = ::Spec::Runner::Reporter.new(@options)
+        @behaviour = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples")
+      end
+
+      it "should report the file and line submitted with :expected_from" do
+        example_definition = @behaviour.it "spec" do
+          mock = Spec::Mocks::Mock.new("a mock")
+          mock.should_receive(:message, :expected_from => "/path/to/blah.ext:37")
+          mock.rspec_verify
+        end
+        example = @behaviour.new(example_definition)
+        proxy = ::Spec::Example::ExampleRunner.new(@options, example)
+        
+        @reporter.should_receive(:example_finished) do |spec, error|
+          error.backtrace.detect {|line| line =~ /\/path\/to\/blah.ext:37/}.should_not be_nil
+        end
+        proxy.run
+      end
+
+      it "should use the message supplied with :message" do
+        example_definition = @behaviour.it "spec" do
+          mock = Spec::Mocks::Mock.new("a mock")
+          mock.should_receive(:message, :message => "recebi nada")
+          mock.rspec_verify
+        end
+        example = @behaviour.new(example_definition)
+        proxy = ::Spec::Example::ExampleRunner.new(@options, example)
+        @reporter.should_receive(:example_finished) do |spec, error|
+          error.message.should == "recebi nada"
+        end
+        proxy.run
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,106 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "using a Partial Mock," do
+      before(:each) do
+        @object = Object.new
+      end
+    
+      it "should name the class in the failure message" do
+        @object.should_receive(:foo)
+        lambda do
+          @object.rspec_verify
+        end.should raise_error(Spec::Mocks::MockExpectationError, /Object/)
+      end
+    
+      it "should not conflict with @options in the object" do
+        @object.instance_eval { @options = Object.new }
+        @object.should_receive(:blah)
+        @object.blah
+      end
+            
+      it "should_not_receive should mock out the method" do
+        @object.should_not_receive(:fuhbar)
+        @object.fuhbar
+        lambda do
+          @object.rspec_verify
+        end.should raise_error(Spec::Mocks::MockExpectationError)
+      end
+    
+      it "should_not_receive should return a negative message expectation" do
+        @object.should_not_receive(:foobar).should be_kind_of(NegativeMessageExpectation)
+      end
+    
+      it "should_receive should mock out the method" do
+        @object.should_receive(:foobar).with(:test_param).and_return(1)
+        @object.foobar(:test_param).should equal(1)
+      end
+    
+      it "should_receive should handle a hash" do
+        @object.should_receive(:foobar).with(:key => "value").and_return(1)
+        @object.foobar(:key => "value").should equal(1)
+      end
+    
+      it "should_receive should handle an inner hash" do
+        hash = {:a => {:key => "value"}}
+        @object.should_receive(:foobar).with(:key => "value").and_return(1)
+        @object.foobar(hash[:a]).should equal(1)
+      end
+    
+      it "should_receive should return a message expectation" do
+        @object.should_receive(:foobar).should be_kind_of(MessageExpectation)
+        @object.foobar
+      end
+    
+      it "should_receive should verify method was called" do
+        @object.should_receive(:foobar).with(:test_param).and_return(1)
+        lambda do
+          @object.rspec_verify
+        end.should raise_error(Spec::Mocks::MockExpectationError)
+      end
+    
+      it "should_receive should also take a String argument" do
+        @object.should_receive('foobar')
+        @object.foobar
+      end
+      
+      it "should_not_receive should also take a String argument" do
+        @object.should_not_receive('foobar')
+        @object.foobar
+        lambda do
+          @object.rspec_verify
+        end.should raise_error(Spec::Mocks::MockExpectationError)
+      end
+      
+      it "should use report nil in the error message" do
+        @this_will_resolve_to_nil.should_receive(:foobar)
+        lambda do
+          @this_will_resolve_to_nil.rspec_verify
+        end.should raise_error(Spec::Mocks::MockExpectationError, /NilClass.*expected :foobar with/)
+      end
+    end
+    
+    describe "Partially mocking an object that defines ==, after another mock has been defined" do
+      before(:each) do
+        stub("existing mock", :foo => :foo)
+      end
+      
+      class PartiallyMockedEquals
+        attr_reader :val
+        def initialize(val)
+          @val = val
+        end
+        
+        def ==(other)
+          @val == other.val
+        end
+      end
+      
+      it "should not raise an error when stubbing the object" do
+        o = PartiallyMockedEquals.new :foo
+        lambda { o.stub!(:bar) }.should_not raise_error(NoMethodError)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+module Mocks
+describe "PartialMockUsingMocksDirectly" do
+    before(:each) do
+      
+        klass=Class.new
+        klass.class_eval do
+          def existing_method
+            :original_value
+          end
+        end
+        @obj = klass.new
+      
+    end
+    
+    # See http://rubyforge.org/tracker/index.php?func=detail&aid=10263&group_id=797&atid=3149
+    # specify "should clear expectations on verify" do
+    #     @obj.should_receive(:msg)
+    #     @obj.msg
+    #     @obj.rspec_verify
+    #     lambda do
+    #       @obj.msg
+    #     end.should raise_error(NoMethodError)
+    #   
+    # end
+    it "should fail when expected message is not received" do
+        @obj.should_receive(:msg)
+        lambda do
+          @obj.rspec_verify
+        end.should raise_error(MockExpectationError)
+      
+    end
+    it "should fail when message is received with incorrect args" do
+        @obj.should_receive(:msg).with(:correct_arg)
+        lambda do
+          @obj.msg(:incorrect_arg)
+        end.should raise_error(MockExpectationError)
+        @obj.msg(:correct_arg)
+      
+    end
+    it "should pass when expected message is received" do
+        @obj.should_receive(:msg)
+        @obj.msg
+        @obj.rspec_verify
+      
+    end
+    it "should pass when message is received with correct args" do
+        @obj.should_receive(:msg).with(:correct_arg)
+        @obj.msg(:correct_arg)
+        @obj.rspec_verify
+      
+    end
+    it "should revert to original method if existed" do
+        @obj.existing_method.should equal(:original_value)
+        @obj.should_receive(:existing_method).and_return(:mock_value)
+        @obj.existing_method.should equal(:mock_value)
+        @obj.rspec_verify
+        @obj.existing_method.should equal(:original_value)
+      
+    end
+  
+end
+end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,154 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "mock argument constraints", :shared => true do
+      before(:each) do
+        @mock = Mock.new("test mock")
+        Kernel.stub!(:warn)
+      end
+      
+      after(:each) do
+        @mock.rspec_verify
+      end
+    end
+    
+    describe Methods, "handling argument constraints with DEPRECATED symbols" do
+      it_should_behave_like "mock argument constraints"
+
+      it "should accept true as boolean" do
+        @mock.should_receive(:random_call).with(:boolean)
+        @mock.random_call(true)
+      end
+      
+      it "should accept false as boolean" do
+        @mock.should_receive(:random_call).with(:boolean)
+        @mock.random_call(false)
+      end
+
+      it "should accept fixnum as numeric" do
+        @mock.should_receive(:random_call).with(:numeric)
+        @mock.random_call(1)
+      end
+
+      it "should accept float as numeric" do
+        @mock.should_receive(:random_call).with(:numeric)
+        @mock.random_call(1.5)
+      end
+
+      it "should accept string as anything" do
+        @mock.should_receive(:random_call).with("a", :anything, "c")
+        @mock.random_call("a", "whatever", "c")
+      end
+
+      it "should match string" do
+        @mock.should_receive(:random_call).with(:string)
+        @mock.random_call("a string")
+      end
+      
+      it "should match no args against any_args" do
+        @mock.should_receive(:random_call).with(:any_args)
+        @mock.random_call("a string")
+      end
+      
+      it "should match no args against no_args" do
+        @mock.should_receive(:random_call).with(:no_args)
+        @mock.random_call
+      end
+    end
+
+    describe Methods, "handling argument constraints" do
+      it_should_behave_like "mock argument constraints"
+
+      it "should accept true as boolean()" do
+        @mock.should_receive(:random_call).with(boolean())
+        @mock.random_call(true)
+      end
+
+      it "should accept false as boolean()" do
+        @mock.should_receive(:random_call).with(boolean())
+        @mock.random_call(false)
+      end
+
+      it "should accept fixnum as an_instance_of(Numeric)" do
+        @mock.should_receive(:random_call).with(an_instance_of(Numeric))
+        @mock.random_call(1)
+      end
+
+      it "should accept float as an_instance_of(Numeric)" do
+        @mock.should_receive(:random_call).with(an_instance_of(Numeric))
+        @mock.random_call(1.5)
+      end
+
+      it "should accept string as anything()" do
+        @mock.should_receive(:random_call).with("a", anything(), "c")
+        @mock.random_call("a", "whatever", "c")
+      end
+
+      it "should match duck type with one method" do
+        @mock.should_receive(:random_call).with(duck_type(:length))
+        @mock.random_call([])
+      end
+
+      it "should match duck type with two methods" do
+        @mock.should_receive(:random_call).with(duck_type(:abs, :div))
+        @mock.random_call(1)
+      end
+      
+      it "should match no args against any_args()" do
+        @mock.should_receive(:random_call).with(any_args)
+        @mock.random_call()
+      end
+      
+      it "should match one arg against any_args()" do
+        @mock.should_receive(:random_call).with(any_args)
+        @mock.random_call("a string")
+      end
+      
+      it "should match no args against no_args()" do
+        @mock.should_receive(:random_call).with(no_args)
+        @mock.random_call()
+      end
+    end
+    
+    describe Methods, "handling non-constraint arguments" do
+
+      it "should match non special symbol (can be removed when deprecated symbols are removed)" do
+        @mock.should_receive(:random_call).with(:some_symbol)
+        @mock.random_call(:some_symbol)
+      end
+
+      it "should match string against regexp" do
+        @mock.should_receive(:random_call).with(/bcd/)
+        @mock.random_call("abcde")
+      end
+
+      it "should match regexp against regexp" do
+        @mock.should_receive(:random_call).with(/bcd/)
+        @mock.random_call(/bcd/)
+      end
+      
+      it "should match against a hash submitted and received by value" do
+        @mock.should_receive(:random_call).with(:a => "a", :b => "b")
+        @mock.random_call(:a => "a", :b => "b")
+      end
+      
+      it "should match against a hash submitted by reference and received by value" do
+        opts = {:a => "a", :b => "b"}
+        @mock.should_receive(:random_call).with(opts)
+        @mock.random_call(:a => "a", :b => "b")
+      end
+      
+      it "should match against a hash submitted by value and received by reference" do
+        opts = {:a => "a", :b => "b"}
+        @mock.should_receive(:random_call).with(:a => "a", :b => "b")
+        @mock.random_call(opts)
+      end
+      
+      it "should match against a Matcher" do
+        @mock.should_receive(:msg).with(equal(37))
+        @mock.msg(37)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/precise_counts_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/precise_counts_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/precise_counts_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/precise_counts_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "PreciseCounts" do
+      before(:each) do
+        @mock = mock("test mock")
+      end
+
+      it "should fail when exactly n times method is called less than n times" do
+        @mock.should_receive(:random_call).exactly(3).times
+        @mock.random_call
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should fail when exactly n times method is never called" do
+        @mock.should_receive(:random_call).exactly(3).times
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+
+      it "should pass if exactly n times method is called exactly n times" do
+        @mock.should_receive(:random_call).exactly(3).times
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+
+      it "should pass multiple calls with different args and counts" do
+        @mock.should_receive(:random_call).twice.with(1)
+        @mock.should_receive(:random_call).once.with(2)
+        @mock.random_call(1)
+        @mock.random_call(2)
+        @mock.random_call(1)
+        @mock.rspec_verify
+      end
+
+      it "should pass mutiple calls with different args" do
+        @mock.should_receive(:random_call).once.with(1)
+        @mock.should_receive(:random_call).once.with(2)
+        @mock.random_call(1)
+        @mock.random_call(2)
+        @mock.rspec_verify
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/record_messages_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/record_messages_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/record_messages_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/record_messages_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Mocks
+    describe "a mock" do
+      before(:each) do
+        @mock = mock("mock", :null_object => true)
+      end
+      it "should answer false for received_message? when no messages received" do
+        @mock.received_message?(:message).should be_false
+      end
+      it "should answer true for received_message? when message received" do
+        @mock.message
+        @mock.received_message?(:message).should be_true
+      end
+      it "should answer true for received_message? when message received with correct args" do
+        @mock.message 1,2,3
+        @mock.received_message?(:message, 1,2,3).should be_true
+      end
+      it "should answer false for received_message? when message received with incorrect args" do
+        @mock.message 1,2,3
+        @mock.received_message?(:message, 1,2).should be_false
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,189 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "A method stub" do
+      before(:each) do
+        @class = Class.new do
+          def self.existing_class_method
+            :original_value
+          end
+
+          def existing_instance_method
+            :original_value
+          end
+        end
+        @obj = @class.new
+      end
+
+      it "should allow for a mock expectation to temporarily replace a method stub on a mock" do
+        mock = Spec::Mocks::Mock.new("a mock")
+        mock.stub!(:msg).and_return(:stub_value)
+        mock.should_receive(:msg).with(:arg).and_return(:mock_value)
+        mock.msg(:arg).should equal(:mock_value)
+        mock.msg.should equal(:stub_value)
+        mock.msg.should equal(:stub_value)
+        mock.rspec_verify
+      end
+
+      it "should allow for a mock expectation to temporarily replace a method stub on a non-mock" do
+        @obj.stub!(:msg).and_return(:stub_value)
+        @obj.should_receive(:msg).with(:arg).and_return(:mock_value)
+        @obj.msg(:arg).should equal(:mock_value)
+        @obj.msg.should equal(:stub_value)
+        @obj.msg.should equal(:stub_value)
+        @obj.rspec_verify
+      end
+
+      it "should ignore when expected message is not received" do
+        @obj.stub!(:msg)
+        lambda do
+          @obj.rspec_verify
+        end.should_not raise_error
+      end
+      
+      it "should clear itself on rspec_verify" do
+        @obj.stub!(:this_should_go).and_return(:blah)
+        @obj.this_should_go.should == :blah
+        @obj.rspec_verify
+        lambda do
+          @obj.this_should_go
+        end.should raise_error
+      end
+
+      it "should ignore when expected message is received" do
+        @obj.stub!(:msg)
+        @obj.msg
+        @obj.rspec_verify
+      end
+
+      it "should ignore when message is received with args" do
+        @obj.stub!(:msg)
+        @obj.msg(:an_arg)
+        @obj.rspec_verify
+      end
+
+      it "should return expected value when expected message is received" do
+        @obj.stub!(:msg).and_return(:return_value)
+        @obj.msg.should equal(:return_value)
+        @obj.rspec_verify
+      end
+      
+      it "should return values in order to consecutive calls" do
+        return_values = ["1",2,Object.new]
+        @obj.stub!(:msg).and_return(return_values[0],return_values[1],return_values[2])
+        @obj.msg.should == return_values[0]
+        @obj.msg.should == return_values[1]
+        @obj.msg.should == return_values[2]
+      end
+
+      it "should keep returning last value in consecutive calls" do
+        return_values = ["1",2,Object.new]
+        @obj.stub!(:msg).and_return(return_values[0],return_values[1],return_values[2])
+        @obj.msg.should == return_values[0]
+        @obj.msg.should == return_values[1]
+        @obj.msg.should == return_values[2]
+        @obj.msg.should == return_values[2]
+        @obj.msg.should == return_values[2]
+      end
+
+      it "should revert to original instance method if existed" do
+        @obj.existing_instance_method.should equal(:original_value)
+        @obj.stub!(:existing_instance_method).and_return(:mock_value)
+        @obj.existing_instance_method.should equal(:mock_value)
+        @obj.rspec_verify
+        @obj.existing_instance_method.should equal(:original_value)
+      end
+      
+      it "should revert to original class method if existed" do
+        @class.existing_class_method.should equal(:original_value)
+        @class.stub!(:existing_class_method).and_return(:mock_value)
+        @class.existing_class_method.should equal(:mock_value)
+        @class.rspec_verify
+        @class.existing_class_method.should equal(:original_value)
+      end
+
+      it "should support yielding" do
+        @obj.stub!(:method_that_yields).and_yield(:yielded_value)
+        current_value = :value_before
+        @obj.method_that_yields {|val| current_value = val}
+        current_value.should == :yielded_value
+        @obj.rspec_verify
+      end
+
+      it "should support yielding multiple times" do
+        @obj.stub!(:method_that_yields_multiple_times).and_yield(:yielded_value).
+                                                       and_yield(:another_value)
+        current_value = []
+        @obj.method_that_yields_multiple_times {|val| current_value << val}
+        current_value.should == [:yielded_value, :another_value]
+        @obj.rspec_verify
+      end
+
+      it "should throw when told to" do
+        @mock.stub!(:something).and_throw(:blech)
+        lambda do
+          @mock.something
+        end.should throw_symbol(:blech)
+      end
+      
+      it "should support overriding w/ a new stub" do
+        @stub.stub!(:existing_instance_method).and_return(:updated_stub_value)
+        @stub.existing_instance_method.should == :updated_stub_value
+      end
+      
+      it "should support stub with" do
+        @stub.stub!(:foo).with("bar")
+        @stub.should_receive(:foo).with("baz")
+        @stub.foo("bar")
+        @stub.foo("baz")
+      end
+    end
+    
+    describe "A method stub with args" do
+      before(:each) do
+        @stub = Object.new
+        @stub.stub!(:foo).with("bar")
+      end
+
+      it "should not complain if not called" do
+      end
+
+      it "should not complain if called with arg" do
+        @stub.foo("bar")
+      end
+
+      it "should complain if called with no arg" do
+        lambda do
+          @stub.foo
+        end.should raise_error
+      end
+
+      it "should complain if called with other arg" do
+        lambda do
+          @stub.foo("other")
+        end.should raise_error
+      end
+
+      it "should not complain if also mocked w/ different args" do
+        @stub.should_receive(:foo).with("baz")
+        @stub.foo("bar")
+        @stub.foo("baz")
+      end
+
+      it "should complain if also mocked w/ different args AND called w/ a 3rd set of args" do
+        @stub.should_receive(:foo).with("baz")
+        @stub.foo("bar")
+        @stub.foo("baz")
+        lambda do
+          @stub.foo("other")
+        end.should raise_error
+      end
+      
+      it "should support options" do
+        @stub.stub!(:foo, :expected_from => "bar")
+      end
+    end
+
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/twice_counts_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/twice_counts_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/mocks/twice_counts_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/mocks/twice_counts_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "TwiceCounts" do
+      before(:each) do
+        @mock = mock("test mock")
+      end
+
+      it "twice should fail when call count is higher than expected" do
+        @mock.should_receive(:random_call).twice
+        @mock.random_call
+        @mock.random_call
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+      
+      it "twice should fail when call count is lower than expected" do
+        @mock.should_receive(:random_call).twice
+        @mock.random_call
+        lambda do
+          @mock.rspec_verify
+        end.should raise_error(MockExpectationError)
+      end
+      
+      it "twice should fail when called twice with wrong args on the first call" do
+        @mock.should_receive(:random_call).twice.with("1", 1)
+        lambda do
+          @mock.random_call(1, "1")
+        end.should raise_error(MockExpectationError)
+        @mock.rspec_reset
+      end
+      
+      it "twice should fail when called twice with wrong args on the second call" do
+        @mock.should_receive(:random_call).twice.with("1", 1)
+        @mock.random_call("1", 1)
+        lambda do
+          @mock.random_call(1, "1")
+        end.should raise_error(MockExpectationError)
+        @mock.rspec_reset
+      end
+      
+      it "twice should pass when called twice" do
+        @mock.should_receive(:random_call).twice
+        @mock.random_call
+        @mock.random_call
+        @mock.rspec_verify
+      end
+      
+      it "twice should pass when called twice with specified args" do
+        @mock.should_receive(:random_call).twice.with("1", 1)
+        @mock.random_call("1", 1)
+        @mock.random_call("1", 1)
+        @mock.rspec_verify
+      end
+      
+      it "twice should pass when called twice with unspecified args" do
+        @mock.should_receive(:random_call).twice
+        @mock.random_call("1")
+        @mock.random_call(1)
+        @mock.rspec_verify
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,17 @@
+require "#{File.dirname(__FILE__)}/../../spec_helper"
+require 'rbconfig'
+
+describe "The bin/spec script" do
+  it "should have no warnings" do
+    pending "Hangs on JRuby" if PLATFORM =~ /java/
+    spec_path = "#{File.dirname(__FILE__)}/../../../bin/spec"
+    output = nil
+
+    config       = ::Config::CONFIG
+    ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+    IO.popen("#{ruby} -w #{spec_path} --help 2>&1") do |io|
+      output = io.read
+    end
+    output.should_not =~ /warning/n
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe ClassAndArgumentsParser, ".parse" do
+      
+      it "should use a single : to separate class names from arguments" do
+        ClassAndArgumentsParser.parse('Foo').should == ['Foo', nil]
+        ClassAndArgumentsParser.parse('Foo:arg').should == ['Foo', 'arg']
+        ClassAndArgumentsParser.parse('Foo::Bar::Zap:arg').should == ['Foo::Bar::Zap', 'arg']
+        ClassAndArgumentsParser.parse('Foo:arg1,arg2').should == ['Foo', 'arg1,arg2']
+        ClassAndArgumentsParser.parse('Foo::Bar::Zap:arg1,arg2').should == ['Foo::Bar::Zap', 'arg1,arg2']
+        ClassAndArgumentsParser.parse('Foo::Bar::Zap:drb://foo,drb://bar').should == ['Foo::Bar::Zap', 'drb://foo,drb://bar']
+      end
+
+      it "should raise an error when passed an empty string" do
+        lambda do
+          ClassAndArgumentsParser.parse('')
+        end.should raise_error("Couldn't parse \"\"")
+      end      
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,148 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe CommandLine, ".run" do
+      before do
+        @err = StringIO.new
+        @out = StringIO.new
+      end
+
+      it "should run directory" do
+        file = File.dirname(__FILE__) + '/../../../examples/pure'
+        Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out))
+
+        @out.rewind
+        @out.read.should =~ /\d+ examples, 0 failures, 3 pending/n
+      end
+
+      it "should run file" do
+        file = File.dirname(__FILE__) + '/../../../failing_examples/predicate_example.rb'
+        Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out))
+
+        @out.rewind
+        @out.read.should =~ /2 examples, 1 failure/n
+      end
+
+      it "should raise when file does not exist" do
+        file = File.dirname(__FILE__) + '/doesntexist'
+
+        lambda {
+          Spec::Runner::CommandLine.run(OptionParser.parse([file], @err, @out))
+        }.should raise_error
+      end
+
+      it "should return true when in --generate-options mode" do
+        Spec::Runner::CommandLine.run(
+          OptionParser.parse(['--generate-options', '/dev/null'], @err, @out)
+        ).should be_true
+      end
+
+      it "should dump even if Interrupt exception is occurred" do
+        behaviour = Class.new(::Spec::Example::ExampleGroup) do
+          describe("behaviour")
+          it "no error" do
+          end
+
+          it "should interrupt" do
+            raise Interrupt
+          end
+        end
+
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.reporter.should_receive(:dump)
+        options.add_example_group(behaviour)
+
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+      end
+
+      it "should heckle when options have heckle_runner" do
+        behaviour = Class.new(::Spec::Example::ExampleGroup).describe("behaviour") do
+          it "no error" do
+          end
+        end
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.add_example_group behaviour
+
+        heckle_runner = mock("heckle_runner")
+        heckle_runner.should_receive(:heckle_with)
+        $rspec_mocks.__send__(:mocks).delete(heckle_runner)
+
+        options.heckle_runner = heckle_runner
+        options.add_example_group(behaviour)
+
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+        heckle_runner.rspec_verify
+      end
+
+      it "should run examples backwards if options.reverse is true" do
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.reverse = true
+
+        b1 = Class.new(Spec::Example::ExampleGroup)
+        b2 = Class.new(Spec::Example::ExampleGroup)
+
+        b1_suite = b1.suite
+        b1.should_receive(:suite).and_return(b1_suite)
+        b2_suite = b2.suite
+        b2.should_receive(:suite).and_return(b2_suite)
+
+        b2_suite.should_receive(:run).ordered
+        b1_suite.should_receive(:run).ordered
+
+        options.add_example_group(b1)
+        options.add_example_group(b2)
+
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+      end
+
+      it "should pass its Description to the reporter" do
+        behaviour = Class.new(::Spec::Example::ExampleGroup).describe("behaviour") do
+          it "should" do
+          end
+        end
+
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+        options.reporter.should_receive(:add_example_group).with(an_instance_of(Spec::Example::ExampleGroupDescription))
+        options.add_example_group(behaviour)
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+      end
+
+      it "runs only selected Examples when options.examples is set" do
+        options = ::Spec::Runner::Options.new(@err, @out)
+        ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
+
+        options.examples << "behaviour should"
+        should_has_run = false
+        should_not_has_run = false
+        behaviour = Class.new(::Spec::Example::ExampleGroup).describe("behaviour") do
+          it "should" do
+            should_has_run = true
+          end
+          it "should not" do
+            should_not_has_run = true
+          end
+        end
+
+        options.reporter.should_receive(:add_example_group).with(an_instance_of(Spec::Example::ExampleGroupDescription))
+
+        options.add_example_group behaviour
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+
+        should_has_run.should be_true
+        should_not_has_run.should be_false
+      end
+
+      it "sets Spec.run to true" do
+        ::Spec.run = false
+        ::Spec.should_not be_run
+        Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
+        ::Spec.should be_run
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,92 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe DrbCommandLine, "without running local server" do
+      unless Config::CONFIG['ruby_install_name'] == 'jruby'
+        it "should print error when there is no running local server" do
+          err = StringIO.new
+          out = StringIO.new
+          DrbCommandLine.run(OptionParser.parse(['--version'], err, out))
+
+          err.rewind
+          err.read.should =~ /No server is running/
+        end
+      end    
+    end
+
+    class DrbCommandLineSpec < ::Spec::Example::ExampleGroup
+      describe DrbCommandLine, "with local server"
+
+      class CommandLineForSpec
+        def self.run(argv, stderr, stdout)
+          exit Spec::Runner::CommandLine.run(OptionParser.parse(argv, stderr, stdout))
+        end
+      end
+      
+      unless Config::CONFIG['ruby_install_name'] == 'jruby'
+        before(:all) do
+          DRb.start_service("druby://localhost:8989", CommandLineForSpec)
+          @@drb_example_file_counter = 0
+        end
+
+        before(:each) do
+          create_dummy_spec_file
+          @@drb_example_file_counter = @@drb_example_file_counter + 1
+        end
+
+        after(:each) do
+          File.delete(@dummy_spec_filename)
+        end
+
+        after(:all) do
+          DRb.stop_service
+        end
+
+        it "should run against local server" do
+          out = run_spec_via_druby(['--version'])
+          out.should =~ /RSpec/n
+        end
+
+        it "should output green colorized text when running with --colour option" do
+          out = run_spec_via_druby(["--colour", @dummy_spec_filename])
+          out.should =~ /\e\[32m/n
+        end
+
+        it "should output red colorized text when running with -c option" do
+          out = run_spec_via_druby(["-c", @dummy_spec_filename])
+          out.should =~ /\e\[31m/n
+        end
+
+        def create_dummy_spec_file
+          @dummy_spec_filename = File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@@drb_example_file_counter}.rb"
+          File.open(@dummy_spec_filename, 'w') do |f|
+            f.write %{
+              describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
+                it "should be output with green bar" do
+                  true.should be_true
+                end
+
+                it "should be output with red bar" do
+                  violated("I want to see a red bar!")
+                end
+              end
+            }
+          end
+        end
+
+        def run_spec_via_druby(argv)
+          err, out = StringIO.new, StringIO.new
+          out.instance_eval do
+            def tty?; true end
+          end
+          options = ::Spec::Runner::Options.new(err, out)
+          options.argv = argv
+          Spec::Runner::DrbCommandLine.run(options)
+          out.rewind; out.read
+        end
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/examples.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/examples.txt
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/examples.txt	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/examples.txt	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+Sir, if you were my husband, I would poison your drink.
+Madam, if you were my wife, I would drink it.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "ExecutionContext" do
+  
+  it "should provide duck_type()" do
+    dt = duck_type(:length)
+    dt.should be_an_instance_of(Spec::Mocks::DuckTypeArgConstraint)
+    dt.matches?([]).should be_true
+  end
+
+  it "should violate when violated()" do
+    lambda do
+      violated
+    end.should raise_error(Spec::Expectations::ExpectationNotMetError)
+  end
+
+  it "should provide mock()" do
+    mock("thing").should be_an_instance_of(Spec::Mocks::Mock)
+  end
+
+  it "should provide stub()" do
+    thing_stub = stub("thing").should be_an_instance_of(Spec::Mocks::Mock)
+  end
+  
+  it "should add method stubs to stub()" do
+    thing_stub = stub("thing", :a => "A", :b => "B")
+    thing_stub.a.should == "A"
+    thing_stub.b.should == "B"
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/failed.txt technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/failed.txt
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/failed.txt	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/failed.txt	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+heckler_spec.rb
+command_line_spec.rb
+reporter_spec.rb
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+module Spec
+  module Runner
+    module Formatter
+      describe "FailingBehavioursFormatter" do
+        before(:each) do
+          @io = StringIO.new
+          options = mock('options')
+          @formatter = FailingBehavioursFormatter.new(options, @io)
+        end
+        
+        def description(s)
+          Spec::Example::ExampleGroupDescription.new(s)
+        end
+
+        it "should add example name for each failure" do
+          @formatter.add_example_group(description("b 1"))
+          @formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.add_example_group(description("b 2"))
+          @formatter.example_failed("e 2", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.example_failed("e 3", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @io.string.should eql(<<-EOF
+b 1
+b 2
+EOF
+)
+        end
+
+        it "should remove druby url, which is used by Spec::Distributed" do
+          @formatter.add_example_group("something something (druby://99.99.99.99:99)")
+          @formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @io.string.should eql(<<-EOF
+something something
+EOF
+)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/failing_examples_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/failing_examples_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/failing_examples_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/failing_examples_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+module Spec
+  module Runner
+    module Formatter
+      describe "FailingExamplesFormatter" do
+        before(:each) do
+          @io = StringIO.new
+          options = mock('options')
+          @formatter = FailingExamplesFormatter.new(options, @io)
+          @behaviour = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples")
+        end
+
+        it "should add example name for each failure" do
+          @formatter.add_example_group("b 1")
+          @formatter.example_failed(@behaviour.it("e 1"), nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.add_example_group("b 2")
+          @formatter.example_failed(@behaviour.it("e 2"), nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.example_failed(@behaviour.it("e 3"), nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @io.string.should eql(<<-EOF
+b 1 e 1
+b 2 e 2
+b 2 e 3
+EOF
+)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+</head>
+<body>
+<div class="rspec-report">
+  <script type="text/javascript">
+    // <![CDATA[
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+
+    // ]]>
+  </script>
+  <style type="text/css">
+#rspec-header {
+  background: #65C400; color: #fff;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.behaviour {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+
+  </style>
+
+<div id="rspec-header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_1">Mocker</dt>
+    <script type="text/javascript">moveProgressBar('5.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd>
+    <script type="text/javascript">makeRed('rspec-header');</script>
+    <script type="text/javascript">makeRed('behaviour_1');</script>
+    <script type="text/javascript">moveProgressBar('11.7');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when expected message not received</span>
+      <div class="failure" id="failure_1">
+        <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13:
+./spec/spec/runner/formatter/html_formatter_spec.rb:24:
+./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">12</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span>
+<span class="linenum">15</span>  </code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('17.6');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when messages are received out of order</span>
+      <div class="failure" id="failure_2">
+        <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22:
+./spec/spec/runner/formatter/html_formatter_spec.rb:24:
+./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
+<span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
+<span class="offending"><span class="linenum">22</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
+<span class="linenum">23</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">two</span>
+<span class="linenum">24</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('23.5');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
+      <div class="failure" id="failure_3">
+        <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
+./spec/spec/runner/formatter/html_formatter_spec.rb:24:
+./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
+    <pre class="ruby"><code><span class="linenum">26</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">27</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">28</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
+<span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span>
+<span class="linenum">30</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('29.4');</script>
+    <dd class="spec pending_fixed">
+      <span class="failed_spec_name">has a bug we need to fix</span>
+      <div class="failure" id="failure_4">
+        <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
+./spec/spec/runner/formatter/html_formatter_spec.rb:24:
+./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
+    <pre class="ruby"><code><span class="linenum">31</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">33</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
+<span class="linenum">34</span>      <span class="comment"># Actually, no. It's fixed. This will fail because it passes :-)</span>
+<span class="linenum">35</span>      <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">Bug</span><span class="punct">&quot;)</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_2">Running specs with --diff</dt>
+    <script type="text/javascript">makeRed('behaviour_2');</script>
+    <script type="text/javascript">moveProgressBar('35.2');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different strings</span>
+      <div class="failure" id="failure_5">
+        <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
+     got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
+Diff:
+@@ -1,4 +1,4 @@
+ RSpec is a
+-behavior driven development
++behaviour driven development
+ framework for Ruby
+</pre></div>
+        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13:
+./spec/spec/runner/formatter/html_formatter_spec.rb:24:
+./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
+<span class="linenum">12</span><span class="constant">EOF</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
+      <div class="failure" id="failure_6">
+        <div class="message"><pre>expected &lt;Animal
+name=bob,
+species=tortoise
+&gt;
+, got &lt;Animal
+name=bob,
+species=giraffe
+&gt;
+ (using .eql?)
+Diff:
+@@ -1,5 +1,5 @@
+ &lt;Animal
+ name=bob,
+-species=giraffe
++species=tortoise
+ &gt;
+</pre></div>
+        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34:
+./spec/spec/runner/formatter/html_formatter_spec.rb:24:
+./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
+    <pre class="ruby"><code><span class="linenum">32</span>    <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
+<span class="linenum">33</span>    <span class="ident">actual</span>   <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
+<span class="offending"><span class="linenum">34</span>    <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>
+<span class="linenum">35</span>  <span class="keyword">end</span>
+<span class="linenum">36</span><span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_3">A consumer of a stub</dt>
+    <script type="text/javascript">moveProgressBar('47.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_4">A stubbed method on a class</dt>
+    <script type="text/javascript">moveProgressBar('52.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd>
+    <script type="text/javascript">moveProgressBar('58.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should revert to the original method after each spec</span></dd>
+    <script type="text/javascript">moveProgressBar('64.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_5">A mock</dt>
+    <script type="text/javascript">moveProgressBar('70.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd>
+    <script type="text/javascript">moveProgressBar('76.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock</span></dd>
+    <script type="text/javascript">moveProgressBar('82.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_6">pending example (using pending method)</dt>
+    <script type="text/javascript">makeYellow('behaviour_6');</script>
+    <script type="text/javascript">moveProgressBar('88.2');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_7">pending example (with no block)</dt>
+    <script type="text/javascript">makeYellow('behaviour_7');</script>
+    <script type="text/javascript">moveProgressBar('94.1');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_8">pending example (with block for pending)</dt>
+    <script type="text/javascript">makeYellow('behaviour_8');</script>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "17 examples, 6 failures, 3 pending";</script>
+</div>
+</div>
+</body>
+</html>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+</head>
+<body>
+<div class="rspec-report">
+  <script type="text/javascript">
+    // <![CDATA[
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+
+    // ]]>
+  </script>
+  <style type="text/css">
+#rspec-header {
+  background: #65C400; color: #fff;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.behaviour {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+
+  </style>
+
+<div id="rspec-header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_1">Mocker</dt>
+    <script type="text/javascript">moveProgressBar('5.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd>
+    <script type="text/javascript">makeRed('rspec-header');</script>
+    <script type="text/javascript">makeRed('behaviour_1');</script>
+    <script type="text/javascript">moveProgressBar('11.7');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when expected message not received</span>
+      <div class="failure" id="failure_1">
+        <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:13:in `should_receive'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>  it "should fail when expected message not received" do
+<span class="linenum">12</span>    mock = mock("poke me")
+<span class="offending"><span class="linenum">13</span>    mock.should_receive(:poke)</span>
+<span class="linenum">14</span>  end
+<span class="linenum">15</span>  
+<span class="linenum">16</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('17.6');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when messages are received out of order</span>
+      <div class="failure" id="failure_2">
+        <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:22:in `three'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:16:in `instance_eval'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>    mock.should_receive(:three).ordered
+<span class="linenum">21</span>    mock.one
+<span class="offending"><span class="linenum">22</span>    mock.three</span>
+<span class="linenum">23</span>    mock.two
+<span class="linenum">24</span>  end
+<span class="linenum">25</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('23.5');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
+      <div class="failure" id="failure_3">
+        <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:28:in `should_not_receive'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div>
+    <pre class="ruby"><code><span class="linenum">26</span>  it "should get yelled at when sending unexpected messages" do
+<span class="linenum">27</span>    mock = mock("don't talk to me")
+<span class="offending"><span class="linenum">28</span>    mock.should_not_receive(:any_message_at_all)</span>
+<span class="linenum">29</span>    mock.any_message_at_all
+<span class="linenum">30</span>  end
+<span class="linenum">31</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('29.4');</script>
+    <dd class="spec pending_fixed">
+      <span class="failed_spec_name">has a bug we need to fix</span>
+      <div class="failure" id="failure_4">
+        <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:in `pending'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:in `instance_eval'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div>
+    <pre class="ruby"><code><span class="linenum">31</span>
+<span class="linenum">32</span>  it "has a bug we need to fix" do
+<span class="offending"><span class="linenum">33</span>    pending "here is the bug" do</span>
+<span class="linenum">34</span>      # Actually, no. It's fixed. This will fail because it passes :-)
+<span class="linenum">35</span>      mock = mock("Bug")
+<span class="linenum">36</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_2">Running specs with --diff</dt>
+    <script type="text/javascript">makeRed('behaviour_2');</script>
+    <script type="text/javascript">moveProgressBar('35.2');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different strings</span>
+      <div class="failure" id="failure_5">
+        <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
+     got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
+Diff:
+@@ -1,4 +1,4 @@
+ RSpec is a
+-behavior driven development
++behaviour driven development
+ framework for Ruby
+</pre></div>
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:13:in `=='
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>framework for Ruby
+<span class="linenum">12</span>EOF
+<span class="offending"><span class="linenum">13</span>    usa.should == uk</span>
+<span class="linenum">14</span>  end
+<span class="linenum">15</span>
+<span class="linenum">16</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
+      <div class="failure" id="failure_6">
+        <div class="message"><pre>expected &lt;Animal
+name=bob,
+species=tortoise
+&gt;
+, got &lt;Animal
+name=bob,
+species=giraffe
+&gt;
+ (using .eql?)
+Diff:
+@@ -1,5 +1,5 @@
+ &lt;Animal
+ name=bob,
+-species=giraffe
++species=tortoise
+ &gt;
+</pre></div>
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:34:in `should'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:31:in `instance_eval'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `instance_eval'</pre></div>
+    <pre class="ruby"><code><span class="linenum">32</span>    expected = Animal.new "bob", "giraffe"
+<span class="linenum">33</span>    actual   = Animal.new "bob", "tortoise"
+<span class="offending"><span class="linenum">34</span>    expected.should eql(actual)</span>
+<span class="linenum">35</span>  end
+<span class="linenum">36</span>end
+<span class="linenum">37</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_3">A consumer of a stub</dt>
+    <script type="text/javascript">moveProgressBar('47.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_4">A stubbed method on a class</dt>
+    <script type="text/javascript">moveProgressBar('52.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd>
+    <script type="text/javascript">moveProgressBar('58.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should revert to the original method after each spec</span></dd>
+    <script type="text/javascript">moveProgressBar('64.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_5">A mock</dt>
+    <script type="text/javascript">moveProgressBar('70.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd>
+    <script type="text/javascript">moveProgressBar('76.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock</span></dd>
+    <script type="text/javascript">moveProgressBar('82.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_6">pending example (using pending method)</dt>
+    <script type="text/javascript">makeYellow('behaviour_6');</script>
+    <script type="text/javascript">moveProgressBar('88.2');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_7">pending example (with no block)</dt>
+    <script type="text/javascript">makeYellow('behaviour_7');</script>
+    <script type="text/javascript">moveProgressBar('94.1');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_8">pending example (with block for pending)</dt>
+    <script type="text/javascript">makeYellow('behaviour_8');</script>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "17 examples, 6 failures, 3 pending";</script>
+</div>
+</div>
+</body>
+</html>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+</head>
+<body>
+<div class="rspec-report">
+  <script type="text/javascript">
+    // <![CDATA[
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+
+    // ]]>
+  </script>
+  <style type="text/css">
+#rspec-header {
+  background: #65C400; color: #fff;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.behaviour {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+
+  </style>
+
+<div id="rspec-header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_1">Mocker</dt>
+    <script type="text/javascript">moveProgressBar('5.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd>
+    <script type="text/javascript">makeRed('rspec-header');</script>
+    <script type="text/javascript">makeRed('behaviour_1');</script>
+    <script type="text/javascript">moveProgressBar('11.7');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when expected message not received</span>
+      <div class="failure" id="failure_1">
+        <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13:
+./spec/spec/runner/formatter/html_formatter_spec.rb:17:
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">12</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span>
+<span class="linenum">15</span>  </code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('17.6');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when messages are received out of order</span>
+      <div class="failure" id="failure_2">
+        <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22:
+./spec/spec/runner/formatter/html_formatter_spec.rb:17:
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
+<span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
+<span class="offending"><span class="linenum">22</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
+<span class="linenum">23</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">two</span>
+<span class="linenum">24</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('23.5');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
+      <div class="failure" id="failure_3">
+        <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
+./spec/spec/runner/formatter/html_formatter_spec.rb:17:
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
+    <pre class="ruby"><code><span class="linenum">26</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">27</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">28</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
+<span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span>
+<span class="linenum">30</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('29.4');</script>
+    <dd class="spec pending_fixed">
+      <span class="failed_spec_name">has a bug we need to fix</span>
+      <div class="failure" id="failure_4">
+        <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
+./spec/spec/runner/formatter/html_formatter_spec.rb:17:
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
+    <pre class="ruby"><code><span class="linenum">31</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">33</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
+<span class="linenum">34</span>      <span class="comment"># Actually, no. It's fixed. This will fail because it passes :-)</span>
+<span class="linenum">35</span>      <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">Bug</span><span class="punct">&quot;)</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_2">Running specs with --diff</dt>
+    <script type="text/javascript">makeRed('behaviour_2');</script>
+    <script type="text/javascript">moveProgressBar('35.2');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different strings</span>
+      <div class="failure" id="failure_5">
+        <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
+     got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
+Diff:
+@@ -1,4 +1,4 @@
+ RSpec is a
+-behavior driven development
++behaviour driven development
+ framework for Ruby
+</pre></div>
+        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13:
+./spec/spec/runner/formatter/html_formatter_spec.rb:17:
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
+<span class="linenum">12</span><span class="constant">EOF</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
+      <div class="failure" id="failure_6">
+        <div class="message"><pre>expected &lt;Animal
+name=bob,
+species=tortoise
+&gt;
+, got &lt;Animal
+name=bob,
+species=giraffe
+&gt;
+ (using .eql?)
+Diff:
+@@ -1,5 +1,5 @@
+ &lt;Animal
+ name=bob,
+-species=giraffe
++species=tortoise
+ &gt;
+</pre></div>
+        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34:
+./spec/spec/runner/formatter/html_formatter_spec.rb:17:
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
+    <pre class="ruby"><code><span class="linenum">32</span>    <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
+<span class="linenum">33</span>    <span class="ident">actual</span>   <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
+<span class="offending"><span class="linenum">34</span>    <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>
+<span class="linenum">35</span>  <span class="keyword">end</span>
+<span class="linenum">36</span><span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_3">A consumer of a stub</dt>
+    <script type="text/javascript">moveProgressBar('47.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_4">A stubbed method on a class</dt>
+    <script type="text/javascript">moveProgressBar('52.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd>
+    <script type="text/javascript">moveProgressBar('58.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should revert to the original method after each spec</span></dd>
+    <script type="text/javascript">moveProgressBar('64.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_5">A mock</dt>
+    <script type="text/javascript">moveProgressBar('70.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd>
+    <script type="text/javascript">moveProgressBar('76.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock</span></dd>
+    <script type="text/javascript">moveProgressBar('82.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_6">pending example (using pending method)</dt>
+    <script type="text/javascript">makeYellow('behaviour_6');</script>
+    <script type="text/javascript">moveProgressBar('88.2');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_7">pending example (with no block)</dt>
+    <script type="text/javascript">makeYellow('behaviour_7');</script>
+    <script type="text/javascript">moveProgressBar('94.1');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_8">pending example (with block for pending)</dt>
+    <script type="text/javascript">makeYellow('behaviour_8');</script>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "17 examples, 6 failures, 3 pending";</script>
+</div>
+</div>
+</body>
+</html>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+</head>
+<body>
+<div class="rspec-report">
+  <script type="text/javascript">
+    // <![CDATA[
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+
+    // ]]>
+  </script>
+  <style type="text/css">
+#rspec-header {
+  background: #65C400; color: #fff;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.behaviour {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+
+  </style>
+
+<div id="rspec-header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_1">Mocker</dt>
+    <script type="text/javascript">moveProgressBar('5.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd>
+    <script type="text/javascript">makeRed('rspec-header');</script>
+    <script type="text/javascript">makeRed('behaviour_1');</script>
+    <script type="text/javascript">moveProgressBar('11.7');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when expected message not received</span>
+      <div class="failure" id="failure_1">
+        <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">12</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span>
+<span class="linenum">15</span>  </code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('17.6');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when messages are received out of order</span>
+      <div class="failure" id="failure_2">
+        <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
+<span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
+<span class="offending"><span class="linenum">22</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
+<span class="linenum">23</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">two</span>
+<span class="linenum">24</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('23.5');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
+      <div class="failure" id="failure_3">
+        <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">26</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">27</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">28</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
+<span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span>
+<span class="linenum">30</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('29.4');</script>
+    <dd class="spec pending_fixed">
+      <span class="failed_spec_name">has a bug we need to fix</span>
+      <div class="failure" id="failure_4">
+        <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
+        
+    <pre class="ruby"><code><span class="linenum">31</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">33</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
+<span class="linenum">34</span>      <span class="comment"># Actually, no. It's fixed. This will fail because it passes :-)</span>
+<span class="linenum">35</span>      <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">Bug</span><span class="punct">&quot;)</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_2">Running specs with --diff</dt>
+    <script type="text/javascript">makeRed('behaviour_2');</script>
+    <script type="text/javascript">moveProgressBar('35.2');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different strings</span>
+      <div class="failure" id="failure_5">
+        <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
+     got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
+Diff:
+@@ -1,4 +1,4 @@
+ RSpec is a
+-behavior driven development
++behaviour driven development
+ framework for Ruby
+</pre></div>
+        
+    <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
+<span class="linenum">12</span><span class="constant">EOF</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
+      <div class="failure" id="failure_6">
+        <div class="message"><pre>expected &lt;Animal
+name=bob,
+species=tortoise
+&gt;
+, got &lt;Animal
+name=bob,
+species=giraffe
+&gt;
+ (using .eql?)
+Diff:
+@@ -1,5 +1,5 @@
+ &lt;Animal
+ name=bob,
+-species=giraffe
++species=tortoise
+ &gt;
+</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">32</span>    <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
+<span class="linenum">33</span>    <span class="ident">actual</span>   <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
+<span class="offending"><span class="linenum">34</span>    <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>
+<span class="linenum">35</span>  <span class="keyword">end</span>
+<span class="linenum">36</span><span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_3">A consumer of a stub</dt>
+    <script type="text/javascript">moveProgressBar('47.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_4">A stubbed method on a class</dt>
+    <script type="text/javascript">moveProgressBar('52.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd>
+    <script type="text/javascript">moveProgressBar('58.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should revert to the original method after each spec</span></dd>
+    <script type="text/javascript">moveProgressBar('64.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_5">A mock</dt>
+    <script type="text/javascript">moveProgressBar('70.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd>
+    <script type="text/javascript">moveProgressBar('76.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock</span></dd>
+    <script type="text/javascript">moveProgressBar('82.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_6">pending example (using pending method)</dt>
+    <script type="text/javascript">makeYellow('behaviour_6');</script>
+    <script type="text/javascript">moveProgressBar('88.2');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_7">pending example (with no block)</dt>
+    <script type="text/javascript">makeYellow('behaviour_7');</script>
+    <script type="text/javascript">moveProgressBar('94.1');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_8">pending example (with block for pending)</dt>
+    <script type="text/javascript">makeYellow('behaviour_8');</script>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "17 examples, 6 failures, 3 pending";</script>
+</div>
+</div>
+</body>
+</html>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'hpricot' # Needed to compare generated with wanted HTML
+
+describe "HtmlFormatter" do
+  ['--diff', '--dry-run'].each do |opt|
+    def jruby?
+      PLATFORM == 'java'
+    end
+    
+    it "should produce HTML identical to the one we designed manually with #{opt}" do
+      root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
+      suffix = jruby? ? '-jruby' : ''
+      expected_file = File.dirname(__FILE__) + "/html_formatted-#{VERSION}#{suffix}.html"
+      raise "There is no HTML file with expected content for this platform: #{expected_file}" unless File.file?(expected_file)
+      expected_html = File.read(expected_file)
+      unless jruby?
+        raise "There should be no absolute paths in html_formatted.html!!" if (expected_html =~ /\/Users/n || expected_html =~ /\/home/n)
+      end
+
+      Dir.chdir(root) do
+        args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/pure/stubbing_example.rb',  'examples/pure/pending_example.rb', '--format', 'html', opt]
+        err = StringIO.new
+        out = StringIO.new
+        Spec::Runner::CommandLine.run(
+          ::Spec::Runner::OptionParser.parse(args, err, out)
+        )
+
+        seconds = /\d+\.\d+ seconds/
+        html = out.string.gsub seconds, 'x seconds'
+        expected_html.gsub! seconds, 'x seconds'
+
+        if opt == '--diff'
+          # Uncomment this line temporarily in order to overwrite the expected with actual.
+          # Use with care!!!
+          # File.open(expected_file, 'w') {|io| io.write(html)}
+
+          doc = Hpricot(html)
+          backtraces = doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
+          doc.search("div.backtrace").remove
+
+          expected_doc = Hpricot(expected_html)
+          expected_backtraces = expected_doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}
+          expected_doc.search("div.backtrace").remove
+
+          doc.inner_html.should == expected_doc.inner_html
+
+          expected_backtraces.each_with_index do |expected_line, i|
+            expected_path, expected_line_number, expected_suffix = expected_line.split(':')
+            actual_path, actual_line_number, actual_suffix = backtraces[i].split(':')
+            File.expand_path(actual_path).should == File.expand_path(expected_path)
+            actual_line_number.should == expected_line_number
+          end
+        else
+          html.should =~ /This was a dry-run/m
+        end
+      end
+    end
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+module Spec
+  module Runner
+    module Formatter
+      describe ProfileFormatter do
+        
+        before(:each) do
+          @io = StringIO.new
+          options = mock('options')
+          options.stub!(:colour).and_return(true)
+          @formatter = ProfileFormatter.new(options, @io)
+        end
+        
+        it "should print a heading" do
+          @formatter.start(0)
+          @io.string.should eql("Profiling enabled.\n")
+        end
+        
+        it "should set the current behaviour" do
+          @formatter.add_example_group('Test')
+          @formatter.instance_variable_get("@behaviour").should == 'Test'
+        end
+        
+        it "should record the current time when starting a new example" do
+          now = Time.now
+          Time.stub!(:now).and_return(now)
+          @formatter.example_started('should foo')
+          @formatter.instance_variable_get("@time").should == now
+        end
+        
+        it "should correctly record a passed example" do
+          now = Time.now
+          Time.stub!(:now).and_return(now)
+          @formatter.add_example_group('Test')
+          @formatter.example_started('when foo')
+          Time.stub!(:now).and_return(now+1)
+          @formatter.example_passed('when foo')
+          @formatter.instance_variable_get("@examples").should == [['Test', 'when foo', 1.0]]
+        end
+        
+        it "should sort the results in descending order" do
+          @formatter.instance_variable_set("@examples", [['a', 'a', 0.1], ['b', 'b', 0.3], ['c', 'c', 0.2]])
+          @formatter.start_dump
+          @formatter.instance_variable_get("@examples").should == [ ['b', 'b', 0.3], ['c', 'c', 0.2], ['a', 'a', 0.1]]
+        end
+        
+        it "should print the top 10 results" do
+          @formatter.instance_variable_set("@time", Time.now)
+          
+          15.times do 
+            @formatter.example_passed('foo')
+          end
+          
+          @io.should_receive(:print).exactly(10)
+          @formatter.start_dump
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+module Spec
+  module Runner
+    module Formatter
+      describe ProgressBarFormatter, "dry run" do
+        before(:each) do
+          @io = StringIO.new
+          options = mock('options')
+          options.stub!(:dry_run).and_return(true)
+          @formatter = ProgressBarFormatter.new(options, @io)
+        end
+      
+        it "should not produce summary on dry run" do
+          @formatter.dump_summary(3, 2, 1, 0)
+          @io.string.should eql("")
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,112 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+module Spec
+  module Runner
+    module Formatter
+      describe ProgressBarFormatter do
+        before(:each) do
+          @io = StringIO.new
+          @options = mock('options')
+          @options.stub!(:dry_run).and_return(false)
+          @options.stub!(:colour).and_return(false)
+          @formatter = ProgressBarFormatter.new(@options, @io)
+        end
+
+        it "should produce line break on start dump" do
+          @formatter.start_dump
+          @io.string.should eql("\n")
+        end
+
+        it "should produce standard summary without pending when pending has a 0 count" do
+          @formatter.dump_summary(3, 2, 1, 0)
+          @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
+        end
+        
+        it "should produce standard summary" do
+          @formatter.example_pending("behaviour", "example", "message")  
+          @io.rewind
+          @formatter.dump_summary(3, 2, 1, 1)
+          @io.string.should eql(%Q|
+Finished in 3 seconds
+
+2 examples, 1 failure, 1 pending
+|)
+        end
+
+        it "should push green dot for passing spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @options.should_receive(:colour).and_return(true)
+          @formatter.example_passed("spec")
+          @io.string.should == "\e[32m.\e[0m"
+        end
+
+        it "should push red F for failure spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @options.should_receive(:colour).and_return(true)
+          @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new))
+          @io.string.should eql("\e[31mF\e[0m")
+        end
+
+        it "should push magenta F for error spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @options.should_receive(:colour).and_return(true)
+          @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", RuntimeError.new))
+          @io.string.should eql("\e[35mF\e[0m")
+        end
+
+        it "should push blue F for fixed pending spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @options.should_receive(:colour).and_return(true)
+          @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", Spec::Example::PendingExampleFixedError.new))
+          @io.string.should eql("\e[34mF\e[0m")
+        end
+
+        it "should push nothing on start" do
+          @formatter.start(4)
+          @io.string.should eql("")
+        end
+
+        it "should ensure two ':' in the first backtrace" do
+          backtrace = ["/tmp/x.rb:1", "/tmp/x.rb:2", "/tmp/x.rb:3"]
+          @formatter.format_backtrace(backtrace).should eql(<<-EOE.rstrip)
+/tmp/x.rb:1:
+/tmp/x.rb:2:
+/tmp/x.rb:3:
+EOE
+
+          backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"]
+          @formatter.format_backtrace(backtrace).should eql(<<-EOE.rstrip)
+/tmp/x.rb:1: message
+/tmp/x.rb:2:
+/tmp/x.rb:3:
+EOE
+        end
+        
+        it "should dump pending" do
+          @formatter.example_pending("behaviour", "example", "message")
+          @formatter.dump_pending
+          @io.string.should =~ /Pending\:\nbehaviour example \(message\)\n/
+        end
+      end
+      
+      describe "ProgressBarFormatter outputting to custom out" do
+        before(:each) do
+          @out = mock("out")
+          @options = mock('options')
+          @out.stub!(:puts)
+          @formatter = ProgressBarFormatter.new(@options, @out)
+          @formatter.class.send :public, :output_to_tty?
+        end
+
+        after(:each) do
+          @formatter.class.send :protected, :output_to_tty?
+        end
+
+        it "should not throw NoMethodError on output_to_tty?" do
+          @out.should_receive(:tty?).and_raise(NoMethodError)
+          @formatter.output_to_tty?.should be_false
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/snippet_extractor_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/snippet_extractor_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/snippet_extractor_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/snippet_extractor_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+describe Spec::Runner::Formatter::SnippetExtractor do
+  it "should fall back on a default message when it doesn't understand a line" do
+    Spec::Runner::Formatter::SnippetExtractor.new.snippet_for("blech").should == ["# Couldn't get snippet for blech", 1]
+  end
+
+  it "should fall back on a default message when it doesn't find the file" do
+    Spec::Runner::Formatter::SnippetExtractor.new.lines_around("blech", 8).should == "# Couldn't get snippet for blech"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,108 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'hpricot' # Needed to compare generated with wanted HTML
+
+module Spec
+  module Runner
+    module Formatter
+      describe TextMateFormatter, "functional spec", :shared => true do
+        attr_reader :root, :suffix, :expected_file
+        before do
+          @root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
+          @suffix = jruby? ? '-jruby' : ''
+          @expected_file = File.dirname(__FILE__) + "/text_mate_formatted-#{::VERSION}#{suffix}.html"
+        end
+
+        def jruby?
+          PLATFORM == 'java'
+        end
+
+        def produces_html_identical_to_manually_designed_document(opt)
+          root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
+
+          Dir.chdir(root) do
+            args = [
+              'failing_examples/mocking_example.rb',
+                'failing_examples/diffing_spec.rb',
+                'examples/pure/stubbing_example.rb',
+                'examples/pure/pending_example.rb',
+                '--format',
+                'textmate',
+                opt
+            ]
+            err = StringIO.new
+            out = StringIO.new
+            options = ::Spec::Runner::OptionParser.parse(args, err, out)
+            Spec::Runner::CommandLine.run(options)
+
+            yield(out.string)
+          end          
+        end
+      end
+
+     # # Uncomment this spec temporarily in order to overwrite the expected with actual.
+     # # Use with care!!!
+     # describe TextMateFormatter, "functional spec file generator" do
+     #   it_should_behave_like "Spec::Runner::Formatter::TextMateFormatter functional spec"
+     # 
+     #   it "generates a new comparison file" do
+     #     Dir.chdir(root) do
+     #       args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/pure/stubbing_example.rb',  'examples/pure/pending_example.rb', '--format', 'textmate', '--diff']
+     #       err = StringIO.new
+     #       out = StringIO.new
+     #       Spec::Runner::CommandLine.run(
+     #         ::Spec::Runner::OptionParser.parse(args, err, out)
+     #       )
+     # 
+     #       seconds = /\d+\.\d+ seconds/
+     #       html = out.string.gsub seconds, 'x seconds'
+     # 
+     #       File.open(expected_file, 'w') {|io| io.write(html)}
+     #     end
+     #   end
+     # end
+
+      describe TextMateFormatter, "functional spec using --diff" do
+        it_should_behave_like "Spec::Runner::Formatter::TextMateFormatter functional spec"
+
+        it "should produce HTML identical to the one we designed manually with --diff" do
+          produces_html_identical_to_manually_designed_document("--diff") do |html|
+            suffix = jruby? ? '-jruby' : ''
+            expected_file = File.dirname(__FILE__) + "/text_mate_formatted-#{::VERSION}#{suffix}.html"
+            unless File.file?(expected_file)
+              raise "There is no HTML file with expected content for this platform: #{expected_file}"
+            end
+            expected_html = File.read(expected_file)
+
+            seconds = /\d+\.\d+ seconds/
+            html.gsub! seconds, 'x seconds'
+            expected_html.gsub! seconds, 'x seconds'
+
+            doc = Hpricot(html)
+            backtraces = doc.search("div.backtrace/a")
+            doc.search("div.backtrace").remove
+            
+            expected_doc = Hpricot(expected_html)
+            expected_doc.search("div.backtrace").remove
+
+            doc.inner_html.should == expected_doc.inner_html
+
+            backtraces.each do |backtrace_link|
+              backtrace_link[:href].should include("txmt://open?url=")
+            end
+          end
+        end
+
+      end
+
+      describe TextMateFormatter, "functional spec using --dry-run" do
+        it_should_behave_like "Spec::Runner::Formatter::TextMateFormatter functional spec"
+
+        it "should produce HTML identical to the one we designed manually with --dry-run" do
+          produces_html_identical_to_manually_designed_document("--dry-run") do |html, expected_html|
+            html.should =~ /This was a dry-run/m
+          end
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+module Spec
+  module Runner
+    module Formatter
+      describe "SpecdocFormatter" do
+        before(:each) do
+          @io = StringIO.new
+          @options = mock('options')
+          @options.stub!(:dry_run).and_return(false)
+          @options.stub!(:colour).and_return(false)
+          @formatter = SpecdocFormatter.new(@options, @io)
+          @behaviour = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples")
+        end
+
+        it "should produce standard summary without pending when pending has a 0 count" do
+          @formatter.dump_summary(3, 2, 1, 0)
+          @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
+        end
+
+        it "should produce standard summary" do
+          @formatter.dump_summary(3, 2, 1, 4)
+          @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 pending\n")
+        end
+
+        it "should push context name" do
+          @formatter.add_example_group(Spec::Example::ExampleGroupDescription.new("context"))
+          @io.string.should eql("\ncontext\n")
+        end
+
+        it "when having an error, should push failing spec name and failure number" do
+          @formatter.example_failed(
+            @behaviour.it("spec"),
+            98,
+            Reporter::Failure.new("c s", RuntimeError.new)
+          )
+          @io.string.should eql("- spec (ERROR - 98)\n")
+        end
+
+        it "when having an expectation failure, should push failing spec name and failure number" do
+          @formatter.example_failed(
+            @behaviour.it("spec"),
+            98,
+            Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new)
+          )
+          @io.string.should eql("- spec (FAILED - 98)\n")
+        end
+
+        it "should push nothing on start" do
+          @formatter.start(5)
+          @io.string.should eql("")
+        end
+
+        it "should push nothing on start dump" do
+          @formatter.start_dump
+          @io.string.should eql("")
+        end
+
+        it "should push passing spec name" do
+          @formatter.example_passed(@behaviour.it("spec"))
+          @io.string.should eql("- spec\n")
+        end
+
+        it "should push pending example name and message" do
+          @formatter.example_pending('behaviour', 'example','reason')
+          @io.string.should eql("- example (PENDING: reason)\n")
+        end
+
+        it "should dump pending" do
+          @formatter.example_pending('behaviour', 'example','reason')
+          @io.rewind
+          @formatter.dump_pending
+          @io.string.should =~ /Pending\:\nbehaviour example \(reason\)\n/
+        end
+
+        it "should not produce summary on dry run" do
+          @options.should_receive(:dry_run).and_return(true)
+          @formatter.dump_summary(3, 2, 1, 0)
+          @io.string.should eql("")
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../../../../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../../story/rspec_adapter.rb'
+
+module Spec
+  module Runner
+    module Formatter
+      module Story
+        describe HtmlFormatter do
+          before :each do
+            @out = StringIO.new
+            @options = mock('options')
+            @reporter = HtmlFormatter.new(@options, @out)
+          end
+          
+          it "should just be poked at" do
+            @reporter.run_started(1)
+            @reporter.story_started('story_title', 'narrative')
+
+            @reporter.scenario_started('story_title', 'succeeded_scenario_name')
+            @reporter.step_succeeded('given', 'succeded_step', 'one', 'two')
+            @reporter.scenario_succeeded('story_title', 'succeeded_scenario_name')
+
+            @reporter.scenario_started('story_title', 'pending_scenario_name')
+            @reporter.step_pending('when', 'pending_step', 'un', 'deux')
+            @reporter.scenario_pending('story_title', 'pending_scenario_name', 'not done')
+
+            @reporter.scenario_started('story_title', 'failed_scenario_name')
+            @reporter.step_failed('then', 'failed_step', 'en', 'to')
+            @reporter.scenario_failed('story_title', 'failed_scenario_name', NameError.new('sup'))
+            
+            @reporter.scenario_started('story_title', 'scenario_with_given_scenario_name')
+            @reporter.found_scenario('given scenario', 'succeeded_scenario_name')
+            
+            @reporter.story_ended('story_title', 'narrative')
+            @reporter.run_ended
+          end
+          
+          it "should create spans for params" do
+            @reporter.step_succeeded('given', 'a $coloured $animal', 'brown', 'dog')
+            @out.string.should == "                <li class=\"passed\">Given a <span class=\"param\">brown</span> <span class=\"param\">dog</span></li>\n"
+          end
+          
+          it "should create a ul for collected_steps" do
+            @reporter.collected_steps(['Given a $coloured $animal', 'Given a $n legged eel'])
+            @out.string.should == (<<-EOF)
+      <ul id="stock_steps" style="display: none;">
+        <li>Given a $coloured $animal</li>
+        <li>Given a $n legged eel</li>
+      </ul>
+EOF
+          end
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,283 @@
+require File.dirname(__FILE__) + '/../../../../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../../story/rspec_adapter.rb'
+
+module Spec
+  module Runner
+    module Formatter
+      module Story
+        describe PlainTextFormatter do
+          before :each do
+            # given
+            @out = StringIO.new
+            @options = mock('options')
+            @options.stub!(:colour).and_return(false)
+            @reporter = PlainTextFormatter.new(@options, @out)
+          end
+        
+          it 'should summarize the number of scenarios when the run ends' do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario2')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario3')
+            @reporter.run_ended
+          
+            # then
+            @out.string.should include('3 scenarios')
+          end
+        
+          it 'should summarize the number of successful scenarios when the run ends' do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario2')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario3')
+            @reporter.run_ended
+          
+            # then
+            @out.string.should include('3 scenarios: 3 succeeded')
+          end
+        
+          it 'should summarize the number of failed scenarios when the run ends' do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_failed('story', 'scenario2', exception_from { raise RuntimeError, 'oops' })
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops' })
+            @reporter.run_ended
+          
+            # then
+            @out.string.should contain("3 scenarios: 1 succeeded, 2 failed")
+          end
+        
+          it 'should summarize the number of pending scenarios when the run ends' do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_pending('story', 'scenario2', 'message')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_pending('story', 'scenario3', 'message')
+            @reporter.run_ended
+          
+            # then
+            @out.string.should contain("3 scenarios: 1 succeeded, 0 failed, 2 pending")
+          end
+        
+          it "should only count the first failure in one scenario" do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_failed('story', 'scenario2', exception_from { raise RuntimeError, 'oops' })
+            @reporter.scenario_failed('story', 'scenario2', exception_from { raise RuntimeError, 'oops again' })
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops' })
+            @reporter.run_ended
+          
+            # then
+            @out.string.should contain("3 scenarios: 1 succeeded, 2 failed")
+          end
+        
+          it "should only count the first pending in one scenario" do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_pending('story', 'scenario2', 'because ...')
+            @reporter.scenario_pending('story', 'scenario2', 'because ...')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_pending('story', 'scenario3', 'because ...')
+            @reporter.run_ended
+          
+            # then
+            @out.string.should contain("3 scenarios: 1 succeeded, 0 failed, 2 pending")
+          end
+        
+          it "should only count a failure before the first pending in one scenario" do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_pending('story', 'scenario2', exception_from { raise RuntimeError, 'oops' })
+            @reporter.scenario_failed('story', 'scenario2', exception_from { raise RuntimeError, 'oops again' })
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops' })
+            @reporter.run_ended
+          
+            # then
+            @out.string.should contain("3 scenarios: 1 succeeded, 1 failed, 1 pending")
+          end
+        
+          it 'should produce details of the first failure each failed scenario when the run ends' do
+            # when
+            @reporter.run_started(3)
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_succeeded('story', 'scenario1')
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_failed('story', 'scenario2', exception_from { raise RuntimeError, 'oops2' })
+            @reporter.scenario_failed('story', 'scenario2', exception_from { raise RuntimeError, 'oops2 - this one should not appear' })
+            @reporter.scenario_started(nil, nil)
+            @reporter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops3' })
+            @reporter.run_ended
+          
+            # then
+            @out.string.should contain("FAILURES:\n")
+            @out.string.should contain("1) story (scenario2) FAILED")
+            @out.string.should contain("RuntimeError: oops2")
+            @out.string.should_not contain("RuntimeError: oops2 - this one should not appear")
+            @out.string.should contain("2) story (scenario3) FAILED")
+            @out.string.should contain("RuntimeError: oops3")
+          end
+        
+          it 'should produce details of each pending step when the run ends' do
+            # when
+            @reporter.run_started(2)
+            @reporter.scenario_pending('story', 'scenario2', 'todo2')
+            @reporter.scenario_pending('story', 'scenario3', 'todo3')
+            @reporter.run_ended
+          
+            # then
+            @out.string.should contain("Pending Steps:\n")
+            @out.string.should contain("1) story (scenario2): todo2")
+            @out.string.should contain("2) story (scenario3): todo3")
+          end
+        
+          it 'should document a story title and narrative' do
+            # when
+            @reporter.story_started 'story', 'narrative'
+          
+            # then
+            @out.string.should contain("Story: story\n\n  narrative")
+          end
+        
+          it 'should document a scenario name' do
+            # when
+            @reporter.scenario_started 'story', 'scenario'
+          
+            # then
+            @out.string.should contain("\n\nScenario: scenario")
+          end
+        
+          it 'should document a step by sentence-casing its name' do
+            # when
+            @reporter.step_succeeded :given, 'a context'
+            @reporter.step_succeeded :when, 'an event'
+            @reporter.step_succeeded :then, 'an outcome'
+          
+            # then
+            @out.string.should contain("\n\n  Given a context\n\n  When an event\n\n  Then an outcome")
+          end
+        
+          it 'should document additional givens using And' do
+            # when
+            @reporter.step_succeeded :given, 'step 1'
+            @reporter.step_succeeded :given, 'step 2'
+            @reporter.step_succeeded :given, 'step 3'
+          
+            # then
+            @out.string.should contain("  Given step 1\n  And step 2\n  And step 3")
+          end
+        
+          it 'should document additional events using And' do
+            # when
+            @reporter.step_succeeded :when, 'step 1'
+            @reporter.step_succeeded :when, 'step 2'
+            @reporter.step_succeeded :when, 'step 3'
+          
+            # then
+            @out.string.should contain("  When step 1\n  And step 2\n  And step 3")
+          end
+        
+          it 'should document additional outcomes using And' do
+            # when
+            @reporter.step_succeeded :then, 'step 1'
+            @reporter.step_succeeded :then, 'step 2'
+            @reporter.step_succeeded :then, 'step 3'
+          
+            # then
+            @out.string.should contain("  Then step 1\n  And step 2\n  And step 3")
+          end
+        
+          it 'should document a GivenScenario followed by a Given using And' do
+            # when
+            @reporter.step_succeeded :'given scenario', 'a scenario'
+            @reporter.step_succeeded :given, 'a context'
+          
+            # then
+            @out.string.should contain("  Given scenario a scenario\n  And a context")
+          end
+        
+          it 'should document steps with replaced params' do
+            @reporter.step_succeeded :given, 'a $coloured dog with $n legs', 'pink', 21
+            @out.string.should contain("  Given a pink dog with 21 legs")
+          end
+        
+          it "should append PENDING for the first pending step" do
+            @reporter.scenario_started('','')
+            @reporter.step_pending(:given, 'a context')
+          
+            @out.string.should contain('Given a context (PENDING)')
+          end
+        
+          it "should append PENDING for pending after already pending" do
+            @reporter.scenario_started('','')
+            @reporter.step_pending(:given, 'a context')
+            @reporter.step_pending(:when, 'I say hey')
+          
+            @out.string.should contain('When I say hey (PENDING)')
+          end
+        
+          it "should append FAILED for the first failiure" do
+            @reporter.scenario_started('','')
+            @reporter.step_failed(:given, 'a context')
+          
+            @out.string.should contain('Given a context (FAILED)')
+          end
+        
+          it "should append SKIPPED for the second failiure" do
+            @reporter.scenario_started('','')
+            @reporter.step_failed(:given, 'a context')
+            @reporter.step_failed(:when, 'I say hey')
+          
+            @out.string.should contain('When I say hey (SKIPPED)')
+          end
+        
+          it "should append SKIPPED for the a failiure after PENDING" do
+            @reporter.scenario_started('','')
+            @reporter.step_pending(:given, 'a context')
+            @reporter.step_failed(:when, 'I say hey')
+          
+            @out.string.should contain('When I say hey (SKIPPED)')
+          end
+        
+          it 'should print some white space after each story' do
+            # when
+            @reporter.story_ended 'title', 'narrative'
+          
+            # then
+            @out.string.should contain("\n\n")
+          end
+          
+          it "should print nothing for collected_steps" do
+            @reporter.collected_steps(['Given a $coloured $animal', 'Given a $n legged eel'])
+            @out.string.should == ("")
+          end
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+</head>
+<body>
+<div class="rspec-report">
+  <script type="text/javascript">
+    // <![CDATA[
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+
+    // ]]>
+  </script>
+  <style type="text/css">
+#rspec-header {
+  background: #65C400; color: #fff;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.behaviour {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+
+  </style>
+
+<div id="rspec-header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_1">Mocker</dt>
+    <script type="text/javascript">moveProgressBar('5.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd>
+    <script type="text/javascript">makeRed('rspec-header');</script>
+    <script type="text/javascript">makeRed('behaviour_1');</script>
+    <script type="text/javascript">moveProgressBar('11.7');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when expected message not received</span>
+      <div class="failure" id="failure_1">
+        <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=13">./failing_examples/mocking_example.rb:13</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">12</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span>
+<span class="linenum">15</span>  </code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('17.6');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when messages are received out of order</span>
+      <div class="failure" id="failure_2">
+        <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=22">./failing_examples/mocking_example.rb:22</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
+<span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
+<span class="offending"><span class="linenum">22</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
+<span class="linenum">23</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">two</span>
+<span class="linenum">24</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('23.5');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
+      <div class="failure" id="failure_3">
+        <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=28">./failing_examples/mocking_example.rb:28</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div>
+    <pre class="ruby"><code><span class="linenum">26</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">27</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">28</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
+<span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span>
+<span class="linenum">30</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('29.4');</script>
+    <dd class="spec pending_fixed">
+      <span class="failed_spec_name">has a bug we need to fix</span>
+      <div class="failure" id="failure_4">
+        <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/mocking_example.rb&line=33">./failing_examples/mocking_example.rb:33</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div>
+    <pre class="ruby"><code><span class="linenum">31</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">33</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
+<span class="linenum">34</span>      <span class="comment"># Actually, no. It's fixed. This will fail because it passes :-)</span>
+<span class="linenum">35</span>      <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">Bug</span><span class="punct">&quot;)</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_2">Running specs with --diff</dt>
+    <script type="text/javascript">makeRed('behaviour_2');</script>
+    <script type="text/javascript">moveProgressBar('35.2');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different strings</span>
+      <div class="failure" id="failure_5">
+        <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
+     got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
+Diff:
+@@ -1,4 +1,4 @@
+ RSpec is a
+-behavior driven development
++behaviour driven development
+ framework for Ruby
+</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/diffing_spec.rb&line=13">./failing_examples/diffing_spec.rb:13</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
+<span class="linenum">12</span><span class="constant">EOF</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
+      <div class="failure" id="failure_6">
+        <div class="message"><pre>expected &lt;Animal
+name=bob,
+species=tortoise
+&gt;
+, got &lt;Animal
+name=bob,
+species=giraffe
+&gt;
+ (using .eql?)
+Diff:
+@@ -1,5 +1,5 @@
+ &lt;Animal
+ name=bob,
+-species=giraffe
++species=tortoise
+ &gt;
+</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/failing_examples/diffing_spec.rb&line=34">./failing_examples/diffing_spec.rb:34</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=52">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:52</a> 
+<a href="txmt://open?url=file:///Users/aslakhellesoy/scm/rspec/trunk/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=48">./spec/spec/runner/formatter/spec_mate_formatter_spec.rb:48</a> </pre></div>
+    <pre class="ruby"><code><span class="linenum">32</span>    <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
+<span class="linenum">33</span>    <span class="ident">actual</span>   <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
+<span class="offending"><span class="linenum">34</span>    <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>
+<span class="linenum">35</span>  <span class="keyword">end</span>
+<span class="linenum">36</span><span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_3">A consumer of a stub</dt>
+    <script type="text/javascript">moveProgressBar('47.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_4">A stubbed method on a class</dt>
+    <script type="text/javascript">moveProgressBar('52.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd>
+    <script type="text/javascript">moveProgressBar('58.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should revert to the original method after each spec</span></dd>
+    <script type="text/javascript">moveProgressBar('64.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_5">A mock</dt>
+    <script type="text/javascript">moveProgressBar('70.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd>
+    <script type="text/javascript">moveProgressBar('76.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock</span></dd>
+    <script type="text/javascript">moveProgressBar('82.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_6">pending example (using pending method)</dt>
+    <script type="text/javascript">makeYellow('behaviour_6');</script>
+    <script type="text/javascript">moveProgressBar('88.2');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_7">pending example (with no block)</dt>
+    <script type="text/javascript">makeYellow('behaviour_7');</script>
+    <script type="text/javascript">moveProgressBar('94.1');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_8">pending example (with block for pending)</dt>
+    <script type="text/javascript">makeYellow('behaviour_8');</script>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "17 examples, 6 failures, 3 pending";</script>
+</div>
+</div>
+</body>
+</html>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>RSpec results</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Expires" content="-1" />
+  <meta http-equiv="Pragma" content="no-cache" />
+  <style type="text/css">
+  body {
+    margin: 0;
+    padding: 0;
+    background: #fff;
+    font-size: 80%;
+  }
+  </style>
+</head>
+<body>
+<div class="rspec-report">
+  <script type="text/javascript">
+    // <![CDATA[
+function moveProgressBar(percentDone) {
+  document.getElementById("rspec-header").style.width = percentDone +"%";
+}
+function makeRed(element_id) {
+  document.getElementById(element_id).style.background = '#C40D0D';
+  document.getElementById(element_id).style.color = '#FFFFFF';
+}
+
+function makeYellow(element_id) {
+  if (element_id == "rspec-header" && document.getElementById(element_id).style.background != '#C40D0D')
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+  else
+  {
+    document.getElementById(element_id).style.background = '#FAF834';
+    document.getElementById(element_id).style.color = '#000000';
+  }
+}
+
+    // ]]>
+  </script>
+  <style type="text/css">
+#rspec-header {
+  background: #65C400; color: #fff;
+}
+
+.rspec-report h1 {
+  margin: 0px 10px 0px 10px;
+  padding: 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  font-size: 1.8em;
+}
+
+#summary {
+  margin: 0; padding: 5px 10px;
+  font-family: "Lucida Grande", Helvetica, sans-serif;
+  text-align: right;
+  position: absolute;
+  top: 0px;
+  right: 0px;
+}
+
+#summary p {
+  margin: 0 0 0 2px;
+}
+
+#summary #totals {
+  font-size: 1.2em;
+}
+
+.behaviour {
+  margin: 0 10px 5px;
+  background: #fff;
+}
+
+dl {
+  margin: 0; padding: 0 0 5px;
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  padding: 3px;
+  background: #65C400;
+  color: #fff;
+  font-weight: bold;
+}
+
+dd {
+  margin: 5px 0 5px 5px;
+  padding: 3px 3px 3px 18px;
+}
+
+dd.spec.passed {
+  border-left: 5px solid #65C400;
+  border-bottom: 1px solid #65C400;
+  background: #DBFFB4; color: #3D7700;
+}
+
+dd.spec.failed {
+  border-left: 5px solid #C20000;
+  border-bottom: 1px solid #C20000;
+  color: #C20000; background: #FFFBD3;
+}
+
+dd.spec.not_implemented {
+  border-left: 5px solid #FAF834;
+  border-bottom: 1px solid #FAF834;
+  background: #FCFB98; color: #131313;
+}
+
+dd.spec.pending_fixed {
+  border-left: 5px solid #0000C2;
+  border-bottom: 1px solid #0000C2;
+  color: #0000C2; background: #D3FBFF;
+}
+
+.backtrace {
+  color: #000;
+  font-size: 12px;
+}
+
+a {
+  color: #BE5C00;
+}
+
+/* Ruby code, style similar to vibrant ink */
+.ruby {
+  font-size: 12px;
+  font-family: monospace;
+  color: white;
+  background-color: black;
+  padding: 0.1em 0 0.2em 0;
+}
+
+.ruby .keyword { color: #FF6600; }
+.ruby .constant { color: #339999; }
+.ruby .attribute { color: white; }
+.ruby .global { color: white; }
+.ruby .module { color: white; }
+.ruby .class { color: white; }
+.ruby .string { color: #66FF00; }
+.ruby .ident { color: white; }
+.ruby .method { color: #FFCC00; }
+.ruby .number { color: white; }
+.ruby .char { color: white; }
+.ruby .comment { color: #9933CC; }
+.ruby .symbol { color: white; }
+.ruby .regex { color: #44B4CC; }
+.ruby .punct { color: white; }
+.ruby .escape { color: white; }
+.ruby .interp { color: white; }
+.ruby .expr { color: white; }
+
+.ruby .offending { background-color: gray; }
+.ruby .linenum {
+  width: 75px;
+  padding: 0.1em 1em 0.2em 0;
+  color: #000000;
+  background-color: #FFFBD3;
+}
+
+  </style>
+
+<div id="rspec-header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
+  </div>
+</div>
+
+<div class="results">
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_1">Mocker</dt>
+    <script type="text/javascript">moveProgressBar('5.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to call mock()</span></dd>
+    <script type="text/javascript">makeRed('rspec-header');</script>
+    <script type="text/javascript">makeRed('behaviour_1');</script>
+    <script type="text/javascript">moveProgressBar('11.7');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when expected message not received</span>
+      <div class="failure" id="failure_1">
+        <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:13:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">12</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span>
+<span class="linenum">15</span>  </code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('17.6');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should fail when messages are received out of order</span>
+      <div class="failure" id="failure_2">
+        <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:22:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
+<span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
+<span class="offending"><span class="linenum">22</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
+<span class="linenum">23</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">two</span>
+<span class="linenum">24</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('23.5');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
+      <div class="failure" id="failure_3">
+        <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">26</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">27</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">28</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
+<span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span>
+<span class="linenum">30</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('29.4');</script>
+    <dd class="spec pending_fixed">
+      <span class="failed_spec_name">has a bug we need to fix</span>
+      <div class="failure" id="failure_4">
+        <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
+        
+    <pre class="ruby"><code><span class="linenum">31</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">33</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
+<span class="linenum">34</span>      <span class="comment"># Actually, no. It's fixed. This will fail because it passes :-)</span>
+<span class="linenum">35</span>      <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">Bug</span><span class="punct">&quot;)</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_2">Running specs with --diff</dt>
+    <script type="text/javascript">makeRed('behaviour_2');</script>
+    <script type="text/javascript">moveProgressBar('35.2');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different strings</span>
+      <div class="failure" id="failure_5">
+        <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
+     got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
+Diff:
+@@ -1,4 +1,4 @@
+ RSpec is a
+-behavior driven development
++behaviour driven development
+ framework for Ruby
+</pre></div>
+        
+    <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
+<span class="linenum">12</span><span class="constant">EOF</span>
+<span class="offending"><span class="linenum">13</span>    <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
+<span class="linenum">14</span>  <span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+    <script type="text/javascript">moveProgressBar('41.1');</script>
+    <dd class="spec failed">
+      <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
+      <div class="failure" id="failure_6">
+        <div class="message"><pre>expected &lt;Animal
+name=bob,
+species=tortoise
+&gt;
+, got &lt;Animal
+name=bob,
+species=giraffe
+&gt;
+ (using .eql?)
+Diff:
+@@ -1,5 +1,5 @@
+ &lt;Animal
+ name=bob,
+-species=giraffe
++species=tortoise
+ &gt;
+</pre></div>
+        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
+./spec/spec/runner/formatter/html_formatter_spec.rb:18:
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+    <pre class="ruby"><code><span class="linenum">32</span>    <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
+<span class="linenum">33</span>    <span class="ident">actual</span>   <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
+<span class="offending"><span class="linenum">34</span>    <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>
+<span class="linenum">35</span>  <span class="keyword">end</span>
+<span class="linenum">36</span><span class="keyword">end</span></code></pre>
+      </div>
+    </dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_3">A consumer of a stub</dt>
+    <script type="text/javascript">moveProgressBar('47.0');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should be able to stub methods on any Object</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_4">A stubbed method on a class</dt>
+    <script type="text/javascript">moveProgressBar('52.9');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should return the stubbed value</span></dd>
+    <script type="text/javascript">moveProgressBar('58.8');</script>
+    <dd class="spec passed"><span class="passed_spec_name">should revert to the original method after each spec</span></dd>
+    <script type="text/javascript">moveProgressBar('64.7');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_5">A mock</dt>
+    <script type="text/javascript">moveProgressBar('70.5');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub!</span></dd>
+    <script type="text/javascript">moveProgressBar('76.4');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock</span></dd>
+    <script type="text/javascript">moveProgressBar('82.3');</script>
+    <dd class="spec passed"><span class="passed_spec_name">can stub! and mock the same message</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_6">pending example (using pending method)</dt>
+    <script type="text/javascript">makeYellow('behaviour_6');</script>
+    <script type="text/javascript">moveProgressBar('88.2');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_7">pending example (with no block)</dt>
+    <script type="text/javascript">makeYellow('behaviour_7');</script>
+    <script type="text/javascript">moveProgressBar('94.1');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should be reported as &quot;PENDING: Not Yet Implemented&quot; (PENDING: Not Yet Implemented)</span></dd>
+  </dl>
+</div>
+<div class="behaviour">
+  <dl>
+  <dt id="behaviour_8">pending example (with block for pending)</dt>
+    <script type="text/javascript">makeYellow('behaviour_8');</script>
+    <script type="text/javascript">moveProgressBar('100.0');</script>
+    <dd class="spec not_implemented"><span class="not_implemented_spec_name">should have a failing block, passed to pending, reported as &quot;PENDING: for some reason&quot; (PENDING: for some reason)</span></dd>
+  </dl>
+</div>
+<script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>x seconds</strong>";</script>
+<script type="text/javascript">document.getElementById('totals').innerHTML = "17 examples, 6 failures, 3 pending";</script>
+</div>
+</div>
+</body>
+</html>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
+  require 'spec/runner/heckle_runner'
+
+  module Foo
+    class Bar
+      def one; end
+      def two; end
+    end
+
+    class Zap
+      def three; end
+      def four; end
+    end
+  end
+
+  describe "HeckleRunner" do
+    before(:each) do
+      @heckle = mock("heckle", :null_object => true)
+      @heckle_class = mock("heckle_class")
+    end
+
+    it "should heckle all methods in all classes in a module" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "one", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Zap", "three", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Zap", "four", rspec_options).and_return(@heckle)
+
+      heckle_runner = Spec::Runner::HeckleRunner.new("Foo", @heckle_class)
+      heckle_runner.heckle_with
+    end
+
+    it "should heckle all methods in a class" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "one", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
+
+      heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar", @heckle_class)
+      heckle_runner.heckle_with
+    end
+
+    it "should fail heckling when the class is not found" do
+      lambda do
+        heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bob", @heckle_class)
+        heckle_runner.heckle_with
+      end.should raise_error(StandardError, "Heckling failed - \"Foo::Bob\" is not a known class or module")
+    end
+
+    it "should heckle specific method in a class (with #)" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
+
+      heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar#two", @heckle_class)
+      heckle_runner.heckle_with
+    end
+
+    it "should heckle specific method in a class (with .)" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
+
+      heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar.two", @heckle_class)
+      heckle_runner.heckle_with
+    end
+  end
+  
+  describe "Heckler" do
+    it "should say yes to tests_pass? if specs pass" do
+      options = mock("options", :null_object => true)
+      options.should_receive(:run_examples).and_return(true)
+      heckler = Spec::Runner::Heckler.new("Foo", nil, options)
+      heckler.tests_pass?.should be_true
+    end
+
+    it "should say no to tests_pass? if specs fail" do
+      options = mock("options", :null_object => true)
+      options.should_receive(:run_examples).and_return(false)
+      heckler = Spec::Runner::Heckler.new("Foo", nil, options)
+      heckler.tests_pass?.should be_false
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/heckler_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/heckler_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/heckler_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/heckler_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
+  require 'spec/runner/heckle_runner'
+
+  describe "Heckler" do
+    it "should run examples on tests_pass?" do
+      options = Spec::Runner::Options.new(StringIO.new, StringIO.new)
+      options.should_receive(:run_examples).with().and_return(&options.method(:run_examples))
+      heckler = Spec::Runner::Heckler.new('Array', 'push', options)
+      heckler.tests_pass?
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe "NoisyBacktraceTweaker" do
+      before(:each) do
+        @error = RuntimeError.new
+        @tweaker = NoisyBacktraceTweaker.new
+      end
+        
+      it "should leave anything in lib spec dir" do
+        ["expectations", "mocks", "runner", "stubs"].each do |child|
+          @error.set_backtrace(["/lib/spec/#{child}/anything.rb"])
+          @tweaker.tweak_backtrace(@error, "spec name")
+          @error.backtrace.should_not be_empty
+        end
+      end
+
+      it "should leave anything in spec dir" do
+        @error.set_backtrace(["/lib/spec/expectations/anything.rb"])
+        @tweaker.tweak_backtrace(@error, "spec name")
+        @error.backtrace.should_not be_empty
+      end
+
+      it "should leave bin spec" do
+        @error.set_backtrace(["bin/spec:"])
+        @tweaker.tweak_backtrace(@error, "spec name")
+        @error.backtrace.should_not be_empty
+      end
+
+      it "should not barf on nil backtrace" do
+        lambda do
+          @tweaker.tweak_backtrace(@error, "spec name")
+        end.should_not raise_error
+      end
+      
+      it "should clean up double slashes" do
+        @error.set_backtrace(["/a//b/c//d.rb"])
+        @tweaker.tweak_backtrace(@error, "spec name")
+        @error.backtrace.should include("/a/b/c/d.rb")
+      end
+      
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/object_ext_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/object_ext_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/object_ext_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/object_ext_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe "ObjectExt" do
+      it "should add copy_instance_variables_from to object" do
+        Object.new.should respond_to(:copy_instance_variables_from)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,366 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "OptionParser" do
+  before(:each) do
+    @out = StringIO.new
+    @err = StringIO.new
+    @parser = Spec::Runner::OptionParser.new(@err, @out)
+  end
+
+  def parse(args)
+    @parser.parse(args)
+    @parser.options
+  end
+
+  it "should accept dry run option" do
+    options = parse(["--dry-run"])
+    options.dry_run.should be_true
+  end
+
+  it "should eval and use custom formatter when none of the builtins" do
+    options = parse(["--format", "Custom::Formatter"])
+    options.formatters[0].class.should be(Custom::Formatter)
+  end
+  
+  it "should support formatters with relative and absolute paths, even on windows" do
+    options = parse([
+      "--format", "Custom::Formatter:C:\\foo\\bar",
+      "--format", "Custom::Formatter:foo/bar",
+      "--format", "Custom::Formatter:foo\\bar",
+      "--format", "Custom::Formatter:/foo/bar"
+    ])
+    options.formatters[0].where.should eql("C:\\foo\\bar")
+    options.formatters[1].where.should eql("foo/bar")
+    options.formatters[2].where.should eql("foo\\bar")
+    options.formatters[3].where.should eql("/foo/bar")
+  end
+
+  it "should not be verbose by default" do
+    options = parse([])
+    options.verbose.should be_nil
+  end
+
+  it "should not use colour by default" do
+    options = parse([])
+    options.colour.should == false
+  end
+
+  it "should print help to stdout if no args" do
+    pending 'A regression since 1.0.8' do
+      options = parse([])
+      @out.rewind
+      @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
+    end
+  end
+
+  it "should print help to stdout" do
+    options = parse(["--help"])
+    @out.rewind
+    @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
+  end
+
+  it "should print instructions about how to require missing formatter" do
+    lambda do 
+      options = parse(["--format", "Custom::MissingFormatter"]) 
+      options.formatters
+    end.should raise_error(NameError)
+    @err.string.should match(/Couldn't find formatter class Custom::MissingFormatter/n)
+  end
+
+  it "should print version to stdout" do
+    options = parse(["--version"])
+    @out.rewind
+    @out.read.should match(/RSpec-\d+\.\d+\.\d+.*\(r\d+\) - BDD for Ruby\nhttp:\/\/rspec.rubyforge.org\/\n/n)
+  end
+  
+  it "should require file when require specified" do
+    lambda do
+      parse(["--require", "whatever"])
+    end.should raise_error(LoadError)
+  end
+
+  it "should support c option" do
+    options = parse(["-c"])
+    options.colour.should be_true
+  end
+
+  it "should support queens colour option" do
+    options = parse(["--colour"])
+    options.colour.should be_true
+  end
+
+  it "should support us color option" do
+    options = parse(["--color"])
+    options.colour.should be_true
+  end
+
+  it "should support single example with -e option" do
+    options = parse(["-e", "something or other"])
+    options.examples.should eql(["something or other"])
+  end
+
+  it "should support single example with -s option (will be removed when autotest supports -e)" do
+    options = parse(["-s", "something or other"])
+    options.examples.should eql(["something or other"])
+  end
+
+  it "should support single example with --example option" do
+    options = parse(["--example", "something or other"])
+    options.examples.should eql(["something or other"])
+  end
+
+  it "should read several example names from file if --example is given an existing file name" do
+    options = parse(["--example", File.dirname(__FILE__) + '/examples.txt'])
+    options.examples.should eql([
+      "Sir, if you were my husband, I would poison your drink.", 
+      "Madam, if you were my wife, I would drink it."])
+  end
+  
+  it "should read no examples if given an empty file" do
+    options = parse(["--example", File.dirname(__FILE__) + '/empty_file.txt'])
+    options.examples.should eql([])
+  end
+
+  it "should use html formatter when format is h" do
+    options = parse(["--format", "h"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
+  end
+
+  it "should use html formatter when format is html" do
+    options = parse(["--format", "html"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
+  end
+
+  it "should use html formatter with explicit output when format is html:test.html" do
+    FileUtils.rm 'test.html' if File.exist?('test.html')
+    options = parse(["--format", "html:test.html"])
+    options.formatters # creates the file
+    File.should be_exist('test.html')
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
+    options.formatters[0].close
+    FileUtils.rm 'test.html'
+  end
+
+  it "should use noisy backtrace tweaker with b option" do
+    options = parse(["-b"])
+    options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker)
+  end
+
+  it "should use noisy backtrace tweaker with backtrace option" do
+    options = parse(["--backtrace"])
+    options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker)
+  end
+
+  it "should use quiet backtrace tweaker by default" do
+    options = parse([])
+    options.backtrace_tweaker.should be_instance_of(Spec::Runner::QuietBacktraceTweaker)
+  end
+
+  it "should use progress bar formatter by default" do
+    options = parse([])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::ProgressBarFormatter)
+  end
+
+  it "should use specdoc formatter when format is s" do
+    options = parse(["--format", "s"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter)
+  end
+
+  it "should use specdoc formatter when format is specdoc" do
+    options = parse(["--format", "specdoc"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter)
+  end
+
+  it "should support diff option when format is not specified" do
+    options = parse(["--diff"])
+    options.diff_format.should == :unified
+  end
+
+  it "should use unified diff format option when format is unified" do
+    options = parse(["--diff", "unified"])
+    options.diff_format.should == :unified
+    options.differ_class.should equal(Spec::Expectations::Differs::Default)
+  end
+
+  it "should use context diff format option when format is context" do
+    options = parse(["--diff", "context"])
+    options.diff_format.should == :context
+    options.differ_class.should == Spec::Expectations::Differs::Default
+  end
+
+  it "should use custom diff format option when format is a custom format" do
+    Spec::Expectations.differ.should_not be_instance_of(Custom::Differ)
+
+    options = parse(["--diff", "Custom::Differ"])
+    options.parse_diff "Custom::Differ"
+    options.diff_format.should == :custom
+    options.differ_class.should == Custom::Differ
+    Spec::Expectations.differ.should be_instance_of(Custom::Differ)
+  end
+
+  it "should print instructions about how to fix missing differ" do
+    lambda { parse(["--diff", "Custom::MissingFormatter"]) }.should raise_error(NameError)
+    @err.string.should match(/Couldn't find differ class Custom::MissingFormatter/n)
+  end
+
+  it "should support --line to identify spec" do
+    spec_parser = mock("spec_parser")
+    @parser.instance_variable_set('@spec_parser', spec_parser)
+
+    file_factory = mock("File")
+    file_factory.should_receive(:file?).and_return(true)
+    file_factory.should_receive(:open).and_return("fake_io")
+    @parser.instance_variable_set('@file_factory', file_factory)
+
+    spec_parser.should_receive(:spec_name_for).with("fake_io", 169).and_return("some spec")
+
+    options = parse(["some file", "--line", "169"])
+    options.examples.should eql(["some spec"])
+    File.rspec_verify
+  end
+
+  it "should fail with error message if file is dir along with --line" do
+    spec_parser = mock("spec_parser")
+    @parser.instance_variable_set('@spec_parser', spec_parser)
+
+    file_factory = mock("File")
+    file_factory.should_receive(:file?).and_return(false)
+    file_factory.should_receive(:directory?).and_return(true)
+    @parser.instance_variable_set('@file_factory', file_factory)
+
+    options = parse(["some file", "--line", "169"])
+    @err.string.should match(/You must specify one file, not a directory when using the --line option/n)
+  end
+
+  it "should fail with error message if file does not exist along with --line" do
+    spec_parser = mock("spec_parser")
+    @parser.instance_variable_set('@spec_parser', spec_parser)
+
+    file_factory = mock("File")
+    file_factory.should_receive(:file?).and_return(false)
+    file_factory.should_receive(:directory?).and_return(false)
+    @parser.instance_variable_set('@file_factory', file_factory)
+
+    options = parse(["some file", "--line", "169"])
+    @err.string.should match(/some file does not exist/n)
+  end
+
+  it "should fail with error message if more than one files are specified along with --line" do
+    spec_parser = mock("spec_parser")
+    @parser.instance_variable_set('@spec_parser', spec_parser)
+
+    options = parse(["some file", "some other file", "--line", "169"])
+    @err.string.should match(/Only one file can be specified when using the --line option/n)
+  end
+
+  it "should fail with error message if --example and --line are used simultaneously" do
+    spec_parser = mock("spec_parser")
+    @parser.instance_variable_set('@spec_parser', spec_parser)
+
+    options = parse(["some file", "--example", "some example", "--line", "169"])
+    @err.string.should match(/You cannot use both --line and --example/n)
+  end
+
+  if [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
+    it "should barf when --heckle is specified (and platform is windows)" do
+      lambda do
+        options = parse(["--heckle", "Spec"])
+      end.should raise_error(StandardError, "Heckle not supported on Windows")
+    end
+  else
+    it "should heckle when --heckle is specified (and platform is not windows)" do
+      options = parse(["--heckle", "Spec"])
+      options.heckle_runner.should be_instance_of(Spec::Runner::HeckleRunner)
+    end
+  end
+
+  it "should read options from file when --options is specified" do
+    options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"])
+    options.diff_format.should_not be_nil
+    options.colour.should be_true
+  end
+
+  it "should default the formatter to ProgressBarFormatter when using options file" do
+    options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"])
+    options.formatters.first.should be_instance_of(::Spec::Runner::Formatter::ProgressBarFormatter)
+  end
+
+  it "should read spaced and multi-line options from file when --options is specified" do
+    options = parse(["--options", File.dirname(__FILE__) + "/spec_spaced.opts"])
+    options.diff_format.should_not be_nil
+    options.colour.should be_true
+    options.formatters.first.should be_instance_of(::Spec::Runner::Formatter::SpecdocFormatter)
+  end
+   
+  it "should save config to file when --generate-options is specified" do
+    FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts')
+    options = parse(["--colour", "--generate-options", "test.spec.opts", "--diff"])
+    IO.read('test.spec.opts').should == "--colour\n--diff\n"
+    FileUtils.rm 'test.spec.opts'
+  end
+
+  it "should save config to file when -G is specified" do
+    FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts')
+    options = parse(["--colour", "-G", "test.spec.opts", "--diff"])
+    IO.read('test.spec.opts').should == "--colour\n--diff\n"
+    FileUtils.rm 'test.spec.opts'
+  end
+
+  it "when --drb is specified, calls DrbCommandLine all of the other ARGV arguments" do
+    options = Spec::Runner::OptionParser.parse([
+      "some/spec.rb", "--diff", "--colour"
+    ], @err, @out)
+    Spec::Runner::DrbCommandLine.should_receive(:run).and_return do |options|
+      options.argv.should == ["some/spec.rb", "--diff", "--colour"]
+    end
+    parse(["some/spec.rb", "--diff", "--drb", "--colour"])
+  end
+  
+  it "should reverse spec order when --reverse is specified" do
+    options = parse(["some/spec.rb", "--reverse"])
+  end
+
+  it "should set an mtime comparator when --loadby mtime" do
+    options = parse(["--loadby", 'mtime'])
+    runner = Spec::Runner::ExampleGroupRunner.new(options)
+    Spec::Runner::ExampleGroupRunner.should_receive(:new).
+      with(options).
+      and_return(runner)
+    runner.should_receive(:load_files).with(["most_recent_spec.rb", "command_line_spec.rb"])
+
+    Dir.chdir(File.dirname(__FILE__)) do
+      options.files << 'command_line_spec.rb'
+      options.files << 'most_recent_spec.rb'
+      FileUtils.touch "most_recent_spec.rb"
+      options.run_examples
+      FileUtils.rm "most_recent_spec.rb"
+    end
+  end
+
+  it "should use the standard runner by default" do
+    runner = ::Spec::Runner::ExampleGroupRunner.new(@parser.options)
+    ::Spec::Runner::ExampleGroupRunner.should_receive(:new).
+      with(@parser.options).
+      and_return(runner)
+    options = parse([])
+    options.run_examples
+  end
+
+  it "should use a custom runner when given" do
+    runner = Custom::ExampleGroupRunner.new(@parser.options, nil)
+    Custom::ExampleGroupRunner.should_receive(:new).
+      with(@parser.options, nil).
+      and_return(runner)
+    options = parse(["--runner", "Custom::ExampleGroupRunner"])
+    options.run_examples
+  end
+
+  it "should use a custom runner with extra options" do
+    runner = Custom::ExampleGroupRunner.new(@parser.options, 'something')
+    Custom::ExampleGroupRunner.should_receive(:new).
+      with(@parser.options, 'something').
+      and_return(runner)
+    options = parse(["--runner", "Custom::ExampleGroupRunner:something"])
+    options.run_examples
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/options_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/options_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/options_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/options_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,294 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe Options do
+      before(:each) do
+        @err = StringIO.new('')
+        @out = StringIO.new('')
+        @options = Options.new(@err, @out)
+      end
+
+      after(:each) do
+        Spec::Expectations.differ = nil
+      end
+
+      describe Options, "#examples" do
+        it "defaults to empty array" do
+          @options.examples.should == []
+        end
+      end
+
+      describe Options, "#backtrace_tweaker" do
+        it "defaults to QuietBacktraceTweaker" do
+          @options.backtrace_tweaker.class.should == QuietBacktraceTweaker
+        end
+      end
+
+      describe Options, "#dry_run" do
+        it "defaults to false" do
+          @options.dry_run.should == false
+        end
+      end
+
+      describe Options, "#context_lines" do
+        it "defaults to 3" do
+          @options.context_lines.should == 3
+        end
+      end
+
+      describe Options, "#parse_diff with nil" do
+        before do
+          @options.parse_diff nil
+        end
+
+        it "should make diff_format unified" do
+          @options.diff_format.should == :unified
+        end
+
+        it "should set Spec::Expectations.differ to be a default differ" do
+          Spec::Expectations.differ.class.should ==
+            ::Spec::Expectations::Differs::Default
+        end
+      end
+
+      describe Options, "#parse_diff with 'unified'" do
+        before do
+          @options.parse_diff 'unified'
+        end
+
+        it "should make diff_format unified and uses default differ_class" do
+          @options.diff_format.should == :unified
+          @options.differ_class.should equal(Spec::Expectations::Differs::Default)
+        end
+
+        it "should set Spec::Expectations.differ to be a default differ" do
+          Spec::Expectations.differ.class.should ==
+            ::Spec::Expectations::Differs::Default
+        end
+      end
+
+      describe Options, "#parse_diff with 'context'" do
+        before do
+          @options.parse_diff 'context'
+        end
+
+        it "should make diff_format context and uses default differ_class" do
+          @options.diff_format.should == :context
+          @options.differ_class.should == Spec::Expectations::Differs::Default
+        end
+
+        it "should set Spec::Expectations.differ to be a default differ" do
+          Spec::Expectations.differ.class.should ==
+            ::Spec::Expectations::Differs::Default
+        end
+      end
+
+      describe Options, "#parse_diff with Custom::Differ" do
+        before do
+          @options.parse_diff 'Custom::Differ'
+        end
+
+        it "should use custom differ_class" do
+          @options.diff_format.should == :custom
+          @options.differ_class.should == Custom::Differ
+          Spec::Expectations.differ.should be_instance_of(Custom::Differ)
+        end
+
+        it "should set Spec::Expectations.differ to be a default differ" do
+          Spec::Expectations.differ.class.should ==
+            ::Custom::Differ
+        end
+      end
+
+      describe Options, "#parse_diff with missing class name" do
+        it "should raise error" do
+          lambda { @options.parse_diff "Custom::MissingDiffer" }.should raise_error(NameError)
+          @err.string.should match(/Couldn't find differ class Custom::MissingDiffer/n)
+        end
+      end
+
+      describe Options, "#parse_example" do
+        it "with argument thats not a file path, sets argument as the example" do
+          example = "something or other"
+          File.file?(example).should == false
+          @options.parse_example example
+          @options.examples.should eql(["something or other"])
+        end
+
+        it "with argument that is a file path, sets examples to contents of the file" do
+          example = "#{File.dirname(__FILE__)}/examples.txt"
+          File.should_receive(:file?).with(example).and_return(true)
+          file = StringIO.new("Sir, if you were my husband, I would poison your drink.\nMadam, if you were my wife, I would drink it.")
+          File.should_receive(:open).with(example).and_return(file)
+
+          @options.parse_example example
+          @options.examples.should eql([
+            "Sir, if you were my husband, I would poison your drink.",
+              "Madam, if you were my wife, I would drink it."
+          ])
+        end
+      end
+
+      describe Options, "#examples_should_not_be_run" do
+        it "should cause #run_examples to return true and do nothing" do
+          @options.examples_should_not_be_run
+          ExampleGroupRunner.should_not_receive(:new)
+
+          @options.run_examples.should be_true
+        end
+      end
+
+      describe Options, "#load_class" do
+        it "should raise error when not class name" do
+          lambda do
+            @options.send(:load_class, 'foo', 'fruit', '--food')
+          end.should raise_error('"foo" is not a valid class name')
+        end
+      end
+
+      describe Options, "#reporter" do
+        it "returns a Reporter" do
+          @options.reporter.should be_instance_of(Reporter)
+          @options.reporter.options.should === @options
+        end
+      end
+
+      describe Options, "#add_example_group affecting passed in behaviour" do
+        it "runs all examples when options.examples is nil" do
+          example_1_has_run = false
+          example_2_has_run = false
+          @behaviour = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do
+            it "runs 1" do
+              example_1_has_run = true
+            end
+            it "runs 2" do
+              example_2_has_run = true
+            end
+          end
+
+          @options.examples = nil
+
+          @options.add_example_group @behaviour
+          @options.run_examples
+          example_1_has_run.should be_true
+          example_2_has_run.should be_true
+        end
+
+        it "keeps all example_definitions when options.examples is empty" do
+          example_1_has_run = false
+          example_2_has_run = false
+          @behaviour = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do
+            it "runs 1" do
+              example_1_has_run = true
+            end
+            it "runs 2" do
+              example_2_has_run = true
+            end
+          end
+
+          @options.examples = []
+
+          @options.add_example_group @behaviour
+          @options.run_examples
+          example_1_has_run.should be_true
+          example_2_has_run.should be_true
+        end
+      end
+
+      describe Options, "#add_example_group affecting behaviours" do
+        it "adds behaviour when behaviour has example_definitions and is not shared" do
+          @behaviour = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do
+            it "uses this behaviour" do
+            end
+          end
+
+          @options.number_of_examples.should == 0
+          @options.add_example_group @behaviour
+          @options.number_of_examples.should == 1
+          @options.example_groups.length.should == 1
+        end
+      end
+
+      describe Options, "#remove_example_group" do
+        it "should remove the ExampleGroup from the list of ExampleGroups" do
+          @example_group = Class.new(::Spec::Example::ExampleGroup).describe("Some Examples") do
+          end
+          @options.add_example_group @example_group
+          @options.example_groups.should include(@example_group)
+
+          @options.remove_example_group @example_group
+          @options.example_groups.should_not include(@example_group)
+        end
+      end
+
+      describe Options, "#run_examples" do
+        it "should use the standard runner by default" do
+          runner = ::Spec::Runner::ExampleGroupRunner.new(@options)
+          ::Spec::Runner::ExampleGroupRunner.should_receive(:new).
+            with(@options).
+            and_return(runner)
+          @options.user_input_for_runner = nil
+
+          @options.run_examples
+        end
+
+        it "should use a custom runner when given" do
+          runner = Custom::ExampleGroupRunner.new(@options, nil)
+          Custom::ExampleGroupRunner.should_receive(:new).
+            with(@options, nil).
+            and_return(runner)
+          @options.user_input_for_runner = "Custom::ExampleGroupRunner"
+
+          @options.run_examples
+        end
+
+        it "should use a custom runner with extra options" do
+          runner = Custom::ExampleGroupRunner.new(@options, 'something')
+          Custom::ExampleGroupRunner.should_receive(:new).
+            with(@options, 'something').
+            and_return(runner)
+          @options.user_input_for_runner = "Custom::ExampleGroupRunner:something"
+
+          @options.run_examples
+        end
+
+        describe Options, "#run_examples when there are behaviours" do
+          before do
+            @options.add_example_group Class.new(::Spec::Example::ExampleGroup)
+            @options.formatters << Formatter::BaseTextFormatter.new(@options, @out)
+          end
+
+          it "runs the Examples and outputs the result" do
+            @options.run_examples
+            @out.string.should include("0 examples, 0 failures")
+          end
+
+          it "sets #examples_run? to true" do
+            @options.examples_run?.should be_false
+            @options.run_examples
+            @options.examples_run?.should be_true
+          end
+        end
+
+        describe Options, "#run_examples when there are no behaviours" do
+          before do
+            @options.formatters << Formatter::BaseTextFormatter.new(@options, @out)
+          end
+
+          it "does not run Examples and does not output a result" do
+            @options.run_examples
+            @out.string.should_not include("examples")
+            @out.string.should_not include("failures")
+          end
+
+          it "sets #examples_run? to false" do
+            @options.examples_run?.should be_false
+            @options.run_examples
+            @options.examples_run?.should be_false
+          end
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "Running an Example" do
+  it "should not output twice" do
+    true.should be_true
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+dir = File.dirname(__FILE__)
+require "#{dir}/../../spec_helper"
+
+triggering_double_output = rspec_options
+options = Spec::Runner::OptionParser.parse(
+  ["#{dir}/output_one_time_fixture.rb"], $stderr, $stdout
+)
+Spec::Runner::CommandLine.run(options)
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/output_one_time_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/output_one_time_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/output_one_time_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/output_one_time_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe CommandLine do
+      it "should not output twice" do
+        dir = File.dirname(__FILE__)
+        Dir.chdir("#{dir}/../../..") do
+          output =`ruby #{dir}/output_one_time_fixture_runner.rb`
+          output.should include("1 example, 0 failures")
+          output.should_not include("0 examples, 0 failures")
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    describe "QuietBacktraceTweaker" do
+      before(:each) do
+        @error = RuntimeError.new
+        @tweaker = QuietBacktraceTweaker.new
+      end
+
+      it "should not barf on nil backtrace" do
+        lambda do
+          @tweaker.tweak_backtrace(@error, "spec name")
+        end.should_not raise_error
+      end
+
+      it "should remove anything from textmate ruby bundle" do
+        @error.set_backtrace(["/Applications/TextMate.app/Contents/SharedSupport/Bundles/Ruby.tmbundle/Support/tmruby.rb:147"])
+        @tweaker.tweak_backtrace(@error, "spec name")
+        @error.backtrace.should be_empty
+      end
+
+      it "should remove anything in lib spec dir" do
+        ["expectations", "mocks", "runner"].each do |child|
+          element="/lib/spec/#{child}/anything.rb"
+          @error.set_backtrace([element])
+          @tweaker.tweak_backtrace(@error, "spec name")
+          unless (@error.backtrace.empty?)
+            raise("Should have tweaked away '#{element}'")
+          end
+        end
+      end
+
+      it "should remove mock_frameworks/rspec" do
+        element = "mock_frameworks/rspec"
+        @error.set_backtrace([element])
+        @tweaker.tweak_backtrace(@error, "spec name")
+        unless (@error.backtrace.empty?)
+          raise("Should have tweaked away '#{element}'")
+        end
+      end
+
+      it "should remove bin spec" do
+        @error.set_backtrace(["bin/spec:"])
+        @tweaker.tweak_backtrace(@error, "spec name")
+        @error.backtrace.should be_empty
+      end
+      
+      it "should clean up double slashes" do
+        @error.set_backtrace(["/a//b/c//d.rb"])
+        @tweaker.tweak_backtrace(@error, "spec name")
+        @error.backtrace.should include("/a/b/c/d.rb")
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,191 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Runner
+    
+    ReporterSpecHelper = describe "reporter spec helpers", :shared => true do
+      before(:each) do
+        @io = StringIO.new
+        @options = Options.new(StringIO.new, @io)
+        @backtrace_tweaker = stub("backtrace tweaker", :tweak_backtrace => nil)
+        @options.backtrace_tweaker = @backtrace_tweaker
+        @formatter = mock("formatter")
+        @options.formatters << @formatter
+        @reporter = Reporter.new(@options)
+      end
+
+      def failure
+        Mocks::DuckTypeArgConstraint.new(:header, :exception)
+      end
+      
+      def description(s)
+        Spec::Example::ExampleGroupDescription.new(s)
+      end
+    end
+    
+    describe Reporter do
+      include ReporterSpecHelper
+      
+      it "should assign itself as the reporter to options" do
+        @options.reporter.should equal(@reporter)
+      end
+      
+      it "should tell formatter when behaviour is added" do
+        @formatter.should_receive(:add_example_group).with(description("behaviour"))
+        @reporter.add_example_group(description("behaviour"))
+      end
+
+      it "should handle multiple behaviours with same name" do
+        @formatter.should_receive(:add_example_group).exactly(3).times
+        @formatter.should_receive(:example_started).exactly(3).times
+        @formatter.should_receive(:example_passed).exactly(3).times
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_pending)
+        @formatter.should_receive(:close).with(no_args)
+        @formatter.should_receive(:dump_summary).with(anything(), 3, 0, 0)
+        @reporter.add_example_group(description("behaviour"))
+        @reporter.example_started("spec 1")
+        @reporter.example_finished("spec 1")
+        @reporter.add_example_group(description("behaviour"))
+        @reporter.example_started("spec 2")
+        @reporter.example_finished("spec 2")
+        @reporter.add_example_group(description("behaviour"))
+        @reporter.example_started("spec 3")
+        @reporter.example_finished("spec 3")
+        @reporter.dump
+      end
+
+      it "should handle multiple examples with the same name" do
+        error=RuntimeError.new
+        @formatter.should_receive(:add_example_group).exactly(2).times
+        @formatter.should_receive(:example_passed).with("example").exactly(2).times
+        @formatter.should_receive(:example_failed).with("example", 1, failure)
+        @formatter.should_receive(:example_failed).with("example", 2, failure)
+        @formatter.should_receive(:dump_failure).exactly(2).times
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_pending)
+        @formatter.should_receive(:close).with(no_args)
+        @formatter.should_receive(:dump_summary).with(anything(), 4, 2, 0)
+        @backtrace_tweaker.should_receive(:tweak_backtrace).twice
+        @reporter.add_example_group(description("behaviour"))
+        @reporter.example_finished("example")
+        @reporter.example_finished("example", error)
+        @reporter.add_example_group(description("behaviour"))
+        @reporter.example_finished("example")
+        @reporter.example_finished("example", error)
+        @reporter.dump
+      end
+
+      it "should push stats to formatter even with no data" do
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_pending)
+        @formatter.should_receive(:dump_summary).with(anything(), 0, 0, 0)
+        @formatter.should_receive(:close).with(no_args)
+        @reporter.dump
+      end
+      
+      it "should push time to formatter" do
+        @formatter.should_receive(:start).with(5)
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_pending)
+        @formatter.should_receive(:close).with(no_args)
+        @formatter.should_receive(:dump_summary) do |time, a, b|
+          time.to_s.should match(/[0-9].[0-9|e|-]+/)
+        end
+        @reporter.start(5)
+        @reporter.end
+        @reporter.dump
+      end
+    end
+    
+    describe Reporter, "reporting one passing example" do
+      include ReporterSpecHelper
+
+      it "should tell formatter example passed" do
+        @formatter.should_receive(:example_passed)
+        @reporter.example_finished("example")
+      end
+      
+      it "should not delegate to backtrace tweaker" do
+        @formatter.should_receive(:example_passed)
+        @backtrace_tweaker.should_not_receive(:tweak_backtrace)
+        @reporter.example_finished("example")
+      end
+
+      it "should account for passing example in stats" do
+        @formatter.should_receive(:example_passed)
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_pending)
+        @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 0)
+        @formatter.should_receive(:close).with(no_args)
+        @reporter.example_finished("example")
+        @reporter.dump
+      end
+    end
+
+    describe Reporter, "reporting one failing example" do
+      include ReporterSpecHelper
+
+      it "should tell formatter that example failed" do
+        @formatter.should_receive(:example_failed)
+        @reporter.example_finished("example", RuntimeError.new)
+      end
+      
+      it "should delegate to backtrace tweaker" do
+        @formatter.should_receive(:example_failed)
+        @backtrace_tweaker.should_receive(:tweak_backtrace)
+        @reporter.example_finished("spec", RuntimeError.new)
+      end
+
+      it "should account for failing example in stats" do
+        @formatter.should_receive(:add_example_group)
+        @formatter.should_receive(:example_failed).with("example", 1, failure)
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_pending)
+        @formatter.should_receive(:dump_failure).with(1, anything())
+        @formatter.should_receive(:dump_summary).with(anything(), 1, 1, 0)
+        @formatter.should_receive(:close).with(no_args)
+        @reporter.add_example_group(description("behaviour"))
+        @reporter.example_finished("example", RuntimeError.new)
+        @reporter.dump
+      end
+      
+    end
+    
+    describe Reporter, "reporting one pending example (ExamplePendingError)" do
+      include ReporterSpecHelper
+
+      it "should tell formatter example is pending" do
+        @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "reason")
+        @formatter.should_receive(:add_example_group).with(description("behaviour"))
+        @reporter.add_example_group(description('behaviour'))
+        @reporter.example_finished("example", Spec::Example::ExamplePendingError.new("reason"), nil, false)
+      end
+
+      it "should account for pending example in stats" do
+        @formatter.should_receive(:example_pending).with(description("behaviour"), "example", "reason")
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_pending)
+        @formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1)
+        @formatter.should_receive(:close).with(no_args)
+        @formatter.should_receive(:add_example_group).with(description("behaviour"))
+        @reporter.add_example_group(description('behaviour'))
+        @reporter.example_finished("example", Spec::Example::ExamplePendingError.new("reason"), nil, false)
+        @reporter.dump
+      end
+    end
+
+    describe Reporter, "reporting one pending example (PendingExampleFixedError)" do
+      include ReporterSpecHelper
+
+      it "should tell formatter pending example is fixed" do
+        @formatter.should_receive(:example_failed) do |name, counter, failure|
+          failure.header.should == "'behaviour example' FIXED"
+        end
+        @formatter.should_receive(:add_example_group).with(description("behaviour"))
+        @reporter.add_example_group(description('behaviour'))
+        @reporter.example_finished("example", Spec::Example::PendingExampleFixedError.new("reason"), nil, false)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/spec.opts technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/spec.opts
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/spec.opts	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/spec.opts	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+--diff
+--colour
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,124 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe "c" do
+
+  it "1" do
+  end
+
+  it "2" do
+  end
+
+end
+
+describe "d" do
+
+  it "3" do
+  end
+
+  it "4" do
+  end
+
+end
+
+class SpecParserSubject
+end
+
+describe SpecParserSubject do
+  
+  it "5" do
+  end
+  
+end
+
+describe SpecParserSubject, "described" do
+  
+  it "6" do
+  end
+  
+end
+
+describe SpecParserSubject, "described", :something => :something_else do
+   
+   it "7" do
+   end
+
+end
+
+describe "described", :something => :something_else do
+  
+  it "8" do
+  end
+  
+end
+   
+
+describe "SpecParser" do
+  before(:each) do
+    @p = Spec::Runner::SpecParser.new
+  end
+
+  it "should find spec name for 'specify' at same line" do
+    @p.spec_name_for(File.open(__FILE__), 5).should == "c 1"
+  end
+
+  it "should find spec name for 'specify' at end of spec line" do
+    @p.spec_name_for(File.open(__FILE__), 6).should == "c 1"
+  end
+
+  it "should find context for 'context' above all specs" do
+    @p.spec_name_for(File.open(__FILE__), 4).should == "c"
+  end
+
+  it "should find spec name for 'it' at same line" do
+    @p.spec_name_for(File.open(__FILE__), 15).should == "d 3"
+  end
+
+  it "should find spec name for 'it' at end of spec line" do
+    @p.spec_name_for(File.open(__FILE__), 16).should == "d 3"
+  end
+
+  it "should find context for 'describe' above all specs" do
+    @p.spec_name_for(File.open(__FILE__), 14).should == "d"
+  end
+
+ it "should find nearest example name between examples" do
+   @p.spec_name_for(File.open(__FILE__), 7).should == "c 1"
+ end
+
+  it "should find nothing outside a context" do
+    @p.spec_name_for(File.open(__FILE__), 2).should be_nil
+  end
+  
+  it "should find context name for type" do
+    @p.spec_name_for(File.open(__FILE__), 26).should == "SpecParserSubject"
+  end
+  
+  it "should find context and spec name for type" do
+    @p.spec_name_for(File.open(__FILE__), 28).should == "SpecParserSubject 5"
+  end
+
+  it "should find context and description for type" do
+    @p.spec_name_for(File.open(__FILE__), 33).should == "SpecParserSubject described"
+  end
+  
+  it "should find context and description and example for type" do
+    @p.spec_name_for(File.open(__FILE__), 36).should == "SpecParserSubject described 6"
+  end
+
+  it "should find context and description for type with modifications" do
+    @p.spec_name_for(File.open(__FILE__), 40).should == "SpecParserSubject described"
+  end
+  
+  it "should find context and described and example for type with modifications" do
+    @p.spec_name_for(File.open(__FILE__), 43).should == "SpecParserSubject described 7"
+  end
+  
+  it "should find example group" do
+    @p.spec_name_for(File.open(__FILE__), 47).should == "described"
+  end
+  
+  it "should find example" do
+    @p.spec_name_for(File.open(__FILE__), 50).should == "described 8"
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/spec_spaced.opts technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/spec_spaced.opts
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner/spec_spaced.opts	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner/spec_spaced.opts	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+--diff --colour
+--format s
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/runner_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/runner_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+module Spec
+  describe Runner, ".configure" do
+    it "should yield global configuration" do
+      Spec::Runner.configure do |config|
+        config.should equal(Spec::Runner.configuration)
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/spec_classes.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/spec_classes.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/spec_classes.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/spec_classes.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,129 @@
+# This file contains various classes used by the specs.
+module Spec
+  module Expectations
+    class Person
+      attr_reader :name
+      def initialize name
+        @name = name
+      end
+      def == other
+        return @name == other.name
+      end
+    end
+    
+    class ClassWithMultiWordPredicate
+      def multi_word_predicate?
+        true 
+      end
+    end
+
+    module Helper
+      class CollectionWithSizeMethod
+        def initialize; @list = []; end
+        def size; @list.size; end
+        def push(item); @list.push(item); end
+      end
+
+      class CollectionWithLengthMethod
+        def initialize; @list = []; end
+        def length; @list.size; end
+        def push(item); @list.push(item); end
+      end
+
+      class CollectionOwner
+        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method
+
+        def initialize
+          @items_in_collection_with_size_method = CollectionWithSizeMethod.new
+          @items_in_collection_with_length_method = CollectionWithLengthMethod.new
+        end
+
+        def add_to_collection_with_size_method(item)
+          @items_in_collection_with_size_method.push(item)
+        end
+
+        def add_to_collection_with_length_method(item)
+          @items_in_collection_with_length_method.push(item)
+        end
+        
+        def items_for(arg)
+          return [1, 2, 3] if arg == 'a'
+          [1]
+        end
+        
+      end
+
+      class HandCodedMock
+        include Spec::Matchers
+        def initialize(return_val)
+          @return_val = return_val
+          @funny_called = false
+        end
+
+        def funny?
+          @funny_called = true
+          @return_val
+        end
+
+        def hungry?(a, b, c)
+          a.should equal(1)
+          b.should equal(2)
+          c.should equal(3)
+          @funny_called = true
+          @return_val
+        end
+        
+        def exists?
+          @return_val
+        end
+        
+        def multi_word_predicate?
+          @return_val
+        end
+
+        def rspec_verify
+          @funny_called.should be_true
+        end
+      end
+      class ClassWithUnqueriedPredicate
+        attr_accessor :foo
+        def initialize(foo)
+          @foo = foo
+        end
+      end
+    end
+  end
+end
+
+module Custom
+  class Formatter < Spec::Runner::Formatter::BaseTextFormatter
+    attr_reader :options, :where
+    
+    def initialize(options, where)
+      @options = options
+      @where = where
+    end
+  end
+
+  class BadFormatter < Spec::Runner::Formatter::BaseTextFormatter
+    attr_reader :where
+    
+    def initialize(options, where)
+      bad_method
+    end
+  end
+
+  class Differ
+    attr_reader :options
+    def initialize(options)
+      @options = options
+    end
+  end
+end
+
+class FakeReporter < Spec::Runner::Reporter
+  attr_reader :added_behaviour
+  def add_example_group(description)
+    @added_behaviour = description
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/builders.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/builders.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/builders.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/builders.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,46 @@
+module Spec
+  module Story
+    class StoryBuilder
+      def initialize
+        @title = 'a story'
+        @narrative = 'narrative'
+      end
+      
+      def title(value)
+        @title = value
+        self
+      end
+      
+      def narrative(value)
+        @narrative = value
+        self
+      end
+      
+      def to_story(&block)
+        block = lambda {} unless block_given?
+        Story.new @title, @narrative, &block
+      end
+    end
+    
+    class ScenarioBuilder
+      def initialize
+        @name = 'a scenario'
+        @story = StoryBuilder.new.to_story
+      end
+      
+      def name(value)
+        @name = value
+        self
+      end
+      
+      def story(value)
+        @story = value
+        self
+      end
+      
+      def to_scenario(&block)
+        Scenario.new @story, @name, &block
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/extensions/main_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/extensions/main_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/extensions/main_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/extensions/main_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,161 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+module Spec
+  module Story
+    module Extensions
+      describe "the main object extended with Main", :shared => true do
+        before(:each) do
+          @main = Class.new do; include Main; end
+          @original_rspec_story_steps, $rspec_story_steps = $rspec_story_steps, nil
+        end
+
+        after(:each) do
+          $rspec_story_steps = @original_rspec_story_steps
+        end
+
+        def have_step(type, name)
+          return simple_matcher(%[step group containing a #{type} named #{name.inspect}]) do |actual|
+            Spec::Story::Step === actual.find(type, name)
+          end
+        end
+      end
+
+      describe Main, "#run_story" do
+        it_should_behave_like "the main object extended with Main"
+
+        it "should create a PlainTextStoryRunner with run_story" do
+          Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).and_return(mock("runner", :null_object => true))
+          @main.run_story
+        end
+
+        it "should yield the runner if arity == 1" do
+          File.should_receive(:read).with("some/path").and_return("Story: foo")
+          $main_spec_runner = nil
+          @main.run_story("some/path") do |runner|
+            $main_spec_runner = runner
+          end
+          $main_spec_runner.should be_an_instance_of(Spec::Story::Runner::PlainTextStoryRunner)
+        end
+
+        it "should run in the runner if arity == 0" do
+          File.should_receive(:read).with("some/path").and_return("Story: foo")
+          $main_spec_runner = nil
+          @main.run_story("some/path") do
+            $main_spec_runner = self
+          end
+          $main_spec_runner.should be_an_instance_of(Spec::Story::Runner::PlainTextStoryRunner)
+        end
+
+        it "should tell the PlainTextStoryRunner to run with run_story" do
+          runner = mock("runner")
+          Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).and_return(runner)
+          runner.should_receive(:run)
+          @main.run_story
+        end  
+      end
+
+      describe Main, "#steps_for" do
+        it_should_behave_like "the main object extended with Main"
+
+        it "should have no steps for a non existent key" do
+          @main.steps_for(:key).find(:given, "foo").should be_nil
+        end
+
+        it "should create steps for a key" do
+          $main_spec_invoked = false
+          @main.steps_for(:key) do
+            Given("foo") {
+              $main_spec_invoked = true
+            }
+          end
+          @main.steps_for(:key).find(:given, "foo").perform(Object.new, "foo")
+          $main_spec_invoked.should be_true
+        end
+
+        it "should append steps to steps_for a given key" do
+          @main.steps_for(:key) do
+            Given("first") {}
+          end
+          @main.steps_for(:key) do
+            Given("second") {}
+          end
+          @main.steps_for(:key).should have_step(:given, "first")
+          @main.steps_for(:key).should have_step(:given, "second")
+        end
+      end
+
+      describe Main, "#with_steps_for adding new steps" do
+        it_should_behave_like "the main object extended with Main"
+
+        it "should result in a group containing pre-existing steps and newly defined steps" do
+          first_group = @main.steps_for(:key) do
+            Given("first") {}
+          end
+          second_group = @main.with_steps_for(:key) do
+            Given("second") {}
+          end
+
+          second_group.should have_step(:given, "first")
+          second_group.should have_step(:given, "second")
+        end
+
+        it "should not add its steps to the existing group" do
+          first_group = @main.steps_for(:key) do
+            Given("first") {}
+          end
+          second_group = @main.with_steps_for(:key) do
+            Given("second") {}
+          end
+
+          first_group.should have_step(:given, "first")
+          first_group.should_not have_step(:given, "second")
+        end
+      end
+
+      describe Main, "#with_steps_for running a story" do
+        it_should_behave_like "the main object extended with Main"
+        
+        before(:each) do
+          @runner = mock("runner")
+          @runner_step_group = StepGroup.new
+          @runner.stub!(:steps).and_return(@runner_step_group)
+          @runner.stub!(:run)
+          Spec::Story::Runner::PlainTextStoryRunner.stub!(:new).and_return(@runner)
+        end
+        
+        it "should create a PlainTextStoryRunner with a path" do
+          Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).with('path/to/file',{}).and_return(@runner)
+          @main.with_steps_for(:foo) do
+            run 'path/to/file'
+          end
+        end
+        
+        it "should create a PlainTextStoryRunner with a path and options" do
+          Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).with(anything,{:bar => :baz}).and_return(@runner)
+          @main.with_steps_for(:foo) do
+            run 'path/to/file', :bar => :baz
+          end
+        end
+        
+        it "should pass the group it creates to the runner's steps" do
+          steps = @main.steps_for(:ice_cream) do
+            Given("vanilla") {}
+          end
+          @main.with_steps_for(:ice_cream) do
+            run 'foo'
+          end
+          @runner_step_group.should have_step(:given, "vanilla")
+        end
+        
+        it "should run a story" do
+          @runner.should_receive(:run)
+          Spec::Story::Runner::PlainTextStoryRunner.should_receive(:new).and_return(@runner)
+          @main.with_steps_for(:foo) do
+            run 'path/to/file'
+          end
+        end
+
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/extensions_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/extensions_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/extensions_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/extensions_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+require 'spec/story'
+
+describe Kernel, "#Story" do
+  before(:each) do
+    Kernel.stub!(:at_exit)
+  end
+
+  it "should delegate to ::Spec::Story::Runner.story_runner" do
+    ::Spec::Story::Runner.story_runner.should_receive(:Story)
+    story = Story("title","narrative"){}
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/given_scenario_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/given_scenario_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/given_scenario_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/given_scenario_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+module Spec
+  module Story
+    describe GivenScenario do
+      it 'should execute a scenario from the current story in its world' do
+        # given
+        class MyWorld
+          attr :scenario_ran
+        end
+        instance = World.create(MyWorld)
+        scenario = ScenarioBuilder.new.to_scenario do
+          @scenario_ran = true
+        end
+        Runner::StoryRunner.should_receive(:scenario_from_current_story).with('scenario name').and_return(scenario)
+        
+        step = GivenScenario.new 'scenario name'
+        
+        # when
+        step.perform(instance, nil)
+        
+        # then
+        ensure_that instance.scenario_ran, is(true)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/rspec_adapter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/rspec_adapter.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/rspec_adapter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/rspec_adapter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,51 @@
+# TODO: get rid of this file. It breaks with the style in the rest of our code. (AH)
+
+# add ensure_that(..)
+module Spec::Expectations::ObjectExpectations
+  def ensure_that(obj, expr)
+    obj.should expr
+  end
+end
+
+def exception_from(&block)
+  exception = nil
+  begin
+    yield
+  rescue StandardError => e
+    exception = e
+  end
+  exception
+end
+
+# simplify matchers
+
+
+# custom matchers
+
+def contain(string)
+  return simple_matcher(%[string containing "#{string}"]) do |actual|
+    actual.include? string
+  end
+end
+
+alias :contains :contain
+
+def is(expected)
+  return simple_matcher("equal to #{expected}") do |actual| actual == expected end
+end
+
+alias :are :is
+
+def is_a(type)
+  return simple_matcher("object of type #{type}") do |actual|
+    actual.is_a? type
+  end
+end
+
+alias :is_an :is_a
+
+def matches(pattern)
+  return simple_matcher("string matching #{pattern}") do |actual|
+    actual =~ pattern
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,92 @@
+require File.dirname(__FILE__) + '/../story_helper'
+
+module Spec
+  module Story
+    module Runner
+      describe PlainTextStoryRunner do
+        before(:each) do
+          StoryParser.stub!(:new).and_return(@parser = mock("parser"))
+          @parser.stub!(:parse).and_return([])
+          File.stub!(:read).with("path").and_return("this\nand that")
+        end
+
+        it "should provide access to steps" do
+          runner = PlainTextStoryRunner.new("path")
+          
+          runner.steps do |add|
+            add.given("baz") {}
+          end
+          
+          runner.steps.find(:given, "baz").should_not be_nil
+        end
+        
+        it "should parse a story file" do
+          runner = PlainTextStoryRunner.new("path")
+          
+          during {
+            runner.run
+          }.expect {
+            @parser.should_receive(:parse).with(["this", "and that"])
+          }
+        end
+        
+        it "should build up a mediator with its own steps and the singleton story_runner" do
+          runner = PlainTextStoryRunner.new("path")
+          Spec::Story::Runner.should_receive(:story_runner).and_return(story_runner = mock("story runner"))
+          Spec::Story::Runner::StoryMediator.should_receive(:new).with(runner.steps, story_runner, {}).
+            and_return(mediator = stub("mediator", :run_stories => nil))
+          runner.run
+        end
+        
+        it "should build up a parser with the mediator" do
+          runner = PlainTextStoryRunner.new("path")
+          Spec::Story::Runner.should_receive(:story_runner).and_return(story_runner = mock("story runner"))
+          Spec::Story::Runner::StoryMediator.should_receive(:new).and_return(mediator = stub("mediator", :run_stories => nil))
+          Spec::Story::Runner::StoryParser.should_receive(:new).with(mediator).and_return(@parser)
+          runner.run
+        end
+        
+        it "should tell the mediator to run the stories" do
+          runner = PlainTextStoryRunner.new("path")
+          mediator = mock("mediator")
+          Spec::Story::Runner::StoryMediator.should_receive(:new).and_return(mediator)
+          mediator.should_receive(:run_stories)
+          runner.run
+        end
+        
+        it "should accept a block instead of a path" do
+          runner = PlainTextStoryRunner.new do |runner|
+            runner.load("path/to/story")
+          end
+          File.should_receive(:read).with("path/to/story").and_return("this\nand that")
+          runner.run
+        end
+        
+        it "should tell you if you try to run with no path set" do
+          runner = PlainTextStoryRunner.new
+          lambda {
+            runner.run
+          }.should raise_error(RuntimeError, "You must set a path to the file with the story. See the RDoc.")
+        end
+        
+        it "should pass options to the mediator" do
+          runner = PlainTextStoryRunner.new("path", :foo => :bar)
+          Spec::Story::Runner::StoryMediator.should_receive(:new).
+            with(anything, anything, :foo => :bar).
+            and_return(mediator = stub("mediator", :run_stories => nil))
+          runner.run
+        end
+        
+        it "should provide access to its options" do
+          runner = PlainTextStoryRunner.new("path")
+          runner[:foo] = :bar
+          Spec::Story::Runner::StoryMediator.should_receive(:new).
+            with(anything, anything, :foo => :bar).
+            and_return(mediator = stub("mediator", :run_stories => nil))
+          runner.run
+        end
+        
+      end
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../story_helper'
+
+module Spec
+  module Story
+    module Runner
+      describe ScenarioCollector do
+        it 'should construct scenarios with the supplied story' do
+          # given
+          story = stub_everything('story')
+          scenario_collector = ScenarioCollector.new(story)
+          
+          # when
+          scenario_collector.Scenario 'scenario1' do end
+          scenario_collector.Scenario 'scenario2' do end
+          scenarios = scenario_collector.scenarios
+          
+          # then
+          ensure_that scenarios.size, is(2)
+          ensure_that scenarios[0].name, is('scenario1')
+          ensure_that scenarios[0].story, is(story)
+          ensure_that scenarios[1].name, is('scenario2')
+          ensure_that scenarios[1].story, is(story)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,146 @@
+require File.dirname(__FILE__) + '/../story_helper'
+
+module Spec
+  module Story
+    module Runner
+      describe ScenarioRunner do
+        it 'should run a scenario in its story' do
+          # given
+          world = stub_everything
+          scenario_runner = ScenarioRunner.new
+          $answer = nil
+          story = Story.new 'story', 'narrative' do
+            @answer = 42 # this should be available to the scenario
+          end
+          scenario = Scenario.new story, 'scenario' do
+            $answer = @answer
+          end
+          
+          # when
+          scenario_runner.run(scenario, world)
+          
+          # then
+          ensure_that $answer, is(42)
+        end
+        
+        it 'should allow scenarios to share methods' do
+          # given
+          world = stub_everything
+          $shared_invoked = 0
+          story = Story.new 'story', 'narrative' do
+            def shared
+              $shared_invoked += 1
+            end
+          end
+          scenario1 = Scenario.new story, 'scenario1' do
+            shared()
+          end
+          scenario2 = Scenario.new story, 'scenario2' do
+            shared()
+          end
+          scenario_runner = ScenarioRunner.new
+          
+          # when
+          scenario_runner.run(scenario1, world)
+          scenario_runner.run(scenario2, world)
+          
+          # then
+          $shared_invoked.should == 2
+        end
+        
+        it 'should notify listeners when a scenario starts' do
+          # given
+          world = stub_everything
+          story = Story.new 'story', 'narrative' do end
+          scenario = Scenario.new story, 'scenario1' do
+            # succeeds
+          end
+          scenario_runner = ScenarioRunner.new
+          mock_listener1 = stub_everything('listener1')
+          mock_listener2 = stub_everything('listener2')
+          scenario_runner.add_listener(mock_listener1)
+          scenario_runner.add_listener(mock_listener2)
+          
+          # expect
+          mock_listener1.should_receive(:scenario_started).with('story', 'scenario1')
+          mock_listener2.should_receive(:scenario_started).with('story', 'scenario1')
+          
+          # when
+          scenario_runner.run(scenario, world)
+          
+          # then
+          # TODO verify_all
+        end
+        
+        it 'should notify listeners when a scenario succeeds' do
+          # given
+          world = stub_everything('world')
+          story = Story.new 'story', 'narrative' do end
+          scenario = Scenario.new story, 'scenario1' do
+            # succeeds
+          end
+          scenario_runner = ScenarioRunner.new
+          mock_listener1 = stub_everything('listener1')
+          mock_listener2 = stub_everything('listener2')
+          scenario_runner.add_listener(mock_listener1)
+          scenario_runner.add_listener(mock_listener2)
+          
+          # expect
+          mock_listener1.should_receive(:scenario_succeeded).with('story', 'scenario1')
+          mock_listener2.should_receive(:scenario_succeeded).with('story', 'scenario1')
+          
+          # when
+          scenario_runner.run(scenario, world)
+          
+          # then
+          # TODO verify_all
+        end
+        
+        it 'should notify listeners when a scenario raises an error' do
+          # given
+          error = RuntimeError.new('oops')
+          story = Story.new 'title', 'narrative' do end
+          scenario = Scenario.new story, 'scenario1' do
+          end
+          scenario_runner = ScenarioRunner.new
+          mock_listener = stub_everything('listener')
+          scenario_runner.add_listener(mock_listener)
+          world = stub_everything
+          
+          # expect
+          world.should_receive(:errors).twice.and_return([error])
+          mock_listener.should_receive(:scenario_failed).with('title', 'scenario1', error)
+          
+          # when
+          scenario_runner.run scenario, world
+          
+          # then
+          # TODO verify_all
+        end
+        
+        it 'should notify listeners when a scenario is pending' do
+          # given
+          pending_error = Spec::Example::ExamplePendingError.new('todo')
+          story = Story.new 'title', 'narrative' do end
+          scenario = Scenario.new story, 'scenario1' do
+          end
+          scenario_runner = ScenarioRunner.new
+          mock_listener = mock('listener')
+          scenario_runner.add_listener(mock_listener)
+          world = stub_everything
+          
+          # expect
+          world.should_receive(:errors).twice.and_return([pending_error])
+          mock_listener.should_receive(:scenario_started).with('title', 'scenario1')
+          mock_listener.should_receive(:scenario_pending).with('title', 'scenario1', 'todo')
+          
+          # when
+          scenario_runner.run scenario, world
+          
+          # then
+          # TODO verify_all
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,133 @@
+require File.dirname(__FILE__) + '/../story_helper'
+
+module Spec
+  module Story
+    module Runner
+      
+      describe StoryMediator do
+        before(:each) do
+          $story_mediator_spec_value = nil
+          @step_group = StepGroup.new
+          @step_group.create_matcher(:given, "given") { $story_mediator_spec_value = "given matched" }
+          @step_group.create_matcher(:when, "when") { $story_mediator_spec_value = "when matched" }
+          @step_group.create_matcher(:then, "then") { $story_mediator_spec_value = "then matched" }
+          
+          @scenario_runner = ScenarioRunner.new
+          @runner = StoryRunner.new @scenario_runner
+          @mediator = StoryMediator.new @step_group, @runner
+        end
+        
+        def run_stories
+          @mediator.run_stories
+          @runner.run_stories
+        end
+        
+        it "should have no stories" do
+          @mediator.stories.should be_empty
+        end
+        
+        it "should create two stories" do
+          @mediator.create_story "story title", "story narrative"
+          @mediator.create_story "story title 2", "story narrative 2"
+          run_stories
+          
+          @runner.should have(2).stories
+          @runner.stories.first.title.should == "story title"
+          @runner.stories.first.narrative.should == "story narrative"
+          @runner.stories.last.title.should == "story title 2"
+          @runner.stories.last.narrative.should == "story narrative 2"
+        end
+        
+        it "should create a scenario" do
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario name"
+          run_stories
+          
+          @runner.should have(1).scenarios
+          @runner.scenarios.first.name.should == "scenario name"
+          @runner.scenarios.first.story.should == @runner.stories.first
+        end
+
+        it "should create a given scenario step if one matches" do
+          pending("need to untangle the dark mysteries of the story runner - something needs to get stubbed here") do
+            story = @mediator.create_story "title", "narrative"
+            @mediator.create_scenario "previous scenario"
+            @mediator.create_scenario "current scenario"
+            @mediator.create_given_scenario "previous scenario"
+            run_stories
+          
+            $story_mediator_spec_value.should == "previous scenario matched"
+          end
+        end
+                
+        it "should create a given step if one matches" do
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario"
+          @mediator.create_given "given"
+          run_stories
+          
+          $story_mediator_spec_value.should == "given matched"
+        end
+        
+        it "should create a pending step if no given step matches" do
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario"
+          @mediator.create_given "no match"
+          mock_listener = stub_everything("listener")
+          mock_listener.should_receive(:scenario_pending).with("title", "scenario", "Unimplemented step: no match")
+          @scenario_runner.add_listener mock_listener
+          run_stories
+        end
+        
+        it "should create a when step if one matches" do
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario"
+          @mediator.create_when "when"
+          run_stories
+          
+          $story_mediator_spec_value.should == "when matched"
+        end
+        
+        it "should create a pending step if no when step matches" do
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario"
+          @mediator.create_when "no match"
+          mock_listener = stub_everything("listener")
+          mock_listener.should_receive(:scenario_pending).with("title", "scenario", "Unimplemented step: no match")
+          @scenario_runner.add_listener mock_listener
+          run_stories
+        end
+        
+        it "should create a then step if one matches" do
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario"
+          @mediator.create_then "then"
+          run_stories
+          
+          $story_mediator_spec_value.should == "then matched"
+        end
+        
+        it "should create a pending step if no 'then' step matches" do
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario"
+          @mediator.create_then "no match"
+          mock_listener = stub_everything("listener")
+          mock_listener.should_receive(:scenario_pending).with("title", "scenario", "Unimplemented step: no match")
+          @scenario_runner.add_listener mock_listener
+          run_stories
+        end
+        
+        it "should pass options to the stories it creates" do
+          @mediator = StoryMediator.new @step_group, @runner, :foo => :bar
+          @mediator.create_story "story title", "story narrative"
+
+          run_stories
+          
+          @runner.stories.first[:foo].should == :bar
+        end
+        
+      end
+      
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,384 @@
+require File.dirname(__FILE__) + '/../story_helper'
+
+module Spec
+	module Story
+		module Runner
+		  
+			describe StoryParser do
+			  before(:each) do
+			    @story_mediator = mock("story_mediator")
+		    	@parser = StoryParser.new(@story_mediator)
+			  end
+
+			  it "should parse no lines" do
+					@parser.parse([])
+			  end
+			  
+			  it "should ignore text before the first Story: begins" do
+			    @story_mediator.should_not_receive(:create_scenario)
+			    @story_mediator.should_not_receive(:create_given)
+			    @story_mediator.should_not_receive(:create_when)
+			    @story_mediator.should_not_receive(:create_then)
+			    @story_mediator.should_receive(:create_story).with("simple addition", "")
+					@parser.parse(["Here is a bunch of text", "about a calculator and all the things", "that it will do", "Story: simple addition"])
+		    end
+			  
+			  it "should create a story" do
+			    @story_mediator.should_receive(:create_story).with("simple addition", "")
+					@parser.parse(["Story: simple addition"])
+			  end
+			  
+			  it "should create a story when line has leading spaces" do
+			    @story_mediator.should_receive(:create_story).with("simple addition", "")
+					@parser.parse(["    Story: simple addition"])
+			  end
+			  
+			  it "should add a one line narrative to the story" do
+			    @story_mediator.should_receive(:create_story).with("simple addition","narrative")
+					@parser.parse(["Story: simple addition","narrative"])
+			  end
+			  
+			  it "should add a multi line narrative to the story" do
+			    @story_mediator.should_receive(:create_story).with("simple addition","narrative line 1\nline 2\nline 3")
+					@parser.parse(["Story: simple addition","narrative line 1", "line 2", "line 3"])
+			  end
+			  
+			  it "should exclude blank lines from the narrative" do
+			    @story_mediator.should_receive(:create_story).with("simple addition","narrative line 1\nline 2")
+					@parser.parse(["Story: simple addition","narrative line 1", "", "line 2"])
+			  end
+			  
+			  it "should exclude Scenario from the narrative" do
+			    @story_mediator.should_receive(:create_story).with("simple addition","narrative line 1\nline 2")
+			    @story_mediator.should_receive(:create_scenario)
+					@parser.parse(["Story: simple addition","narrative line 1", "line 2", "Scenario: add one plus one"])
+			  end
+			  
+			end
+
+			describe StoryParser, "in Story state" do
+			  before(:each) do
+			    @story_mediator = mock("story_mediator")
+		    	@parser = StoryParser.new(@story_mediator)
+			    @story_mediator.stub!(:create_story)
+			  end
+			  
+			  it "should create a second Story for Story" do
+          @story_mediator.should_receive(:create_story).with("number two","")
+					@parser.parse(["Story: s", "Story: number two"])
+			  end
+			  
+			  it "should include And in the narrative" do
+          @story_mediator.should_receive(:create_story).with("s","And foo")
+          @story_mediator.should_receive(:create_scenario).with("bar")
+					@parser.parse(["Story: s", "And foo", "Scenario: bar"])
+			  end
+			  
+			  it "should create a Scenario for Scenario" do
+          @story_mediator.should_receive(:create_scenario).with("number two")
+					@parser.parse(["Story: s", "Scenario: number two"])
+			  end
+
+			  it "should include Given in the narrative" do
+          @story_mediator.should_receive(:create_story).with("s","Given foo")
+          @story_mediator.should_receive(:create_scenario).with("bar")
+					@parser.parse(["Story: s", "Given foo", "Scenario: bar"])
+			  end
+			  
+			  it "should include Given: in the narrative" do
+          @story_mediator.should_receive(:create_story).with("s","Given: foo")
+          @story_mediator.should_receive(:create_scenario).with("bar")
+					@parser.parse(["Story: s", "Given: foo", "Scenario: bar"])
+			  end
+			  			  
+			  it "should include When in the narrative" do
+          @story_mediator.should_receive(:create_story).with("s","When foo")
+          @story_mediator.should_receive(:create_scenario).with("bar")
+					@parser.parse(["Story: s", "When foo", "Scenario: bar"])
+			  end
+			  			  
+			  it "should include Then in the narrative" do
+          @story_mediator.should_receive(:create_story).with("s","Then foo")
+          @story_mediator.should_receive(:create_scenario).with("bar")
+					@parser.parse(["Story: s", "Then foo", "Scenario: bar"])
+			  end
+			  			  
+			  it "should include other in the story" do
+          @story_mediator.should_receive(:create_story).with("s","narrative")
+					@parser.parse(["Story: s", "narrative"])
+			  end
+			end
+			
+			describe StoryParser, "in Scenario state" do
+			  before(:each) do
+			    @story_mediator = mock("story_mediator")
+		    	@parser = StoryParser.new(@story_mediator)
+			    @story_mediator.stub!(:create_story)
+			    @story_mediator.stub!(:create_scenario)
+			  end
+			  
+			  it "should create a Story for Story" do
+          @story_mediator.should_receive(:create_story).with("number two","")
+					@parser.parse(["Story: s", "Scenario: s", "Story: number two"])
+			  end
+			  
+			  it "should create a Scenario for Scenario" do
+          @story_mediator.should_receive(:create_scenario).with("number two")
+					@parser.parse(["Story: s", "Scenario: s", "Scenario: number two"])
+			  end
+
+			  it "should raise for And" do
+			    lambda {
+  					@parser.parse(["Story: s", "Scenario: s", "And second"])
+			    }.should raise_error(IllegalStepError, /^Illegal attempt to create a And after a Scenario/)
+			  end
+			  
+			  it "should create a Given for Given" do
+          @story_mediator.should_receive(:create_given).with("gift")
+					@parser.parse(["Story: s", "Scenario: s", "Given gift"])
+			  end
+			  
+			  it "should create a Given for Given:" do
+          @story_mediator.should_receive(:create_given).with("gift")
+					@parser.parse(["Story: s", "Scenario: s", "Given: gift"])
+			  end
+			  
+			  it "should create a GivenScenario for GivenScenario" do
+          @story_mediator.should_receive(:create_given_scenario).with("previous")
+					@parser.parse(["Story: s", "Scenario: s", "GivenScenario previous"])
+			  end
+			  
+			  it "should create a GivenScenario for GivenScenario:" do
+          @story_mediator.should_receive(:create_given_scenario).with("previous")
+					@parser.parse(["Story: s", "Scenario: s", "GivenScenario: previous"])
+			  end
+			  
+			  it "should transition to Given state after GivenScenario" do
+          @story_mediator.stub!(:create_given_scenario)
+					@parser.parse(["Story: s", "Scenario: s", "GivenScenario previous"])
+					@parser.instance_eval{@state}.should be_an_instance_of(StoryParser::GivenState)
+			  end
+			  
+			  it "should transition to Given state after GivenScenario:" do
+          @story_mediator.stub!(:create_given_scenario)
+					@parser.parse(["Story: s", "Scenario: s", "GivenScenario: previous"])
+					@parser.instance_eval{@state}.should be_an_instance_of(StoryParser::GivenState)
+			  end
+			  
+			  it "should create a When for When" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "When ever"])
+			  end
+			  
+			  it "should create a When for When:" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "When: ever"])
+			  end
+			  
+			  it "should create a Then for Then" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Then and there"])
+			  end
+			  
+			  it "should create a Then for Then:" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Then: and there"])
+			  end
+			  
+			  it "should ignore other" do
+					@parser.parse(["Story: s", "Scenario: s", "this is ignored"])
+			  end
+			end
+						
+			describe StoryParser, "in Given state" do
+			  before(:each) do
+			    @story_mediator = mock("story_mediator")
+		    	@parser = StoryParser.new(@story_mediator)
+			    @story_mediator.stub!(:create_story)
+			    @story_mediator.stub!(:create_scenario)
+			    @story_mediator.should_receive(:create_given).with("first")
+			  end
+			  
+			  it "should create a Story for Story" do
+          @story_mediator.should_receive(:create_story).with("number two","")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "Story: number two"])
+			  end
+			  
+			  it "should create a Scenario for Scenario" do
+          @story_mediator.should_receive(:create_scenario).with("number two")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "Scenario: number two"])
+			  end
+
+			  it "should create a second Given for Given" do
+          @story_mediator.should_receive(:create_given).with("second")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "Given second"])
+			  end
+			  
+			  it "should create a second Given for And" do
+          @story_mediator.should_receive(:create_given).with("second")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "And second"])
+			  end
+			  
+			  it "should create a second Given for And:" do
+          @story_mediator.should_receive(:create_given).with("second")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "And: second"])
+			  end
+			  
+			  it "should create a When for When" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When ever"])
+			  end
+			  
+			  it "should create a When for When:" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When: ever"])
+			  end
+			  
+			  it "should create a Then for Then" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "Then and there"])
+			  end
+			  
+			  it "should create a Then for Then:" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "Then: and there"])
+			  end
+			  
+			  it "should ignore other" do
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "this is ignored"])
+			  end
+			end
+
+			describe StoryParser, "in When state" do
+			  before(:each) do
+			    @story_mediator = mock("story_mediator")
+		    	@parser = StoryParser.new(@story_mediator)
+			    @story_mediator.stub!(:create_story)
+			    @story_mediator.stub!(:create_scenario)
+			    @story_mediator.should_receive(:create_given).with("first")
+			    @story_mediator.should_receive(:create_when).with("else")
+			  end
+			  
+			  it "should create a Story for Story" do
+          @story_mediator.should_receive(:create_story).with("number two","")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When: else", "Story: number two"])
+			  end
+			  
+			  it "should create a Scenario for Scenario" do
+          @story_mediator.should_receive(:create_scenario).with("number two")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Scenario: number two"])
+			  end
+
+			  it "should create Given for Given" do
+          @story_mediator.should_receive(:create_given).with("second")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Given second"])
+			  end
+			  
+			  it "should create Given for Given:" do
+          @story_mediator.should_receive(:create_given).with("second")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Given: second"])
+			  end
+			  
+			  it "should create a second When for When" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "When ever"])
+			  end
+			  
+			  it "should create a second When for When:" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "When: ever"])
+			  end
+			  
+			  it "should create a second When for And" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "And ever"])
+			  end
+			  
+			  it "should create a second When for And:" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "And: ever"])
+			  end
+			  
+			  it "should create a Then for Then" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then and there"])
+			  end
+			  
+			  it "should create a Then for Then:" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: and there"])
+			  end
+			  
+			  it "should ignore other" do
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "this is ignored"])
+			  end
+			end
+
+			describe StoryParser, "in Then state" do
+			  before(:each) do
+			    @story_mediator = mock("story_mediator")
+		    	@parser = StoryParser.new(@story_mediator)
+			    @story_mediator.stub!(:create_story)
+			    @story_mediator.stub!(:create_scenario)
+			    @story_mediator.should_receive(:create_given).with("first")
+			    @story_mediator.should_receive(:create_when).with("else")
+			    @story_mediator.should_receive(:create_then).with("what")
+			  end
+			  
+			  it "should create a Story for Story" do
+          @story_mediator.should_receive(:create_story).with("number two","")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Story: number two"])
+			  end
+			  
+			  it "should create a Scenario for Scenario" do
+          @story_mediator.should_receive(:create_scenario).with("number two")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Scenario: number two"])
+			  end
+
+			  it "should create Given for Given" do
+          @story_mediator.should_receive(:create_given).with("second")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Given second"])
+			  end
+			  
+			  it "should create Given for Given:" do
+          @story_mediator.should_receive(:create_given).with("second")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "Given: second"])
+			  end
+			  
+			  it "should create When for When" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "When ever"])
+			  end
+			  
+			  it "should create When for When:" do
+          @story_mediator.should_receive(:create_when).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "When: ever"])
+			  end
+
+			  it "should create a Then for Then" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "Then and there"])
+			  end
+			  
+			  it "should create a Then for Then:" do
+          @story_mediator.should_receive(:create_then).with("and there")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "Then: and there"])
+			  end
+
+			  it "should create a second Then for And" do
+          @story_mediator.should_receive(:create_then).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "And ever"])
+			  end
+			  
+			  it "should create a second Then for And:" do
+          @story_mediator.should_receive(:create_then).with("ever")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "And: ever"])
+			  end
+
+			  it "should ignore other" do
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "this is ignored"])
+			  end
+			end
+		end
+	end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,223 @@
+require File.dirname(__FILE__) + '/../story_helper'
+
+module Spec
+  module Story
+    module Runner
+      describe StoryRunner do
+        it 'should collect all the stories' do
+          # given
+          story_runner = StoryRunner.new(stub('scenario_runner'))
+          
+          # when
+          story_runner.Story 'title1', 'narrative1' do end
+          story_runner.Story 'title2', 'narrative2' do end
+          stories = story_runner.stories
+          
+          # then
+          ensure_that stories.size, is(2)
+          ensure_that stories[0].title, is('title1')
+          ensure_that stories[0].narrative, is('narrative1')
+          ensure_that stories[1].title, is('title2')
+          ensure_that stories[1].narrative, is('narrative2')
+        end
+        
+        it 'should gather all the scenarios in the stories' do
+          # given
+          story_runner = StoryRunner.new(stub('scenario_runner'))
+          
+          # when
+          story_runner.Story "story1", "narrative1" do
+            Scenario "scenario1" do end
+            Scenario "scenario2" do end
+          end
+          story_runner.Story "story2", "narrative2" do
+            Scenario "scenario3" do end
+          end
+          scenarios = story_runner.scenarios
+          
+          # then
+          ensure_that scenarios.size, is(3)
+          ensure_that scenarios[0].name, is('scenario1')
+          ensure_that scenarios[1].name, is('scenario2')
+          ensure_that scenarios[2].name, is('scenario3')
+        end
+        
+        # captures worlds passed into a ScenarioRunner
+        class ScenarioWorldCatcher
+          attr_accessor :worlds
+          def run(scenario, world)
+           (@worlds ||= [])  << world
+          end
+        end
+        
+        it 'should run each scenario in a separate object' do
+          # given
+          scenario_world_catcher = ScenarioWorldCatcher.new
+          story_runner = StoryRunner.new(scenario_world_catcher)
+          story_runner.Story 'story', 'narrative' do
+            Scenario 'scenario1' do end
+            Scenario 'scenario2' do end
+          end
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          worlds = scenario_world_catcher.worlds
+          ensure_that worlds.size, is(2)
+          worlds[0].should_not == worlds[1]
+        end
+        
+        it 'should use the provided world creator to create worlds' do
+          # given
+          stub_scenario_runner = stub_everything
+          mock_world_creator = mock('world creator')
+          story_runner = StoryRunner.new(stub_scenario_runner, mock_world_creator)
+          story_runner.Story 'story', 'narrative' do
+            Scenario 'scenario1' do end
+            Scenario 'scenario2' do end
+          end
+          
+          # expect
+          mock_world_creator.should_receive(:create).twice
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          # TODO verify_all
+        end
+        
+        it 'should notify listeners of the scenario count when the run starts' do
+          # given
+          story_runner = StoryRunner.new(stub_everything)
+          mock_listener1 = stub_everything('listener1')
+          mock_listener2 = stub_everything('listener2')
+          story_runner.add_listener(mock_listener1)
+          story_runner.add_listener(mock_listener2)
+          
+          story_runner.Story 'story1', 'narrative1' do
+            Scenario 'scenario1' do end
+          end
+          story_runner.Story 'story2', 'narrative2' do
+            Scenario 'scenario2' do end
+            Scenario 'scenario3' do end
+          end
+          
+          # expect
+          mock_listener1.should_receive(:run_started).with(3)
+          mock_listener2.should_receive(:run_started).with(3)
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          # TODO verify_all
+        end
+        
+        it 'should notify listeners when a story starts' do
+          # given
+          story_runner = StoryRunner.new(stub_everything)
+          mock_listener1 = stub_everything('listener1')
+          mock_listener2 = stub_everything('listener2')
+          story_runner.add_listener(mock_listener1)
+          story_runner.add_listener(mock_listener2)
+          
+          story_runner.Story 'story1', 'narrative1' do
+            Scenario 'scenario1' do end
+          end
+          story_runner.Story 'story2', 'narrative2' do
+            Scenario 'scenario2' do end
+            Scenario 'scenario3' do end
+          end
+          
+          # expect
+          mock_listener1.should_receive(:story_started).with('story1', 'narrative1')
+          mock_listener1.should_receive(:story_ended).with('story1', 'narrative1')
+          mock_listener2.should_receive(:story_started).with('story2', 'narrative2')
+          mock_listener2.should_receive(:story_ended).with('story2', 'narrative2')
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          # TODO verify_all
+        end
+        
+        it 'should notify listeners when the run ends' do
+          # given
+          story_runner = StoryRunner.new(stub_everything)
+          mock_listener1 = stub_everything('listener1')
+          mock_listener2 = stub_everything('listener2')
+          story_runner.add_listener mock_listener1
+          story_runner.add_listener mock_listener2
+          story_runner.Story 'story1', 'narrative1' do
+            Scenario 'scenario1' do end
+          end
+          
+          # expect
+          mock_listener1.should_receive(:run_ended)
+          mock_listener2.should_receive(:run_ended)
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          # TODO verify_all
+        end
+        
+        it 'should run a story in an instance of a specified class' do
+          # given
+          scenario_world_catcher = ScenarioWorldCatcher.new
+          story_runner = StoryRunner.new(scenario_world_catcher)
+          story_runner.Story 'title', 'narrative', :type => String do
+            Scenario 'scenario' do end
+          end
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          scenario_world_catcher.worlds[0].should be_kind_of(String)
+          scenario_world_catcher.worlds[0].should be_kind_of(World)
+        end
+        
+        it 'should pass initialization params through to the constructed instance' do
+          # given
+          scenario_world_catcher = ScenarioWorldCatcher.new
+          story_runner = StoryRunner.new(scenario_world_catcher)
+          story_runner.Story 'title', 'narrative', :type => Array, :args => [3]  do
+            Scenario 'scenario' do end
+          end
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          scenario_world_catcher.worlds[0].should be_kind_of(Array)
+          scenario_world_catcher.worlds[0].size.should == 3
+        end
+        
+        it 'should find a scenario in the current story by name' do
+          # given
+          story_runner = StoryRunner.new(ScenarioRunner.new)
+          $scenario = nil
+          
+          story_runner.Story 'title', 'narrative' do
+            Scenario 'first scenario' do
+            end
+            Scenario 'second scenario' do
+              $scenario = StoryRunner.scenario_from_current_story 'first scenario'
+            end
+          end
+          
+          # when
+          story_runner.run_stories
+          
+          # then
+          $scenario.name.should == 'first scenario'
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/runner_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/runner_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,106 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+module Spec
+  module Story
+    describe Runner, "module" do
+      def dev_null
+        io = StringIO.new
+        def io.write(str)
+          str.to_s.size
+        end
+        return io
+      end
+      
+      before :each do
+        Kernel.stub!(:at_exit)
+        @stdout, $stdout = $stdout, dev_null
+        @argv = Array.new(ARGV)
+        @runner_module = Runner.dup
+        @world_creator = World.dup
+        @runner_module.module_eval { @run_options = @story_runner = @scenario_runner = @world_creator = nil }
+      end
+      
+      after :each do
+        $stdout = @stdout
+        ARGV.replace @argv
+        @runner_module.module_eval { @run_options = @story_runner = @scenario_runner = @world_creator = nil }
+      end
+      
+      it 'should wire up a singleton StoryRunner' do
+        @runner_module.story_runner.should_not be_nil
+      end
+      
+      it 'should set its options based on ARGV' do
+        # given
+        ARGV << '--dry-run'
+        
+        # when
+        options = @runner_module.run_options
+        
+        # then
+        ensure_that options.dry_run, is(true)
+      end
+
+      it 'should add a reporter to the runner classes' do
+        # given
+        story_runner = mock('story runner', :null_object => true)
+        scenario_runner = mock('scenario runner', :null_object => true)
+        world_creator = mock('world', :null_object => true)
+        
+        @runner_module::class_eval { @world_creator = world_creator }
+        @runner_module::StoryRunner.stub!(:new).and_return(story_runner)
+        @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner)
+        
+        # expect
+        world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
+        story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
+        scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::PlainTextFormatter))
+        
+        # when
+        @runner_module.story_runner
+      end
+      
+      it 'should add a documenter to the runner classes if one is specified' do
+        # given
+        ARGV << "--format" << "html"
+        story_runner = mock('story runner', :null_object => true)
+        scenario_runner = mock('scenario runner', :null_object => true)
+        world_creator = mock('world', :null_object => true)
+        
+        @runner_module::class_eval { @world_creator = world_creator }
+        @runner_module::StoryRunner.stub!(:new).and_return(story_runner)
+        @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner)
+        
+        # expect
+        world_creator.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
+        story_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
+        scenario_runner.should_receive(:add_listener).with(an_instance_of(Spec::Runner::Formatter::Story::HtmlFormatter))
+        
+        # when
+        @runner_module.story_runner
+      end
+      
+      it 'should add any registered listener to the runner classes' do
+        # given
+        ARGV << "--format" << "html"
+        story_runner = mock('story runner', :null_object => true)
+        scenario_runner = mock('scenario runner', :null_object => true)
+        world_creator = mock('world', :null_object => true)
+        
+        @runner_module::class_eval { @world_creator = world_creator }
+        @runner_module::StoryRunner.stub!(:new).and_return(story_runner)
+        @runner_module::ScenarioRunner.stub!(:new).and_return(scenario_runner)
+        
+        listener = Object.new
+        
+        # expect
+        world_creator.should_receive(:add_listener).with(listener)
+        story_runner.should_receive(:add_listener).with(listener)
+        scenario_runner.should_receive(:add_listener).with(listener)
+        
+        # when
+        @runner_module.register_listener listener
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/scenario_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/scenario_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/scenario_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/scenario_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+module Spec
+  module Story
+    describe Scenario do
+      it 'should not raise an error if no body is supplied' do
+        # given
+        story = StoryBuilder.new.to_story
+        
+        # when
+        error = exception_from do
+          Scenario.new story, 'name'
+        end
+        
+        # then
+        error.should be_nil
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/step_group_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/step_group_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/step_group_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/step_group_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,157 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+module Spec
+  module Story
+    describe StepGroup do
+      before(:each) do
+        @step_group = StepGroup.new
+      end
+      
+      it "should not find a matcher if empty" do
+        @step_group.find(:given, "this and that").should be_nil
+      end
+      
+      it "should create a given_scenario matcher" do
+        step = @step_group.given_scenario("this and that") {}
+        @step_group.find(:given_scenario, "this and that").should_not be_nil
+        @step_group.find(:given_scenario, "this and that").should equal(step)
+      end
+      
+      it "should create a given matcher" do
+        step = @step_group.given("this and that") {}
+        @step_group.find(:given, "this and that").should equal(step)
+      end
+      
+      it "should create a when matcher" do
+        step = @step_group.when("this and that") {}
+        @step_group.find(:when, "this and that").should equal(step)
+      end
+      
+      it "should create a them matcher" do
+        step = @step_group.then("this and that") {}
+        @step_group.find(:then, "this and that").should equal(step)
+      end
+      
+      it "should add a matcher object" do
+        step = Step.new("this and that") {}
+        @step_group.add(:given, step)
+        @step_group.find(:given, "this and that").should equal(step)
+      end
+      
+      it "should add it matchers to another StepGroup (with one given)" do
+        source = StepGroup.new
+        target = StepGroup.new
+        step = source.given("this and that") {}
+        source.add_to target
+        target.find(:given, "this and that").should equal(step)
+      end
+      
+      it "should add it matchers to another StepGroup (with some of each type)" do
+        source = StepGroup.new
+        target = StepGroup.new
+        given_scenario = source.given_scenario("1") {}
+        given = source.given("1") {}
+        when1 = source.when("1") {}
+        when2 = source.when("2") {}
+        then1 = source.then("1") {}
+        then2 = source.then("2") {}
+        then3 = source.then("3") {}
+        source.add_to target
+        target.find(:given_scenario, "1").should equal(given_scenario)
+        target.find(:given, "1").should equal(given)
+        target.find(:when, "1").should equal(when1)
+        target.find(:when, "2").should equal(when2)
+        target.find(:then, "1").should equal(then1)
+        target.find(:then, "2").should equal(then2)
+        target.find(:then, "3").should equal(then3)
+      end
+      
+      it "should append another collection" do
+        matchers_to_append = StepGroup.new
+        step = matchers_to_append.given("this and that") {}
+        @step_group << matchers_to_append
+        @step_group.find(:given, "this and that").should equal(step)
+      end
+      
+      it "should append several other collections" do
+        matchers_to_append = StepGroup.new
+        more_matchers_to_append = StepGroup.new
+        first_matcher = matchers_to_append.given("this and that") {}
+        second_matcher = more_matchers_to_append.given("and the other") {}
+        @step_group << matchers_to_append
+        @step_group << more_matchers_to_append
+        @step_group.find(:given, "this and that").should equal(first_matcher)
+        @step_group.find(:given, "and the other").should equal(second_matcher)
+      end
+      
+      it "should yield itself on initialization" do
+        begin
+          $step_group_spec_step = nil
+          matchers = StepGroup.new do |matchers|
+            $step_group_spec_step = matchers.given("foo") {}
+          end
+          $step_group_spec_step.matches?("foo").should be_true
+        ensure
+          $step_group_spec_step = nil
+        end
+      end
+      
+      it "should support defaults" do
+        class StepGroupSubclass < StepGroup
+          steps do |add|
+            add.given("foo") {}
+          end
+        end
+        StepGroupSubclass.new.find(:given, "foo").should_not be_nil
+      end
+      
+      it "should create a Given" do
+        sub = Class.new(StepGroup).new
+        step = sub.Given("foo") {}
+        sub.find(:given, "foo").should == step
+      end
+      
+      it "should create a When" do
+        sub = Class.new(StepGroup).new
+        step = sub.When("foo") {}
+        sub.find(:when, "foo").should == step
+      end
+      
+      it "should create a Then" do
+        sub = Class.new(StepGroup).new
+        step = sub.Then("foo") {}
+        sub.find(:then, "foo").should == step
+      end
+      
+      it "should create steps in a block" do
+        sub = Class.new(StepGroup).new do
+          Given("a given") {}
+          When("a when") {}
+          Then("a then") {}
+        end
+        sub.find(:given, "a given").should_not be_nil
+        sub.find(:when, "a when").should_not be_nil
+        sub.find(:then, "a then").should_not be_nil
+      end
+      
+      it "should clear itself" do
+        step = @step_group.given("this and that") {}
+        @step_group.clear
+        @step_group.find(:given, "this and that").should be_nil
+      end
+      
+      it "should tell you when it is empty" do
+        @step_group.should be_empty
+      end
+      
+      it "should tell you when it is not empty" do
+        @step_group.given("this and that") {}
+        @step_group.should_not be_empty
+      end
+      
+      it "should handle << nil" do
+        @step_group << nil
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,72 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+module Spec
+  module Story
+    describe StepMother do
+      it 'should store a step by name and type' do
+        # given
+        step_mother = StepMother.new
+        step = Step.new("a given", &lambda {})
+        step_mother.store(:given, step)
+        
+        # when
+        found = step_mother.find(:given, "a given")
+        
+        # then
+        found.should == step
+      end
+      
+      it 'should NOT raise an error if a step is missing' do
+        # given
+        step_mother = StepMother.new
+        
+        # then
+        lambda do
+          # when
+          step_mother.find(:given, "doesn't exist")
+        end.should_not raise_error
+      end
+      
+      it "should create a default step which raises a pending error" do
+        # given
+        step_mother = StepMother.new
+        
+        # when
+        step = step_mother.find(:given, "doesn't exist")
+        
+        # then
+        step.should be_an_instance_of(Step)
+        
+        lambda do
+          step.perform(Object.new, "doesn't exist")
+        end.should raise_error(Spec::Example::ExamplePendingError, /Unimplemented/)
+      end
+      
+      it 'should clear itself' do
+        # given
+        step_mother = StepMother.new
+        step = Step.new("a given") do end
+        step_mother.store(:given, step)
+
+        # when
+        step_mother.clear
+        
+        # then
+        step_mother.should be_empty
+      end
+      
+      it "should use assigned steps" do
+        step_mother = StepMother.new
+        
+        step = Step.new('step') {}
+        step_group = StepGroup.new
+        step_group.add(:given, step)
+        
+        step_mother.use(step_group)
+                
+        step_mother.find(:given, "step").should equal(step)
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/step_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/step_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/step_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/step_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,142 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+module Spec
+  module Story
+    describe Step, "matching" do
+      it "should match a text string" do
+        step_matcher = Step.new("this text") {}
+        step_matcher.matches?("this text").should be_true
+      end
+      
+      it "should not match a text string that does not start the same" do
+        step_matcher = Step.new("this text") {}
+        step_matcher.matches?("Xthis text").should be_false
+      end
+      
+      it "should not match a text string that does not end the same" do
+        step_matcher = Step.new("this text") {}
+        step_matcher.matches?("this textX").should be_false
+      end
+      
+      it "should match a text string with a param" do
+        step_matcher = Step.new("this $param text") {}
+        step_matcher.matches?("this anything text").should be_true
+      end
+      
+      it "should match a text string with 3 params" do
+        step_matcher = Step.new("1 $one 2 $two 3 $three 4") {}
+        step_matcher.matches?("1 a 2 b 3 c 4").should be_true
+      end
+      
+      it "should match a text string with a param at the beginning" do
+        step_matcher = Step.new("$one 2 3") {}
+        step_matcher.matches?("a 2 3").should be_true
+      end
+      
+      it "should match a text string with a param at the end" do
+        step_matcher = Step.new("1 2 $three") {}
+        step_matcher.matches?("1 2 c").should be_true
+      end
+      
+      it "should not match a different string" do
+        step_matcher = Step.new("this text") {}
+        step_matcher.matches?("other text").should be_false
+      end
+
+      it "should match a regexp" do
+        step_matcher = Step.new(/this text/) {}
+        step_matcher.matches?("this text").should be_true
+      end
+      
+      it "should match a regexp with a match group" do
+        step_matcher = Step.new(/this (.*) text/) {}
+        step_matcher.matches?("this anything text").should be_true
+      end
+      
+      it "should not match a non matching regexp" do
+        step_matcher = Step.new(/this (.*) text/) {}
+        step_matcher.matches?("other anything text").should be_false
+      end
+      
+      it "should not get bogged down by parens in strings" do
+        step_matcher = Step.new("before () after") {}
+        step_matcher.matches?("before () after").should be_true
+      end
+      
+    end
+    
+    describe Step do
+      it "should make complain with no block" do
+        lambda {
+          step_matcher = Step.new("foo")
+        }.should raise_error
+      end
+      
+      it "should perform itself on an object" do
+        # given
+        $instance = nil
+        step = Step.new 'step' do
+          $instance = self
+        end
+        instance = Object.new
+        
+        # when
+        step.perform(instance, "step")
+        
+        # then
+        $instance.should == instance
+      end
+      
+      it "should perform itself with one parameter with match expression" do
+        # given
+        $result = nil
+        step = Step.new 'an account with $count dollars' do |count|
+          $result = count
+        end
+        instance = Object.new
+        
+        # when
+        args = step.parse_args("an account with 3 dollars")
+        step.perform(instance, *args)
+        
+        # then
+        $result.should == "3"
+      end
+      
+      it "should perform itself with one parameter without a match expression" do
+        # given
+        $result = nil
+        step = Step.new 'an account with a balance of' do |amount|
+          $result = amount
+        end
+        instance = Object.new
+        
+        # when
+        step.perform(instance, 20)
+        
+        # then
+        $result.should == 20
+      end
+      
+      it "should perform itself with 2 parameters" do
+        # given
+        $account_type = nil
+        $amount = nil
+        step = Step.new 'a $account_type account with $amount dollars' do |account_type, amount|
+          $account_type = account_type
+          $amount = amount
+        end
+        instance = Object.new
+        
+        # when
+        args = step.parse_args("a savings account with 3 dollars")
+        step.perform(instance, *args)
+        
+        # then
+        $account_type.should == "savings"
+        $amount.should == "3"
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/story_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/story_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/story_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/story_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/rspec_adapter'
+require File.dirname(__FILE__) + '/builders'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/story_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/story_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/story_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/story_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+module Spec
+  module Story
+    describe Story do
+      it 'should run itself in a given object' do
+        # given
+        $instance = nil
+        story = Story.new 'title', 'narrative' do
+          $instance = self
+        end
+        object = Object.new
+        
+        # when
+        story.run_in(object)
+        
+        # then
+        $instance.should be(object)
+      end
+      
+      it 'should not raise an error if no block is supplied' do
+        # when
+        error = exception_from do
+          Story.new 'title', 'narrative'
+        end
+        
+        # then
+        error.should be_nil
+      end
+      
+      it "should raise when error raised running in another object" do
+        #given
+        story = Story.new 'title', 'narrative' do
+          raise "this is raised in the story"
+        end
+        object = Object.new
+        
+        # when/then
+        lambda do
+          story.run_in(object)
+        end.should raise_error
+      end
+      
+      it "should use the steps it is told to using a StepGroup" do
+        story = Story.new("title", "narrative", :steps => steps = StepGroup.new) do end
+        assignee = mock("assignee")
+        assignee.should_receive(:use).with(steps)
+        story.assign_steps_to(assignee)
+      end
+
+      it "should use the steps it is told to using a key" do
+        begin
+          orig_rspec_story_steps = $rspec_story_steps
+          $rspec_story_steps = StepGroupHash.new
+          $rspec_story_steps[:foo] = steps = Object.new
+        
+          story = Story.new("title", "narrative", :steps_for => :foo) do end
+          assignee = mock("assignee")
+        
+          assignee.should_receive(:use).with(steps)
+          story.assign_steps_to(assignee)
+        ensure
+          $rspec_story_steps = orig_rspec_story_steps
+        end
+      end
+      
+      it "should use the steps it is told to using multiple keys" do
+        begin
+          orig_rspec_story_steps = $rspec_story_steps
+          $rspec_story_steps = StepGroupHash.new
+          $rspec_story_steps[:foo] = foo_steps = Object.new
+          $rspec_story_steps[:bar] = bar_steps = Object.new
+        
+          story = Story.new("title", "narrative", :steps_for => [:foo, :bar]) do end
+          assignee = mock("assignee")
+        
+          assignee.should_receive(:use).with(foo_steps)
+          assignee.should_receive(:use).with(bar_steps)
+          story.assign_steps_to(assignee)
+        ensure
+          $rspec_story_steps = orig_rspec_story_steps
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/world_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/world_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/story/world_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/story/world_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,419 @@
+require File.dirname(__FILE__) + '/story_helper'
+
+require 'spec/story'
+
+module Spec
+  module Story
+    describe World do
+      before :each do
+        World.listeners.clear
+      end
+      
+      after :each do
+        World.listeners.clear
+        World.step_mother.clear
+      end
+      
+      it 'should create an object that mixes in a World' do
+        # when
+        obj = World::create
+        
+        # then
+        obj.should be_kind_of(World)
+      end
+      
+      it 'should create a World from any object type' do
+        # when
+        obj = World::create String
+        
+        # then
+        obj.should be_kind_of(String)
+        obj.should be_kind_of(World)
+      end
+      
+      it 'should pass arguments to #new when creating an object of a specified type that mixes in a world' do
+        # given
+        Thing = Struct.new(:name, :age)
+        
+        # when
+        obj = World::create Thing, "David", "I'm not telling"
+        
+        # then
+        obj.should be_an_instance_of(Thing)
+        obj.name.should == "David"
+        obj.age.should == "I'm not telling"
+        obj.should be_kind_of(World)
+      end
+      
+      def ensure_world_executes_step(&block)
+        # given
+        obj = World::create
+        $step_ran = false
+        
+        # when
+        obj.instance_eval(&block)
+        
+        # then
+        $step_ran.should be_true
+      end
+      
+      it 'should execute a Given, When or Then step' do
+        ensure_world_executes_step do
+          Given 'a given' do
+            $step_ran = true
+          end
+        end
+        
+        ensure_world_executes_step do
+          When 'an event' do
+            $step_ran = true
+          end
+        end
+        
+        ensure_world_executes_step do
+          Then 'an outcome' do
+            $step_ran = true
+          end
+        end
+      end
+      
+      it 'should interpret Given... And... as multiple givens' do
+        # given
+        world = World.create
+        $steps = []
+        
+        # when
+        world.instance_eval do
+          Given 'step 1' do
+            $steps << 1
+          end
+          And 'step 2' do
+            $steps << 2
+          end
+        end
+        
+        # then
+        $steps.should == [1,2]
+        World.step_mother.find(:given, 'step 1').should_not be_nil
+        World.step_mother.find(:given, 'step 2').should_not be_nil
+      end
+      
+      it 'should interpret When... And... as multiple events' do
+        # given
+        world = World.create
+        $steps = []
+        
+        # when
+        world.instance_eval do
+          When 'step 1' do
+            $steps << 1
+          end
+          And 'step 2' do
+            $steps << 2
+          end
+        end
+        
+        # then
+        $steps.should == [1,2]
+        World.step_mother.find(:when, 'step 1').should_not be_nil
+        World.step_mother.find(:when, 'step 2').should_not be_nil
+      end
+      
+      it 'should interpret Then... And... as multiple outcomes' do
+        # given
+        world = World.create
+        $steps = []
+        
+        # when
+        world.instance_eval do
+          Then 'step 1' do
+            $steps << 1
+          end
+          And 'step 2' do
+            $steps << 2
+          end
+        end
+        
+        # then
+        $steps.should == [1,2]
+        World.step_mother.find(:then, 'step 1').should_not be_nil
+        World.step_mother.find(:then, 'step 2').should_not be_nil
+      end      
+      
+      it 'should reuse a given across scenarios' do
+        # given
+        $num_invoked = 0
+        a_world = World::create
+        a_world.instance_eval do
+          Given 'a given' do
+            $num_invoked += 1
+          end
+        end
+        another_world = World::create
+        
+        # when
+        another_world.instance_eval do
+          Given 'a given' # without a body
+        end
+        
+        # then
+        $num_invoked.should == 2
+      end
+      
+      it 'should reuse an event across scenarios' do
+        # given
+        $num_invoked = 0
+        a_world = World::create
+        a_world.instance_eval do
+          When 'an event' do
+            $num_invoked += 1
+          end
+        end
+        
+        another_world = World::create
+        
+        # when
+        another_world.instance_eval do
+          When 'an event' # without a body
+        end
+        
+        # then
+        $num_invoked.should == 2
+      end
+      
+      it 'should reuse an outcome across scenarios' do
+        # given
+        $num_invoked = 0
+        a_world = World::create
+        a_world.instance_eval do
+          Then 'an outcome' do
+            $num_invoked += 1
+          end
+        end
+        
+        another_world = World::create
+        
+        # when
+        another_world.instance_eval do
+          Then 'an outcome' # without a body
+        end
+        
+        # then
+        $num_invoked.should == 2
+      end
+      
+      it 'should preserve instance variables between steps within a scenario' do
+        # given
+        world = World::create
+        $first = nil
+        $second = nil
+        
+        # when
+        world.instance_eval do
+          Given 'given' do
+            @first = 'first'
+          end
+          When 'event' do
+            @second = @first # from given
+          end
+          Then 'outcome' do
+            $first = @first # from given
+            $second = @second # from event
+          end
+        end
+        
+        # then
+        ensure_that $first, is('first')
+        ensure_that $second, is('first')
+      end
+      
+      it 'should invoke a reused step in the new object instance' do
+        # given
+        $instances = []
+        $debug = true
+        world1 = World.create
+        world1.instance_eval do
+          Given 'a given' do
+            $instances << self.__id__
+          end
+        end
+        world2 = World.create
+        
+        # when
+        world2.instance_eval do
+          Given 'a given' # reused
+          Then 'an outcome' do
+            $instances << __id__
+          end
+        end
+        $debug = false
+        # then
+        $instances.should == [ world1.__id__, world2.__id__, world2.__id__ ]
+      end
+      
+      def ensure_world_collects_error(expected_error, &block)
+        # given
+        world = World.create
+        # $error = nil
+        
+        # when
+        world.start_collecting_errors
+        world.instance_eval(&block)
+        
+        # then
+        world.should have(1).errors
+        world.errors[0].should be_kind_of(expected_error)
+      end
+      
+      it 'should collect a failure from a Given step' do
+        ensure_world_collects_error RuntimeError do
+          Given 'a given' do
+            raise RuntimeError, "oops"
+          end
+        end
+      end
+      
+      it 'should collect a failure from a When step' do
+        ensure_world_collects_error RuntimeError do
+          When 'an event' do
+            raise RuntimeError, "oops"
+          end
+        end
+      end
+      
+      it 'should collect a failure from a Then step' do
+        ensure_world_collects_error RuntimeError do
+          Then 'an outcome' do
+            raise RuntimeError, "oops"
+          end
+        end
+      end
+      
+      it 'should inform listeners when it runs a Given, When or Then step' do
+        # given
+        world = World.create
+        mock_listener1 = mock('listener1')
+        mock_listener2 = mock('listener2')
+        World.add_listener(mock_listener1)
+        World.add_listener(mock_listener2)
+        
+        # expect
+        mock_listener1.should_receive(:step_succeeded).with(:given, 'a context')
+        mock_listener1.should_receive(:step_succeeded).with(:when, 'an event')
+        mock_listener1.should_receive(:step_succeeded).with(:then, 'an outcome')
+        
+        mock_listener2.should_receive(:step_succeeded).with(:given, 'a context')
+        mock_listener2.should_receive(:step_succeeded).with(:when, 'an event')
+        mock_listener2.should_receive(:step_succeeded).with(:then, 'an outcome')
+        
+        # when
+        world.instance_eval do
+          Given 'a context' do end
+          When 'an event' do end
+          Then 'an outcome' do end
+        end
+        
+        # then
+        # TODO verify_all
+      end
+      
+      it 'should tell listeners but not execute the step in dry-run mode' do
+        # given
+        Runner.stub!(:dry_run).and_return(true)
+        mock_listener = mock('listener')
+        World.add_listener(mock_listener)
+        $step_invoked = false
+        world = World.create
+        
+        # expect
+        mock_listener.should_receive(:step_succeeded).with(:given, 'a context')
+        
+        # when
+        world.instance_eval do
+          Given 'a context' do
+            $step_invoked = true
+          end
+        end
+        
+        # then
+        # TODO verify_all
+        $step_invoked.should be(false)
+      end
+        
+      it 'should suppress listeners while it runs a GivenScenario' do
+        # given
+        $scenario_ran = false
+        
+        scenario = ScenarioBuilder.new.name('a scenario').to_scenario do
+          $scenario_ran = true
+          Given 'given' do end
+          When 'event' do end
+          Then 'outcome' do end
+        end
+        
+        given_scenario = GivenScenario.new('a scenario')
+        Runner::StoryRunner.should_receive(:scenario_from_current_story).
+          with('a scenario').and_return(scenario)
+        
+        world = World.create
+        listener = mock('listener')
+        World.add_listener(listener)        
+        
+        # expect
+        listener.should_receive(:found_scenario).with(:'given scenario', 'a scenario')
+        listener.should_receive(:step_succeeded).never.with(:given, 'given')
+        listener.should_receive(:step_succeeded).never.with(:when, 'event')
+        listener.should_receive(:step_succeeded).never.with(:then, 'outcome')
+        
+        # when
+        world.GivenScenario 'a scenario'
+        
+        # then
+        # TODO verify_all
+        $scenario_ran.should be_true
+      end
+      
+      it 'should interpret GivenScenario... And... as multiple givens' do
+        # given
+        world = World.create
+        $steps = []
+
+        scenario = ScenarioBuilder.new.name('a scenario').to_scenario do
+          $steps << 1
+        end
+        Runner::StoryRunner.should_receive(:scenario_from_current_story).
+          with('a scenario').and_return(scenario)
+        
+        # when
+        world.instance_eval do
+          GivenScenario 'a scenario'
+          And 'step 2' do
+            $steps << 2
+          end
+        end
+        
+        # then
+        $steps.should == [1,2]
+        World.step_mother.find(:given, 'step 2').should_not be_nil
+      end
+      
+      it 'should provide rspec matchers' do
+        # given
+        world = World.create
+        
+        # then
+        world.instance_eval do
+          'hello'.should match(/^hello$/)
+        end
+      end
+      
+      it "should use assigned matchers" do
+        world = World.create
+        
+        World.should_receive(:use).with(steps = Object.new)
+        
+        World.use(steps)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec/translator_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/translator_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec/translator_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec/translator_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,264 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe "Translator" do
+  before do
+    @t = Spec::Translator.new
+  end
+  
+  it "should translate files" do
+    from = File.dirname(__FILE__) + '/..'
+    to = "#{Dir.tmpdir}/translated_specs"
+    @t.translate_dir(from, to)
+  end
+
+  it "should translate context_setup  do" do
+    @t.translate_line(
+      "context_setup  do\n"
+    ).should eql(
+      "before(:all)  do\n"
+    )
+  end
+
+  it "should translate context_setup  {foo}" do
+    @t.translate_line(
+      "context_setup  {foo}\n"
+    ).should eql(
+      "before(:all)  {foo}\n"
+    )
+  end
+  
+  it "should translate context ' to describe '" do
+    @t.translate_line(
+      "context 'Translator' do\n"
+    ).should eql(
+      "describe 'Translator' do\n"
+    )
+  end
+
+  it 'should translate context " to describe "' do
+    @t.translate_line(
+      'context "Translator"'
+    ).should eql(
+      'describe "Translator"'
+    )
+  end
+
+  it 'should translate spaces then context " to describe "' do
+    @t.translate_line(
+      '  context "Translator"'
+    ).should eql(
+      '  describe "Translator"'
+    )
+  end
+  
+  it "should not translate context=foo" do
+    @t.translate_line('  context=foo').should eql('  context=foo')
+  end
+
+  it "should not translate context = foo" do
+    @t.translate_line('  context = foo').should eql('  context = foo')
+  end
+
+  it "should not translate context  =  foo" do
+    @t.translate_line('  context  =  foo').should eql('  context  =  foo')
+  end
+  
+  it "should translate should_be_close" do
+    @t.translate_line('5.0.should_be_close(5.0, 0.5)').should eql('5.0.should be_close(5.0, 0.5)')
+  end
+
+  it "should translate should_not_raise" do
+    @t.translate_line('lambda { self.call }.should_not_raise').should eql('lambda { self.call }.should_not raise_error')
+  end
+
+  it "should translate should_throw" do
+    @t.translate_line('lambda { self.call }.should_throw').should eql('lambda { self.call }.should throw_symbol')
+  end
+
+  it "should not translate 0.9 should_not" do
+    @t.translate_line('@target.should_not @matcher').should eql('@target.should_not @matcher')
+  end
+
+  it "should leave should_not_receive" do
+    @t.translate_line('@mock.should_not_receive(:not_expected).with("unexpected text")').should eql('@mock.should_not_receive(:not_expected).with("unexpected text")')
+  end
+
+  it "should leave should_receive" do
+    @t.translate_line('@mock.should_receive(:not_expected).with("unexpected text")').should eql('@mock.should_receive(:not_expected).with("unexpected text")')
+  end
+  
+  it "should translate multi word predicates" do
+    @t.translate_line('foo.should_multi_word_predicate').should eql('foo.should be_multi_word_predicate')
+  end
+
+  it "should translate multi word predicates prefixed with be" do
+    @t.translate_line('foo.should_be_multi_word_predicate').should eql('foo.should be_multi_word_predicate')
+  end
+
+  it "should translate be(expected) to equal(expected)" do
+    @t.translate_line('foo.should_be :cool').should eql('foo.should equal :cool')
+  end
+
+  it "should translate instance_of" do
+    @t.translate_line('5.should_be_an_instance_of(Integer)').should eql('5.should be_an_instance_of(Integer)')
+  end
+
+  it "should translate should_be <" do
+    @t.translate_line('3.should_be < 4').should eql('3.should be < 4')
+  end
+
+  it "should translate should_be <=" do
+    @t.translate_line('3.should_be <= 4').should eql('3.should be <= 4')
+  end
+
+  it "should translate should_be >=" do
+    @t.translate_line('4.should_be >= 3').should eql('4.should be >= 3')
+  end
+
+  it "should translate should_be >" do
+    @t.translate_line('4.should_be > 3').should eql('4.should be > 3')
+  end
+
+  it "should translate should_be_happy" do
+    @t.translate_line("4.should_be_happy").should eql("4.should be_happy")
+  end
+    
+  it "should translate custom method taking regexp with parenthesis" do
+    @t.translate_line("@browser.should_contain_text(/Sn.rrunger og annet rusk/)").should eql("@browser.should be_contain_text(/Sn.rrunger og annet rusk/)")
+  end
+
+  it "should translate custom method taking regexp without parenthesis" do
+    @t.translate_line("@browser.should_contain_text /Sn.rrunger og annet rusk/\n").should eql("@browser.should be_contain_text(/Sn.rrunger og annet rusk/)\n")
+  end
+   
+  it "should translate should_not_be_nil" do
+    @t.translate_line("foo.should_not_be_nil\n").should eql("foo.should_not be_nil\n")
+  end
+    
+  it "should translate kind of" do
+    @t.translate_line('@object.should_be_kind_of(MessageExpectation)').should(
+    eql('@object.should be_kind_of(MessageExpectation)'))
+  end
+  
+  it "should translate should_be_true" do
+    @t.translate_line("foo.should_be_true\n").should eql("foo.should be_true\n")
+  end
+
+  # [#9674] spec_translate incorrectly handling shoud_match, when regexp in a var, in a block
+  # http://rubyforge.org/tracker/?func=detail&atid=3149&aid=9674&group_id=797
+  it "should translate should_match on a regexp, in a var, in a block" do
+    @t.translate_line("collection.each { |c| c.should_match a_regexp_in_a_var }\n").should eql("collection.each { |c| c.should match(a_regexp_in_a_var) }\n")
+    @t.translate_line("collection.each{|c| c.should_match a_regexp_in_a_var}\n").should eql("collection.each{|c| c.should match(a_regexp_in_a_var) }\n")
+  end
+  
+  # From Rubinius specs
+  it "should translate close_to without parens" do
+    @t.translate_line("end.should_be_close 3.14159_26535_89793_23846, TOLERANCE\n").should eql("end.should be_close(3.14159_26535_89793_23846, TOLERANCE)\n")
+  end
+
+  # [#9882] 0.9 Beta 1 - translator bugs
+  # http://rubyforge.org/tracker/index.php?func=detail&aid=9882&group_id=797&atid=3149
+  it "should support symbol arguments" do
+    @t.translate_line(
+      "lambda { sequence.parse('bar') }.should_throw :ZeroWidthParseSuccess\n"
+    ).should eql(
+      "lambda { sequence.parse('bar') }.should throw_symbol(:ZeroWidthParseSuccess)\n"
+    )
+  end
+
+  # [#9882] 0.9 Beta 1 - translator bugs
+  # http://rubyforge.org/tracker/index.php?func=detail&aid=9882&group_id=797&atid=3149
+  it "should support instance var arguments" do
+    @t.translate_line(
+      "a.should_eql @local"
+    ).should eql(
+      "a.should eql(@local)"
+    )
+  end
+
+  # [#9882] 0.9 Beta 1 - translator bugs
+  # http://rubyforge.org/tracker/index.php?func=detail&aid=9882&group_id=797&atid=3149
+  it "should support lambdas as expecteds" do
+    @t.translate_line(
+      "@parslet.should_not_eql lambda { nil }.to_parseable"
+    ).should eql(
+      "@parslet.should_not eql(lambda { nil }.to_parseable)"
+    )
+  end
+  
+  # [#9882] 0.9 Beta 1 - translator bugs
+  # http://rubyforge.org/tracker/index.php?func=detail&aid=9882&group_id=797&atid=3149
+  it "should support fully qualified names" do
+    @t.translate_line(
+      "results.should_be_kind_of SimpleASTLanguage::Identifier"
+    ).should eql(
+      "results.should be_kind_of(SimpleASTLanguage::Identifier)"
+    )
+  end
+    
+  # [#9882] 0.9 Beta 1 - translator bugs
+  # http://rubyforge.org/tracker/index.php?func=detail&aid=9882&group_id=797&atid=3149
+  # it "should leave whitespace between expression and comments" do
+  #   @t.translate_line(
+  #     "lambda { @instance.foo = foo }.should_raise NoMethodError # no writer defined"
+  #   ).should eql(
+  #     "lambda { @instance.foo = foo }.should raise_error(NoMethodError) # no writer defined"
+  #   )
+  # end
+
+  it "should translate redirects" do
+    @t.translate_line(
+      "controller.should_redirect_to 'http://not_existing_domain_for_novalis.test.host/404.html'"
+    ).should eql(
+      "controller.should redirect_to('http://not_existing_domain_for_novalis.test.host/404.html')"
+    )
+  end
+
+  it "should translate :any_args" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:any_args)"
+    ).should eql(
+      "mock.should_receive(:foo).with(any_args)"
+    )
+  end
+
+  it "should translate :anything" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:anything)"
+    ).should eql(
+      "mock.should_receive(:foo).with(anything)"
+    )
+  end
+
+  it "should translate :boolean" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:boolean)"
+    ).should eql(
+      "mock.should_receive(:foo).with(boolean)"
+    )
+  end
+
+  it "should translate :no_args" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:no_args)"
+    ).should eql(
+      "mock.should_receive(:foo).with(no_args)"
+    )
+  end
+
+  it "should translate :numeric" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:numeric)"
+    ).should eql(
+      "mock.should_receive(:foo).with(an_instance_of(Numeric))"
+    )
+  end
+
+  it "should translate :string" do
+    @t.translate_line(
+      "mock.should_receive(:foo).with(:string)"
+    ).should eql(
+      "mock.should_receive(:foo).with(an_instance_of(String))"
+    )
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec/spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec/spec/spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec/spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,77 @@
+require 'stringio'
+require 'rbconfig'
+require 'tmpdir'
+
+dir = File.dirname(__FILE__)
+lib_path = File.expand_path("#{dir}/../lib")
+$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
+$_spec_spec = true # Prevents Kernel.exit in various places
+
+require 'spec'
+require 'spec/mocks'
+spec_classes_path = File.expand_path("#{dir}/../spec/spec/spec_classes")
+require spec_classes_path unless $LOAD_PATH.include?(spec_classes_path)
+require File.dirname(__FILE__) + '/../lib/spec/expectations/differs/default'
+
+module Spec
+  module Matchers
+    def fail
+      raise_error(Spec::Expectations::ExpectationNotMetError)
+    end
+
+    def fail_with(message)
+      raise_error(Spec::Expectations::ExpectationNotMetError, message)
+    end
+
+    class Pass
+      def matches?(proc, &block)
+        begin
+          proc.call
+          true
+        rescue Exception => @error
+          false
+        end
+      end
+
+      def failure_message
+        @error.message + "\n" + @error.backtrace.join("\n")
+      end
+    end
+
+    def pass
+      Pass.new
+    end
+    
+    class CorrectlyOrderedMockExpectation
+      def initialize(&event)
+        @event = event
+      end
+      
+      def expect(&expectations)
+        expectations.call
+        @event.call
+      end
+    end
+    
+    def during(&block)
+      CorrectlyOrderedMockExpectation.new(&block) 
+    end
+  end
+end
+
+class NonStandardError < Exception; end
+
+module Custom
+  class ExampleGroupRunner
+    attr_reader :options, :arg
+    def initialize(options, arg)
+      @options, @arg = options, arg
+    end
+
+    def load_files(files)
+    end
+
+    def run
+    end
+  end  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/spec.opts technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec.opts
--- mephisto-0.7.3/vendor/plugins/rspec/spec.opts	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/spec.opts	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+--colour
+--format
+profile
+--timeout
+20
+--diff
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/all.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/all.rb
--- mephisto-0.7.3/vendor/plugins/rspec/stories/all.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/all.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,72 @@
+$LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
+require 'spec'
+require 'rbconfig'
+require 'tempfile'
+require File.dirname(__FILE__) + '/smart_match'
+
+module StoryHelper
+  def ruby(args, stderr)
+    config       = ::Config::CONFIG
+    interpreter  = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+    cmd = "#{interpreter} #{args} 2> #{stderr}"
+    #puts "\nCOMMAND: #{cmd}"
+    `#{cmd}`
+  end
+
+  def spec(args, stderr)
+    ruby("#{File.dirname(__FILE__) + '/../bin/spec'} #{args}", stderr)
+  end
+
+  def cmdline(args, stderr)
+    ruby("#{File.dirname(__FILE__) + '/cmdline.rb'} #{args}", stderr)
+  end
+  
+  Spec::Story::World.send :include, self
+end
+
+
+steps_for :rspec_and_test_unit do
+
+  Given("the file $relative_path") do |relative_path|
+    @path = File.join(File.dirname(__FILE__), relative_path)
+  end
+  When("I run it with the $interpreter") do |interpreter|
+    stderr_file = Tempfile.new('rspec')
+    stderr_file.close
+    @stdout = case(interpreter)
+      when 'ruby interpreter' then ruby(@path, stderr_file.path)
+      when 'spec script' then spec(@path, stderr_file.path)
+      when 'CommandLine object' then cmdline(@path, stderr_file.path)
+      else raise "Unknown interpreter: #{interpreter}"
+    end
+    @stderr = IO.read(stderr_file.path)
+    @exit_code = $?.to_i
+  end
+  Then("the exit code should be $exit_code") do |exit_code|
+    if @exit_code != exit_code.to_i
+      raise "Did not exit with #{exit_code}, but with #{@exit_code}. Standard error:\n#{@stderr}"
+    end
+  end
+  Then("the $stream should match $regex") do |stream, string_or_regex|
+    written = case(stream)
+      when 'stdout' then @stdout
+      when 'stderr' then @stderr
+      else raise "Unknown stream: #{stream}"
+    end
+    written.should smart_match(string_or_regex)
+  end
+  Then("the $stream should not match $regex") do |stream, string_or_regex|
+    written = case(stream)
+      when 'stdout' then @stdout
+      when 'stderr' then @stderr
+      else raise "Unknown stream: #{stream}"
+    end
+    written.should_not smart_match(string_or_regex)
+  end
+end
+
+with_steps_for :rspec_and_test_unit do
+  Dir["#{File.dirname(__FILE__)}/**"].each do |file|
+    run file if File.file?(file) && !(file =~ /\.rb$/)
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/cmdline.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/cmdline.rb
--- mephisto-0.7.3/vendor/plugins/rspec/stories/cmdline.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/cmdline.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. lib])
+require 'spec'
+
+# Uncommenting next line will break the output story (no output!!)
+# rspec_options
+options = Spec::Runner::OptionParser.parse(
+  ARGV, $stderr, $stdout
+)
+Spec::Runner::CommandLine.run(options)
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/output technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/output
--- mephisto-0.7.3/vendor/plugins/rspec/stories/output	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/output	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+Story: Getting correct output
+
+  As an RSpec user
+  I want to see output only once
+  So that I don't get confused
+
+  Scenario: Run with ruby
+    Given the file spec/simple_spec.rb
+    When I run it with the ruby interpreter
+    Then the exit code should be 0
+    And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
+    And the stdout should match "1 example, 0 failures"
+
+  Scenario: Run with CommandLine object
+    Given the file spec/simple_spec.rb
+    When I run it with the CommandLine object
+    Then the exit code should be 0
+    And the stdout should not match "Loaded suite"
+    And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
+    And the stdout should match "1 example, 0 failures"
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/smart_match.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/smart_match.rb
--- mephisto-0.7.3/vendor/plugins/rspec/stories/smart_match.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/smart_match.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+module Spec
+  module Matchers
+    class SmartMatch
+      def initialize(expected)
+        @expected = expected
+      end
+
+      def matches?(actual)
+        @actual = actual
+        # Satisfy expectation here. Return false or raise an error if it's not met.
+
+        if @expected =~ /^\/.*\/?$/ || @expected =~ /^".*"$/
+          regex_or_string = eval(@expected)
+          if Regexp === regex_or_string
+            (@actual =~ regex_or_string) ? true : false
+          else
+            @actual.index(regex_or_string) != nil
+          end
+        else
+          false
+        end
+      end
+
+      def failure_message
+        "expected #{@actual.inspect} to smart_match #{@expected.inspect}, but it didn't"
+      end
+
+      def negative_failure_message
+        "expected #{@actual.inspect} not to smart_match #{@expected.inspect}, but it did"
+      end
+    end
+
+    def smart_match(expected)
+      SmartMatch.new(expected)
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/spec/simple_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/spec/simple_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec/stories/spec/simple_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/spec/simple_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
+require 'spec'
+
+describe "Running an Example" do
+  it "should not output twice" do
+    true.should be_true
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/specs_and_test_together technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/specs_and_test_together
--- mephisto-0.7.3/vendor/plugins/rspec/stories/specs_and_test_together	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/specs_and_test_together	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,33 @@
+Story: Spec and test together
+
+  As an RSpec adopter with existing Test::Unit tests
+  I want to run a few specs alongside my existing Test::Unit tests
+  So that I can experience a smooth, gradual migration path
+
+  Scenario: Run with ruby
+    Given the file test/spec_and_test_together.rb
+
+    When I run it with the ruby interpreter
+
+    Then the exit code should be 256
+    And the stdout should match "Loaded suite"
+    And the stdout should match "test_should_fail_with_assert(NeighborlyTest)"
+    And the stdout should match "test_should_fail_with_should(NeighborlyTest)"
+    And the stdout should match "4 tests, 2 assertions, 1 failures, 1 errors"
+    And the stdout should match "Test::Unit::AssertionFailedError in 'spec should fail with assert'"
+    And the stdout should match "'spec should fail with should' FAILED"
+    And the stdout should match "4 examples, 2 failures"
+
+  Scenario: Run with spec
+    Given the file test/spec_and_test_together.rb
+
+    When I run it with the spec script
+
+    Then the exit code should be 256
+#    And the stdout should match "Loaded suite"
+#    And the stdout should match "test_should_fail_with_assert(NeighborlyTest)"
+#    And the stdout should match "test_should_fail_with_should(NeighborlyTest)"
+#    And the stdout should match "4 tests, 2 assertions, 1 failures, 1 errors"
+    And the stdout should match "Test::Unit::AssertionFailedError in 'spec should fail with assert'"
+    And the stdout should match "'spec should fail with should' FAILED"
+    And the stdout should match "4 examples, 2 failures"
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/test/spec_and_test_together.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/test/spec_and_test_together.rb
--- mephisto-0.7.3/vendor/plugins/rspec/stories/test/spec_and_test_together.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/test/spec_and_test_together.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,39 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
+require 'spec'
+require 'spec/extensions/test'
+
+describe "spec" do
+  it "should pass with assert" do
+    assert true
+  end
+
+  it "should fail with assert" do
+    assert false
+  end
+
+  it "should pass with should" do
+    1.should == 1
+  end
+
+  it "should fail with should" do
+    1.should == 2
+  end
+end
+
+class NeighborlyTest < Test::Unit::TestCase
+  def test_should_pass_with_assert
+    assert true
+  end
+  
+  def test_should_fail_with_assert
+    assert false
+  end
+
+  def test_should_pass_with_should
+    1.should == 1
+  end
+  
+  def test_should_fail_with_should
+    1.should == 2
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/test/tu_example_group_subclass_with_should_methods.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/test/tu_example_group_subclass_with_should_methods.rb
--- mephisto-0.7.3/vendor/plugins/rspec/stories/test/tu_example_group_subclass_with_should_methods.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/test/tu_example_group_subclass_with_should_methods.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
+require 'spec'
+require 'spec/extensions/test'
+
+class MySpec < Test::Unit::TestCase::ExampleGroup
+  def should_pass_with_should
+    1.should == 1
+  end
+
+  def should_fail_with_should
+    1.should == 2
+  end
+
+  def should_pass_with_assert
+    assert true
+  end
+  
+  def should_fail_with_assert
+    assert false
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/stories/tu_example_group_subclass_with_should_methods technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/tu_example_group_subclass_with_should_methods
--- mephisto-0.7.3/vendor/plugins/rspec/stories/tu_example_group_subclass_with_should_methods	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/stories/tu_example_group_subclass_with_should_methods	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,17 @@
+Story: Test::Unit::TestCase::ExampleGroup subclass with should methods
+
+  As an RSpec adopter with existing Test::Unit tests
+  I want to use should_* methods in a Test::Unit::TestCase::ExampleGroup subclass
+  So that I use RSpec with classes and methods that look more like RSpec examples
+
+  Scenario: Run with ruby
+    Given the file test/tu_example_group_subclass_with_should_methods.rb
+    When I run it with the ruby interpreter
+    Then the exit code should be 256
+    And the stdout should match "4 examples, 2 failures"
+
+  Scenario: Run with spec
+    Given the file test/tu_example_group_subclass_with_should_methods.rb
+    When I run it with the spec script
+    Then the exit code should be 256
+    And the stdout should match "4 examples, 2 failures"
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/application.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/application.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/application.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/application.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,149 @@
+var InPlaceEditor = {};
+InPlaceEditor.Local = Class.create();
+Object.extend(Object.extend(InPlaceEditor.Local.prototype, Ajax.InPlaceEditor.prototype), {
+  enterHover: function() {},
+  leaveHover: function() {},
+  onComplete: function() {},
+  handleFormSubmission: function(e) {
+    var value = $F(this._controls.editor);
+    RSpec.addStockStep(value);    
+    this.element.innerHTML = value;
+    this.leaveEditMode();
+    if (e) Event.stop(e);
+  }
+});
+
+var RSpec = {
+  stockSteps: function() {
+    return $('stock_steps').childElements().map(function(li){ 
+      return li.innerHTML;
+    }).sort();
+  },
+  
+  addStockStep: function(stockStep) {
+    if(!this.stockSteps().include(stockStep)) {
+      $('stock_steps').appendChild(Builder.node('li', {}, stockStep));
+    }
+  },
+  
+  makeParamEditors: function() {
+    $$('span.param').each(function(span) {
+      span.removeClassName('param');
+      span.addClassName('param_editor');
+      new InPlaceEditor.Local(span, null, {});
+    });
+  },
+  
+  setId: function(e) {
+    if(!this.currentId) this.currentId = 0;
+    this.currentId++;
+    e.id = "id_" + this.currentId;
+  },
+  
+  applyUi: function() {
+    this.setUpTogglers();
+    this.makeParamEditors();
+
+    var currentId = 0;
+    $$('ul.steps').each(function(ul) {
+      RSpec.setId(ul);
+      var footer = document.createElement("p");
+      var addStepLink = document.createElement("a");
+      addStepLink.href = "#";
+      addStepLink.appendChild(document.createTextNode('Add step'));
+      footer.appendChild(addStepLink);      
+      ul.parentNode.appendChild(footer);
+
+      Sortable.create(ul, {
+        scroll: window
+      });
+
+/*    Disable for now - it messes with the autocomplete's visibility (zIndex galore)  
+      Droppables.add(footer, {
+        hoverclass: 'wastebin',
+        onDrop: function(li, droppable, evt) {
+          li.remove();
+        }
+      });
+*/      
+      Event.observe(addStepLink, 'click', function() {
+        var form = Builder.node('form', {});
+        
+        var li = Builder.node('li', {className: 'new'});
+        var input = Builder.node('input', {}, 'New step here');
+        var autoComplete = Builder.node('div', {className: 'auto_complete'}, '');
+
+        li.appendChild(form);
+        form.appendChild(input);
+        form.appendChild(autoComplete);
+        ul.appendChild(li);
+        Sortable.destroy(ul);
+        Sortable.create(ul);
+
+        Event.observe(form, 'submit', function(e) {
+          var value = input.value;
+          Element.remove(this);
+          li.innerHTML = value.gsub(/(\$[a-z]*)/, '<span class="param">#{1}</span>');
+          RSpec.makeParamEditors();
+          if (e) Event.stop(e);
+        });
+
+        var ac = new Autocompleter.Local(input, autoComplete, RSpec.stockSteps(), {});
+        input.focus();
+      });
+    })
+  },
+  
+  setUpTogglers: function() {
+    $$('dt').each(function(dt) {
+      var dd = dt.parentNode.getElementsByTagName('dd')[0];
+      dt.onclick = function(){
+        dd.toggle();
+      }
+    });
+  }
+};
+
+var StoryDom = {
+  narrativeText: function(s) {
+    return s.split(/\n/m).map(function(line){
+      if(line == "" || line.match(/^\s+$/) ) {
+        return null;
+      } else {
+        return "  " + (line.gsub(/^\s+/, '').gsub(/<br \/>/, "\n").gsub(/<br>/, "\n"));
+      }
+    }).compact().join("");
+  },
+  
+  stepText: function(s) {
+    return s.gsub(/<span[^>]*>([^<]*)<\/span>/, "#{1}");
+  },
+  
+  scenario: function(dl) {
+    var scenario = '  Scenario: ' + dl.getElementsByTagName('dt')[0].innerHTML + '\n';
+    scenario += $A(dl.getElementsByTagName('li')).map(function(li){
+      return '    ' + StoryDom.stepText(li.innerHTML);
+    }).join("\n") + "\n";
+    return scenario;
+  },
+  
+  story: function() {
+    var dl = $$('dl.story')[0];
+    var story = 'Story: ' + dl.getElementsByTagName('dt')[0].innerHTML + '\n\n';
+    story += this.narrativeText(dl.getElementsByTagName('p')[0].innerHTML) + '\n';
+    story += $A(dl.getElementsByTagName('dl')).map(function(scenarioDl){
+      return StoryDom.scenario(scenarioDl);
+    }).join("\n");
+    return story;
+  },
+  
+  save: function() {
+    new Ajax.Request('stories', {
+      postBody: this.story()
+    });
+  }
+};
+
+Event.observe(window, 'load', function() {
+  RSpec.applyUi();
+});
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/builder.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/builder.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/builder.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/builder.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,136 @@
+// script.aculo.us builder.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+    
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
+    var element = parentElement.firstChild || null;
+      
+    // see if browser added wrapping tags
+    if(element && (element.tagName.toUpperCase() != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+    
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+    
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1]) 
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName.toUpperCase() != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+          }
+        } 
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return element;
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
+
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e)
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
+  dump: function(scope) { 
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
+  
+    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
+      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
+      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
+      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
+      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
+      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
+  
+    tags.each( function(tag){ 
+      scope[tag] = function() { 
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));  
+      } 
+    });
+  }
+}
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/controls.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/controls.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/controls.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/controls.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,972 @@
+// script.aculo.us controls.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+// Contributors:
+//  Richard Livsey
+//  Rahul Bhargava
+//  Rob Wills
+// 
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// Autocompleter.Base handles all the autocompletion functionality 
+// that's independent of the data source for autocompletion. This
+// includes drawing the autocompletion menu, observing keyboard
+// and mouse events, and similar.
+//
+// Specific autocompleters need to provide, at the very least, 
+// a getUpdatedChoices function that will be invoked every time
+// the text inside the monitored textbox changes. This method 
+// should get the text for which to provide autocompletion by
+// invoking this.getToken(), NOT by directly accessing
+// this.element.value. This is to allow incremental tokenized
+// autocompletion. Specific auto-completion logic (AJAX, etc)
+// belongs in getUpdatedChoices.
+//
+// Tokenized incremental autocompletion is enabled automatically
+// when an autocompleter is instantiated with the 'tokens' option
+// in the options parameter, e.g.:
+// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
+// will incrementally autocomplete with a comma as the token.
+// Additionally, ',' in the above example can be replaced with
+// a token array, e.g. { tokens: [',', '\n'] } which
+// enables autocompletion on multiple tokens. This is most 
+// useful when one of the tokens is \n (a newline), as it 
+// allows smart autocompletion after linebreaks.
+//
+// vim:expandtab ts=8 sw=2
+
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
+
+var Autocompleter = { }
+Autocompleter.Base = function() { };
+Autocompleter.Base.prototype = {
+  baseInitialize: function(element, update, options) {
+    element          = $(element)
+    this.element     = element; 
+    this.update      = $(update);  
+    this.hasFocus    = false; 
+    this.changed     = false; 
+    this.active      = false; 
+    this.index       = 0;     
+    this.entryCount  = 0;
+    this.oldElementValue = this.element.value;
+
+    if(this.setOptions)
+      this.setOptions(options);
+    else
+      this.options = options || { };
+
+    this.options.paramName    = this.options.paramName || this.element.name;
+    this.options.tokens       = this.options.tokens || [];
+    this.options.frequency    = this.options.frequency || 0.4;
+    this.options.minChars     = this.options.minChars || 1;
+    this.options.onShow       = this.options.onShow || 
+      function(element, update){ 
+        if(!update.style.position || update.style.position=='absolute') {
+          update.style.position = 'absolute';
+          Position.clone(element, update, {
+            setHeight: false, 
+            offsetTop: element.offsetHeight
+          });
+        }
+        Effect.Appear(update,{duration:0.15});
+      };
+    this.options.onHide = this.options.onHide || 
+      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
+
+    if(typeof(this.options.tokens) == 'string') 
+      this.options.tokens = new Array(this.options.tokens);
+    // Force carriage returns as token delimiters anyway
+    if (!this.options.tokens.include('\n'))
+      this.options.tokens.push('\n');
+
+    this.observer = null;
+    
+    this.element.setAttribute('autocomplete','off');
+
+    Element.hide(this.update);
+
+    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
+    Event.observe(this.element, 'keypress', this.onKeyPress.bindAsEventListener(this));
+  },
+
+  show: function() {
+    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
+    if(!this.iefix && 
+      (Prototype.Browser.IE) &&
+      (Element.getStyle(this.update, 'position')=='absolute')) {
+      new Insertion.After(this.update, 
+       '<iframe id="' + this.update.id + '_iefix" '+
+       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
+       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
+      this.iefix = $(this.update.id+'_iefix');
+    }
+    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
+  },
+  
+  fixIEOverlapping: function() {
+    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
+    this.iefix.style.zIndex = 1;
+    this.update.style.zIndex = 2;
+    Element.show(this.iefix);
+  },
+
+  hide: function() {
+    this.stopIndicator();
+    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
+    if(this.iefix) Element.hide(this.iefix);
+  },
+
+  startIndicator: function() {
+    if(this.options.indicator) Element.show(this.options.indicator);
+  },
+
+  stopIndicator: function() {
+    if(this.options.indicator) Element.hide(this.options.indicator);
+  },
+
+  onKeyPress: function(event) {
+    if(this.active)
+      switch(event.keyCode) {
+       case Event.KEY_TAB:
+       case Event.KEY_RETURN:
+         this.selectEntry();
+         Event.stop(event);
+       case Event.KEY_ESC:
+         this.hide();
+         this.active = false;
+         Event.stop(event);
+         return;
+       case Event.KEY_LEFT:
+       case Event.KEY_RIGHT:
+         return;
+       case Event.KEY_UP:
+         this.markPrevious();
+         this.render();
+         if(Prototype.Browser.WebKit) Event.stop(event);
+         return;
+       case Event.KEY_DOWN:
+         this.markNext();
+         this.render();
+         if(Prototype.Browser.WebKit) Event.stop(event);
+         return;
+      }
+     else 
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
+         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
+
+    this.changed = true;
+    this.hasFocus = true;
+
+    if(this.observer) clearTimeout(this.observer);
+      this.observer = 
+        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
+  },
+
+  activate: function() {
+    this.changed = false;
+    this.hasFocus = true;
+    this.getUpdatedChoices();
+  },
+
+  onHover: function(event) {
+    var element = Event.findElement(event, 'LI');
+    if(this.index != element.autocompleteIndex) 
+    {
+        this.index = element.autocompleteIndex;
+        this.render();
+    }
+    Event.stop(event);
+  },
+  
+  onClick: function(event) {
+    var element = Event.findElement(event, 'LI');
+    this.index = element.autocompleteIndex;
+    this.selectEntry();
+    this.hide();
+  },
+  
+  onBlur: function(event) {
+    // needed to make click events working
+    setTimeout(this.hide.bind(this), 250);
+    this.hasFocus = false;
+    this.active = false;     
+  }, 
+  
+  render: function() {
+    if(this.entryCount > 0) {
+      for (var i = 0; i < this.entryCount; i++)
+        this.index==i ? 
+          Element.addClassName(this.getEntry(i),"selected") : 
+          Element.removeClassName(this.getEntry(i),"selected");
+      if(this.hasFocus) { 
+        this.show();
+        this.active = true;
+      }
+    } else {
+      this.active = false;
+      this.hide();
+    }
+  },
+  
+  markPrevious: function() {
+    if(this.index > 0) this.index--
+      else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
+  },
+  
+  markNext: function() {
+    if(this.index < this.entryCount-1) this.index++
+      else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
+  },
+  
+  getEntry: function(index) {
+    return this.update.firstChild.childNodes[index];
+  },
+  
+  getCurrentEntry: function() {
+    return this.getEntry(this.index);
+  },
+  
+  selectEntry: function() {
+    this.active = false;
+    this.updateElement(this.getCurrentEntry());
+  },
+
+  updateElement: function(selectedElement) {
+    if (this.options.updateElement) {
+      this.options.updateElement(selectedElement);
+      return;
+    }
+    var value = '';
+    if (this.options.select) {
+      var nodes = document.getElementsByClassName(this.options.select, selectedElement) || [];
+      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
+    } else
+      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+    
+    var bounds = this.getTokenBounds();
+    if (bounds[0] != -1) {
+      var newValue = this.element.value.substr(0, bounds[0]);
+      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
+      if (whitespace)
+        newValue += whitespace[0];
+      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
+    } else {
+      this.element.value = value;
+    }
+    this.oldElementValue = this.element.value;
+    this.element.focus();
+    
+    if (this.options.afterUpdateElement)
+      this.options.afterUpdateElement(this.element, selectedElement);
+  },
+
+  updateChoices: function(choices) {
+    if(!this.changed && this.hasFocus) {
+      this.update.innerHTML = choices;
+      Element.cleanWhitespace(this.update);
+      Element.cleanWhitespace(this.update.down());
+
+      if(this.update.firstChild && this.update.down().childNodes) {
+        this.entryCount = 
+          this.update.down().childNodes.length;
+        for (var i = 0; i < this.entryCount; i++) {
+          var entry = this.getEntry(i);
+          entry.autocompleteIndex = i;
+          this.addObservers(entry);
+        }
+      } else { 
+        this.entryCount = 0;
+      }
+
+      this.stopIndicator();
+      this.index = 0;
+      
+      if(this.entryCount==1 && this.options.autoSelect) {
+        this.selectEntry();
+        this.hide();
+      } else {
+        this.render();
+      }
+    }
+  },
+
+  addObservers: function(element) {
+    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
+    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
+  },
+
+  onObserverEvent: function() {
+    this.changed = false;   
+    this.tokenBounds = null;
+    if(this.getToken().length>=this.options.minChars) {
+      this.getUpdatedChoices();
+    } else {
+      this.active = false;
+      this.hide();
+    }
+    this.oldElementValue = this.element.value;
+  },
+
+  getToken: function() {
+    var bounds = this.getTokenBounds();
+    return this.element.value.substring(bounds[0], bounds[1]).strip();
+  },
+
+  getTokenBounds: function() {
+    if (null != this.tokenBounds) return this.tokenBounds;
+    var value = this.element.value;
+    if (value.strip().empty()) return [-1, 0];
+    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
+    var offset = (diff == this.oldElementValue.length ? 1 : 0);
+    var prevTokenPos = -1, nextTokenPos = value.length;
+    var tp;
+    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
+      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
+      if (tp > prevTokenPos) prevTokenPos = tp;
+      tp = value.indexOf(this.options.tokens[index], diff + offset);
+      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
+    }
+    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
+  }
+}
+
+Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
+  var boundary = Math.min(newS.length, oldS.length);
+  for (var index = 0; index < boundary; ++index)
+    if (newS[index] != oldS[index])
+      return index;
+  return boundary;
+};
+
+Ajax.Autocompleter = Class.create();
+Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), {
+  initialize: function(element, update, url, options) {
+    this.baseInitialize(element, update, options);
+    this.options.asynchronous  = true;
+    this.options.onComplete    = this.onComplete.bind(this);
+    this.options.defaultParams = this.options.parameters || null;
+    this.url                   = url;
+  },
+
+  getUpdatedChoices: function() {
+    this.startIndicator();
+    
+    var entry = encodeURIComponent(this.options.paramName) + '=' + 
+      encodeURIComponent(this.getToken());
+
+    this.options.parameters = this.options.callback ?
+      this.options.callback(this.element, entry) : entry;
+
+    if(this.options.defaultParams) 
+      this.options.parameters += '&' + this.options.defaultParams;
+    
+    new Ajax.Request(this.url, this.options);
+  },
+
+  onComplete: function(request) {
+    this.updateChoices(request.responseText);
+  }
+
+});
+
+// The local array autocompleter. Used when you'd prefer to
+// inject an array of autocompletion options into the page, rather
+// than sending out Ajax queries, which can be quite slow sometimes.
+//
+// The constructor takes four parameters. The first two are, as usual,
+// the id of the monitored textbox, and id of the autocompletion menu.
+// The third is the array you want to autocomplete from, and the fourth
+// is the options block.
+//
+// Extra local autocompletion options:
+// - choices - How many autocompletion choices to offer
+//
+// - partialSearch - If false, the autocompleter will match entered
+//                    text only at the beginning of strings in the 
+//                    autocomplete array. Defaults to true, which will
+//                    match text at the beginning of any *word* in the
+//                    strings in the autocomplete array. If you want to
+//                    search anywhere in the string, additionally set
+//                    the option fullSearch to true (default: off).
+//
+// - fullSsearch - Search anywhere in autocomplete array strings.
+//
+// - partialChars - How many characters to enter before triggering
+//                   a partial match (unlike minChars, which defines
+//                   how many characters are required to do any match
+//                   at all). Defaults to 2.
+//
+// - ignoreCase - Whether to ignore case when autocompleting.
+//                 Defaults to true.
+//
+// It's possible to pass in a custom function as the 'selector' 
+// option, if you prefer to write your own autocompletion logic.
+// In that case, the other options above will not apply unless
+// you support them.
+
+Autocompleter.Local = Class.create();
+Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {
+  initialize: function(element, update, array, options) {
+    this.baseInitialize(element, update, options);
+    this.options.array = array;
+  },
+
+  getUpdatedChoices: function() {
+    this.updateChoices(this.options.selector(this));
+  },
+
+  setOptions: function(options) {
+    this.options = Object.extend({
+      choices: 10,
+      partialSearch: true,
+      partialChars: 2,
+      ignoreCase: true,
+      fullSearch: false,
+      selector: function(instance) {
+        var ret       = []; // Beginning matches
+        var partial   = []; // Inside matches
+        var entry     = instance.getToken();
+        var count     = 0;
+
+        for (var i = 0; i < instance.options.array.length &&  
+          ret.length < instance.options.choices ; i++) { 
+
+          var elem = instance.options.array[i];
+          var foundPos = instance.options.ignoreCase ? 
+            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
+            elem.indexOf(entry);
+
+          while (foundPos != -1) {
+            if (foundPos == 0 && elem.length != entry.length) { 
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
+                elem.substr(entry.length) + "</li>");
+              break;
+            } else if (entry.length >= instance.options.partialChars && 
+              instance.options.partialSearch && foundPos != -1) {
+              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
+                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
+                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
+                  foundPos + entry.length) + "</li>");
+                break;
+              }
+            }
+
+            foundPos = instance.options.ignoreCase ? 
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : 
+              elem.indexOf(entry, foundPos + 1);
+
+          }
+        }
+        if (partial.length)
+          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
+        return "<ul>" + ret.join('') + "</ul>";
+      }
+    }, options || { });
+  }
+});
+
+// AJAX in-place editor and collection editor
+// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
+
+// Use this if you notice weird scrolling problems on some browsers,
+// the DOM might be a bit confused when this gets called so do this
+// waits 1 ms (with setTimeout) until it does the activation
+Field.scrollFreeActivate = function(field) {
+  setTimeout(function() {
+    Field.activate(field);
+  }, 1);
+}
+
+Ajax.InPlaceEditor = Class.create();
+Object.extend(Ajax.InPlaceEditor, {
+  DefaultOptions: {
+    ajaxOptions: { },
+    autoRows: 3,                                // Use when multi-line w/ rows == 1
+    cancelControl: 'link',                      // 'link'|'button'|false
+    cancelText: 'cancel',
+    clickToEditText: 'Click to edit',
+    externalControl: null,                      // id|elt
+    externalControlOnly: false,
+    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
+    formClassName: 'inplaceeditor-form',
+    formId: null,                               // id|elt
+    highlightColor: '#ffff99',
+    highlightEndColor: '#ffffff',
+    hoverClassName: '',
+    htmlResponse: true,
+    loadingClassName: 'inplaceeditor-loading',
+    loadingText: 'Loading...',
+    okControl: 'button',                        // 'link'|'button'|false
+    okText: 'ok',
+    paramName: 'value',
+    rows: 1,                                    // If 1 and multi-line, uses autoRows
+    savingClassName: 'inplaceeditor-saving',
+    savingText: 'Saving...',
+    size: 0,
+    stripLoadedTextTags: false,
+    submitOnBlur: false,
+    textAfterControls: '',
+    textBeforeControls: '',
+    textBetweenControls: ''
+  },
+  DefaultCallbacks: {
+    callback: function(form) {
+      return Form.serialize(form);
+    },
+    onComplete: function(transport, element) {
+      // For backward compatibility, this one is bound to the IPE, and passes
+      // the element directly.  It was too often customized, so we don't break it.
+      new Effect.Highlight(element, {
+        startcolor: this.options.highlightColor, keepBackgroundImage: true });
+    },
+    onEnterEditMode: null,
+    onEnterHover: function(ipe) {
+      ipe.element.style.backgroundColor = ipe.options.highlightColor;
+      if (ipe._effect)
+        ipe._effect.cancel();
+    },
+    onFailure: function(transport, ipe) {
+      alert('Error communication with the server: ' + transport.responseText.stripTags());
+    },
+    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
+    onLeaveEditMode: null,
+    onLeaveHover: function(ipe) {
+      ipe._effect = new Effect.Highlight(ipe.element, {
+        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
+        restorecolor: ipe._originalBackground, keepBackgroundImage: true
+      });
+    }
+  },
+  Listeners: {
+    click: 'enterEditMode',
+    keydown: 'checkForEscapeOrReturn',
+    mouseover: 'enterHover',
+    mouseout: 'leaveHover'
+  }
+});
+Ajax.InPlaceEditor.prototype = {
+  initialize: function(element, url, options) {
+    this.url = url;
+    this.element = element = $(element);
+    this.prepareOptions();
+    this._controls = { };
+    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
+    Object.extend(this.options, options || { });
+    if (!this.options.formId && this.element.id) {
+      this.options.formId = this.element.id + '-inplaceeditor';
+      if ($(this.options.formId))
+        this.options.formId = '';
+    }
+    if (this.options.externalControl)
+      this.options.externalControl = $(this.options.externalControl);
+    if (!this.options.externalControl)
+      this.options.externalControlOnly = false;
+    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
+    this.element.title = this.options.clickToEditText;
+    this._boundCancelHandler = this.handleFormCancellation.bind(this);
+    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
+    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
+    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
+    this._boundWrapperHandler = this.wrapUp.bind(this);
+    this.registerListeners();
+  },
+  checkForEscapeOrReturn: function(e) {
+    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
+    if (Event.KEY_ESC == e.keyCode)
+      this.handleFormCancellation(e);
+    else if (Event.KEY_RETURN == e.keyCode)
+      this.handleFormSubmission(e);
+  },
+  createControl: function(mode, handler, extraClasses) {
+    var control = this.options[mode + 'Control'];
+    var text = this.options[mode + 'Text'];
+    if ('button' == control) {
+      var btn = document.createElement('input');
+      btn.type = 'submit';
+      btn.value = text;
+      btn.className = 'editor_' + mode + '_button';
+      if ('cancel' == mode)
+        btn.onclick = this._boundCancelHandler;
+      this._form.appendChild(btn);
+      this._controls[mode] = btn;
+    } else if ('link' == control) {
+      var link = document.createElement('a');
+      link.href = '#';
+      link.appendChild(document.createTextNode(text));
+      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
+      link.className = 'editor_' + mode + '_link';
+      if (extraClasses)
+        link.className += ' ' + extraClasses;
+      this._form.appendChild(link);
+      this._controls[mode] = link;
+    }
+  },
+  createEditField: function() {
+    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
+    var fld;
+    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
+      fld = document.createElement('input');
+      fld.type = 'text';
+      var size = this.options.size || this.options.cols || 0;
+      if (0 < size) fld.size = size;
+    } else {
+      fld = document.createElement('textarea');
+      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
+      fld.cols = this.options.cols || 40;
+    }
+    fld.name = this.options.paramName;
+    fld.value = text; // No HTML breaks conversion anymore
+    fld.className = 'editor_field';
+    if (this.options.submitOnBlur)
+      fld.onblur = this._boundSubmitHandler;
+    this._controls.editor = fld;
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+  createForm: function() {
+    var ipe = this;
+    function addText(mode, condition) {
+      var text = ipe.options['text' + mode + 'Controls'];
+      if (!text || condition === false) return;
+      ipe._form.appendChild(document.createTextNode(text));
+    };
+    this._form = $(document.createElement('form'));
+    this._form.id = this.options.formId;
+    this._form.addClassName(this.options.formClassName);
+    this._form.onsubmit = this._boundSubmitHandler;
+    this.createEditField();
+    if ('textarea' == this._controls.editor.tagName.toLowerCase())
+      this._form.appendChild(document.createElement('br'));
+    if (this.options.onFormCustomization)
+      this.options.onFormCustomization(this, this._form);
+    addText('Before', this.options.okControl || this.options.cancelControl);
+    this.createControl('ok', this._boundSubmitHandler);
+    addText('Between', this.options.okControl && this.options.cancelControl);
+    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
+    addText('After', this.options.okControl || this.options.cancelControl);
+  },
+  destroy: function() {
+    if (this._oldInnerHTML)
+      this.element.innerHTML = this._oldInnerHTML;
+    this.leaveEditMode();
+    this.unregisterListeners();
+  },
+  enterEditMode: function(e) {
+    if (this._saving || this._editing) return;
+    this._editing = true;
+    this.triggerCallback('onEnterEditMode');
+    if (this.options.externalControl)
+      this.options.externalControl.hide();
+    this.element.hide();
+    this.createForm();
+    this.element.parentNode.insertBefore(this._form, this.element);
+    if (!this.options.loadTextURL)
+      this.postProcessEditField();
+    if (e) Event.stop(e);
+  },
+  enterHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.addClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onEnterHover');
+  },
+  getText: function() {
+    return this.element.innerHTML;
+  },
+  handleAJAXFailure: function(transport) {
+    this.triggerCallback('onFailure', transport);
+    if (this._oldInnerHTML) {
+      this.element.innerHTML = this._oldInnerHTML;
+      this._oldInnerHTML = null;
+    }
+  },
+  handleFormCancellation: function(e) {
+    this.wrapUp();
+    if (e) Event.stop(e);
+  },
+  handleFormSubmission: function(e) {
+    var form = this._form;
+    var value = $F(this._controls.editor);
+    this.prepareSubmission();
+    var params = this.options.callback(form, value);
+    params = (params ? params + '&' : '?') + 'editorId=' + this.element.id;
+    if (this.options.htmlResponse) {
+      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Updater({ success: this.element }, this.url, options);
+    } else {
+      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Request(this.url, options);
+    }
+    if (e) Event.stop(e);
+  },
+  leaveEditMode: function() {
+    this.element.removeClassName(this.options.savingClassName);
+    this.removeForm();
+    this.leaveHover();
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+    if (this.options.externalControl)
+      this.options.externalControl.show();
+    this._saving = false;
+    this._editing = false;
+    this._oldInnerHTML = null;
+    this.triggerCallback('onLeaveEditMode');
+  },
+  leaveHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.removeClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onLeaveHover');
+  },
+  loadExternalText: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this._controls.editor.disabled = true;
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._form.removeClassName(this.options.loadingClassName);
+        var text = transport.responseText;
+        if (this.options.stripLoadedTextTags)
+          text = text.stripTags();
+        this._controls.editor.value = text;
+        this._controls.editor.disabled = false;
+        this.postProcessEditField();
+      }.bind(this),
+      onFailure: this._boundFailureHandler
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+  postProcessEditField: function() {
+    var fpc = this.options.fieldPostCreation;
+    if (fpc)
+      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
+  },
+  prepareOptions: function() {
+    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
+    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
+    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
+      Object.extend(this.options, defs);
+    }.bind(this));
+  },
+  prepareSubmission: function() {
+    this._saving = true;
+    this.removeForm();
+    this.leaveHover();
+    this.showSaving();
+  },
+  registerListeners: function() {
+    this._listeners = { };
+    var listener;
+    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
+      listener = this[pair.value].bind(this);
+      this._listeners[pair.key] = listener;
+      if (!this.options.externalControlOnly)
+        this.element.observe(pair.key, listener);
+      if (this.options.externalControl)
+        this.options.externalControl.observe(pair.key, listener);
+    }.bind(this));
+  },
+  removeForm: function() {
+    if (!this._form) return;
+    this._form.remove();
+    this._form = null;
+    this._controls = { };
+  },
+  showSaving: function() {
+    this._oldInnerHTML = this.element.innerHTML;
+    this.element.innerHTML = this.options.savingText;
+    this.element.addClassName(this.options.savingClassName);
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+  },
+  triggerCallback: function(cbName, arg) {
+    if ('function' == typeof this.options[cbName]) {
+      this.options[cbName](this, arg);
+    }
+  },
+  unregisterListeners: function() {
+    $H(this._listeners).each(function(pair) {
+      if (!this.options.externalControlOnly)
+        this.element.stopObserving(pair.key, pair.value);
+      if (this.options.externalControl)
+        this.options.externalControl.stopObserving(pair.key, pair.value);
+    }.bind(this));
+  },
+  wrapUp: function(transport) {
+    this.leaveEditMode();
+    // Can't use triggerCallback due to backward compatibility: requires
+    // binding + direct element
+    this._boundComplete(transport, this.element);
+  }
+};
+Object.extend(Ajax.InPlaceEditor.prototype, {
+  dispose: Ajax.InPlaceEditor.prototype.destroy
+});
+
+
+Ajax.InPlaceCollectionEditor = Class.create();
+Ajax.InPlaceCollectionEditor.DefaultOptions = {
+  loadingCollectionText: 'Loading options...'
+};
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype);
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, {
+  initialize: function(element, url, options) {
+    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
+    Ajax.InPlaceEditor.prototype.initialize.call(this, element, url, options);
+  },
+
+  createEditField: function() {
+    var list = document.createElement('select');
+    list.name = this.options.paramName;
+    list.size = 1;
+    this._controls.editor = list;
+    this._collection = this.options.collection || [];
+    if (this.options.loadCollectionURL)
+      this.loadCollection();
+    else
+      this.checkForExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+
+  loadCollection: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this.showLoadingText(this.options.loadingCollectionText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        var js = transport.responseText.strip();
+        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+          throw 'Server returned an invalid collection representation.';
+        this._collection = eval(js);
+        this.checkForExternalText();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadCollectionURL, options);
+  },
+
+  showLoadingText: function(text) {
+    this._controls.editor.disabled = true;
+    var tempOption = this._controls.editor.firstChild;
+    if (!tempOption) {
+      tempOption = document.createElement('option');
+      tempOption.value = '';
+      this._controls.editor.appendChild(tempOption);
+      tempOption.selected = true;
+    }
+    tempOption.update((text || '').stripScripts().stripTags());
+  },
+
+  checkForExternalText: function() {
+    this._text = this.getText();
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    else
+      this.buildOptionList();
+  },
+
+  loadExternalText: function() {
+    this.showLoadingText(this.options.loadingText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._text = transport.responseText.strip();
+        this.buildOptionList();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+
+  buildOptionList: function() {
+    this._form.removeClassName(this.options.loadingClassName);
+    this._collection = this._collection.map(function(entry) {
+      return 2 === entry.length ? entry : [entry, entry].flatten();
+    });
+    var marker = ('value' in this.options) ? this.options.value : this._text;
+    var textFound = this._collection.any(function(entry) {
+      return entry[0] == marker;
+    }.bind(this));
+    this._controls.editor.update('');
+    var option;
+    this._collection.each(function(entry, index) {
+      option = document.createElement('option');
+      option.value = entry[0];
+      option.selected = textFound ? entry[0] == marker : 0 == index;
+      option.appendChild(document.createTextNode(entry[1]));
+      this._controls.editor.appendChild(option);
+    }.bind(this));
+    this._controls.editor.disabled = false;
+    Field.scrollFreeActivate(this._controls.editor);
+  }
+});
+
+//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
+//**** This only  exists for a while,  in order to  let ****
+//**** users adapt to  the new API.  Read up on the new ****
+//**** API and convert your code to it ASAP!            ****
+
+Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
+  if (!options) return;
+  function fallback(name, expr) {
+    if (name in options || expr === undefined) return;
+    options[name] = expr;
+  };
+  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
+    options.cancelLink == options.cancelButton == false ? false : undefined)));
+  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
+    options.okLink == options.okButton == false ? false : undefined)));
+  fallback('highlightColor', options.highlightcolor);
+  fallback('highlightEndColor', options.highlightendcolor);
+};
+
+
+// Delayed observer, like Form.Element.Observer, 
+// but waits for delay after last key input
+// Ideal for live-search fields
+
+Form.Element.DelayedObserver = Class.create();
+Form.Element.DelayedObserver.prototype = {
+  initialize: function(element, delay, callback) {
+    this.delay     = delay || 0.5;
+    this.element   = $(element);
+    this.callback  = callback;
+    this.timer     = null;
+    this.lastValue = $F(this.element); 
+    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
+  },
+  delayedListener: function(event) {
+    if(this.lastValue == $F(this.element)) return;
+    if(this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
+    this.lastValue = $F(this.element);
+  },
+  onTimerEvent: function() {
+    this.timer = null;
+    this.callback(this.element, $F(this.element));
+  }
+};
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/dragdrop.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/dragdrop.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/dragdrop.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/dragdrop.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,976 @@
+// script.aculo.us dragdrop.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+// 
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if(Object.isUndefined(Effect))
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
+
+var Droppables = {
+  drops: [],
+
+  remove: function(element) {
+    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+  },
+
+  add: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      greedy:     true,
+      hoverclass: null,
+      tree:       false
+    }, arguments[1] || { });
+
+    // cache containers
+    if(options.containment) {
+      options._containers = [];
+      var containment = options.containment;
+      if(Object.isArray(containment)) {
+        containment.each( function(c) { options._containers.push($(c)) });
+      } else {
+        options._containers.push($(containment));
+      }
+    }
+    
+    if(options.accept) options.accept = [options.accept].flatten();
+
+    Element.makePositioned(element); // fix IE
+    options.element = element;
+
+    this.drops.push(options);
+  },
+  
+  findDeepestChild: function(drops) {
+    deepest = drops[0];
+      
+    for (i = 1; i < drops.length; ++i)
+      if (Element.isParent(drops[i].element, deepest.element))
+        deepest = drops[i];
+    
+    return deepest;
+  },
+
+  isContained: function(element, drop) {
+    var containmentNode;
+    if(drop.tree) {
+      containmentNode = element.treeNode; 
+    } else {
+      containmentNode = element.parentNode;
+    }
+    return drop._containers.detect(function(c) { return containmentNode == c });
+  },
+  
+  isAffected: function(point, element, drop) {
+    return (
+      (drop.element!=element) &&
+      ((!drop._containers) ||
+        this.isContained(element, drop)) &&
+      ((!drop.accept) ||
+        (Element.classNames(element).detect( 
+          function(v) { return drop.accept.include(v) } ) )) &&
+      Position.within(drop.element, point[0], point[1]) );
+  },
+
+  deactivate: function(drop) {
+    if(drop.hoverclass)
+      Element.removeClassName(drop.element, drop.hoverclass);
+    this.last_active = null;
+  },
+
+  activate: function(drop) {
+    if(drop.hoverclass)
+      Element.addClassName(drop.element, drop.hoverclass);
+    this.last_active = drop;
+  },
+
+  show: function(point, element) {
+    if(!this.drops.length) return;
+    var drop, affected = [];
+    
+    this.drops.each( function(drop) {
+      if(Droppables.isAffected(point, element, drop))
+        affected.push(drop);
+    });
+        
+    if(affected.length>0)
+      drop = Droppables.findDeepestChild(affected);
+
+    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
+    if (drop) {
+      Position.within(drop.element, point[0], point[1]);
+      if(drop.onHover)
+        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
+      
+      if (drop != this.last_active) Droppables.activate(drop);
+    }
+  },
+
+  fire: function(event, element) {
+    if(!this.last_active) return;
+    Position.prepare();
+
+    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
+      if (this.last_active.onDrop) {
+        this.last_active.onDrop(element, this.last_active.element, event); 
+        return true; 
+      }
+  },
+
+  reset: function() {
+    if(this.last_active)
+      this.deactivate(this.last_active);
+  }
+}
+
+var Draggables = {
+  drags: [],
+  observers: [],
+  
+  register: function(draggable) {
+    if(this.drags.length == 0) {
+      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
+      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+      
+      Event.observe(document, "mouseup", this.eventMouseUp);
+      Event.observe(document, "mousemove", this.eventMouseMove);
+      Event.observe(document, "keypress", this.eventKeypress);
+    }
+    this.drags.push(draggable);
+  },
+  
+  unregister: function(draggable) {
+    this.drags = this.drags.reject(function(d) { return d==draggable });
+    if(this.drags.length == 0) {
+      Event.stopObserving(document, "mouseup", this.eventMouseUp);
+      Event.stopObserving(document, "mousemove", this.eventMouseMove);
+      Event.stopObserving(document, "keypress", this.eventKeypress);
+    }
+  },
+  
+  activate: function(draggable) {
+    if(draggable.options.delay) { 
+      this._timeout = setTimeout(function() { 
+        Draggables._timeout = null; 
+        window.focus(); 
+        Draggables.activeDraggable = draggable; 
+      }.bind(this), draggable.options.delay); 
+    } else {
+      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+      this.activeDraggable = draggable;
+    }
+  },
+  
+  deactivate: function() {
+    this.activeDraggable = null;
+  },
+  
+  updateDrag: function(event) {
+    if(!this.activeDraggable) return;
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    // Mozilla-based browsers fire successive mousemove events with
+    // the same coordinates, prevent needless redrawing (moz bug?)
+    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
+    this._lastPointer = pointer;
+    
+    this.activeDraggable.updateDrag(event, pointer);
+  },
+  
+  endDrag: function(event) {
+    if(this._timeout) { 
+      clearTimeout(this._timeout); 
+      this._timeout = null; 
+    }
+    if(!this.activeDraggable) return;
+    this._lastPointer = null;
+    this.activeDraggable.endDrag(event);
+    this.activeDraggable = null;
+  },
+  
+  keyPress: function(event) {
+    if(this.activeDraggable)
+      this.activeDraggable.keyPress(event);
+  },
+  
+  addObserver: function(observer) {
+    this.observers.push(observer);
+    this._cacheObserverCallbacks();
+  },
+  
+  removeObserver: function(element) {  // element instead of observer fixes mem leaks
+    this.observers = this.observers.reject( function(o) { return o.element==element });
+    this._cacheObserverCallbacks();
+  },
+  
+  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
+    if(this[eventName+'Count'] > 0)
+      this.observers.each( function(o) {
+        if(o[eventName]) o[eventName](eventName, draggable, event);
+      });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
+  },
+  
+  _cacheObserverCallbacks: function() {
+    ['onStart','onEnd','onDrag'].each( function(eventName) {
+      Draggables[eventName+'Count'] = Draggables.observers.select(
+        function(o) { return o[eventName]; }
+      ).length;
+    });
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var Draggable = Class.create();
+Draggable._dragging    = { };
+
+Draggable.prototype = {
+  initialize: function(element) {
+    var defaults = {
+      handle: false,
+      reverteffect: function(element, top_offset, left_offset) {
+        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
+        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
+          queue: {scope:'_draggable', position:'end'}
+        });
+      },
+      endeffect: function(element) {
+        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
+          queue: {scope:'_draggable', position:'end'},
+          afterFinish: function(){ 
+            Draggable._dragging[element] = false 
+          }
+        }); 
+      },
+      zindex: 1000,
+      revert: false,
+      quiet: false,
+      scroll: false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
+      delay: 0
+    };
+    
+    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
+      Object.extend(defaults, {
+        starteffect: function(element) {
+          element._opacity = Element.getOpacity(element);
+          Draggable._dragging[element] = true;
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
+        }
+      });
+    
+    var options = Object.extend(defaults, arguments[1] || { });
+
+    this.element = $(element);
+    
+    if(options.handle && Object.isString(options.handle))
+      this.handle = this.element.down('.'+options.handle, 0);
+    
+    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = this.element;
+    
+    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
+      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
+
+    Element.makePositioned(this.element); // fix IE    
+
+    this.options  = options;
+    this.dragging = false;   
+
+    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
+    Event.observe(this.handle, "mousedown", this.eventMouseDown);
+    
+    Draggables.register(this);
+  },
+  
+  destroy: function() {
+    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
+    Draggables.unregister(this);
+  },
+  
+  currentDelta: function() {
+    return([
+      parseInt(Element.getStyle(this.element,'left') || '0'),
+      parseInt(Element.getStyle(this.element,'top') || '0')]);
+  },
+  
+  initDrag: function(event) {
+    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
+      Draggable._dragging[this.element]) return;
+    if(Event.isLeftClick(event)) {    
+      // abort on form elements, fixes a Firefox issue
+      var src = Event.element(event);
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
+        
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      var pos     = Position.cumulativeOffset(this.element);
+      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
+      
+      Draggables.activate(this);
+      Event.stop(event);
+    }
+  },
+  
+  startDrag: function(event) {
+    this.dragging = true;
+    if(!this.delta)
+      this.delta = this.currentDelta();
+    
+    if(this.options.zindex) {
+      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+      this.element.style.zIndex = this.options.zindex;
+    }
+    
+    if(this.options.ghosting) {
+      this._clone = this.element.cloneNode(true);
+      this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+      if (!this.element._originallyAbsolute)
+        Position.absolutize(this.element);
+      this.element.parentNode.insertBefore(this._clone, this.element);
+    }
+    
+    if(this.options.scroll) {
+      if (this.options.scroll == window) {
+        var where = this._getWindowScroll(this.options.scroll);
+        this.originalScrollLeft = where.left;
+        this.originalScrollTop = where.top;
+      } else {
+        this.originalScrollLeft = this.options.scroll.scrollLeft;
+        this.originalScrollTop = this.options.scroll.scrollTop;
+      }
+    }
+    
+    Draggables.notify('onStart', this, event);
+        
+    if(this.options.starteffect) this.options.starteffect(this.element);
+  },
+  
+  updateDrag: function(event, pointer) {
+    if(!this.dragging) this.startDrag(event);
+    
+    if(!this.options.quiet){
+      Position.prepare();
+      Droppables.show(pointer, this.element);
+    }
+    
+    Draggables.notify('onDrag', this, event);
+    
+    this.draw(pointer);
+    if(this.options.change) this.options.change(this);
+    
+    if(this.options.scroll) {
+      this.stopScrolling();
+      
+      var p;
+      if (this.options.scroll == window) {
+        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
+      } else {
+        p = Position.page(this.options.scroll);
+        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
+        p[1] += this.options.scroll.scrollTop + Position.deltaY;
+        p.push(p[0]+this.options.scroll.offsetWidth);
+        p.push(p[1]+this.options.scroll.offsetHeight);
+      }
+      var speed = [0,0];
+      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
+      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
+      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
+      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
+      this.startScrolling(speed);
+    }
+    
+    // fix AppleWebKit rendering
+    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
+    
+    Event.stop(event);
+  },
+  
+  finishDrag: function(event, success) {
+    this.dragging = false;
+    
+    if(this.options.quiet){
+      Position.prepare();
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      Droppables.show(pointer, this.element);
+    }
+
+    if(this.options.ghosting) {
+      if (!this.element._originallyAbsolute)
+        Position.relativize(this.element);
+      delete this.element._originallyAbsolute;
+      Element.remove(this._clone);
+      this._clone = null;
+    }
+
+    var dropped = false; 
+    if(success) { 
+      dropped = Droppables.fire(event, this.element); 
+      if (!dropped) dropped = false; 
+    }
+    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
+    Draggables.notify('onEnd', this, event);
+
+    var revert = this.options.revert;
+    if(revert && Object.isFunction(revert)) revert = revert(this.element);
+    
+    var d = this.currentDelta();
+    if(revert && this.options.reverteffect) {
+      if (dropped == 0 || revert != 'failure')
+        this.options.reverteffect(this.element,
+          d[1]-this.delta[1], d[0]-this.delta[0]);
+    } else {
+      this.delta = d;
+    }
+
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
+
+    if(this.options.endeffect) 
+      this.options.endeffect(this.element);
+      
+    Draggables.deactivate(this);
+    Droppables.reset();
+  },
+  
+  keyPress: function(event) {
+    if(event.keyCode!=Event.KEY_ESC) return;
+    this.finishDrag(event, false);
+    Event.stop(event);
+  },
+  
+  endDrag: function(event) {
+    if(!this.dragging) return;
+    this.stopScrolling();
+    this.finishDrag(event, true);
+    Event.stop(event);
+  },
+  
+  draw: function(point) {
+    var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
+    
+    var d = this.currentDelta();
+    pos[0] -= d[0]; pos[1] -= d[1];
+    
+    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
+      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
+      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
+    }
+    
+    var p = [0,1].map(function(i){ 
+      return (point[i]-pos[i]-this.offset[i]) 
+    }.bind(this));
+    
+    if(this.options.snap) {
+      if(Object.isFunction(this.options.snap)) {
+        p = this.options.snap(p[0],p[1],this);
+      } else {
+      if(Object.isArray(this.options.snap)) {
+        p = p.map( function(v, i) {
+          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
+      } else {
+        p = p.map( function(v) {
+          return (v/this.options.snap).round()*this.options.snap }.bind(this))
+      }
+    }}
+    
+    var style = this.element.style;
+    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
+      style.left = p[0] + "px";
+    if((!this.options.constraint) || (this.options.constraint=='vertical'))
+      style.top  = p[1] + "px";
+    
+    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+  
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+      Draggables._lastScrollPointer = null;
+    }
+  },
+  
+  startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+  
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    if(this.options.scroll == window) {
+      with (this._getWindowScroll(this.options.scroll)) {
+        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+          var d = delta / 1000;
+          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
+        }
+      }
+    } else {
+      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    }
+    
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    if (this._isScrollChild) {
+      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+      if (Draggables._lastScrollPointer[0] < 0)
+        Draggables._lastScrollPointer[0] = 0;
+      if (Draggables._lastScrollPointer[1] < 0)
+        Draggables._lastScrollPointer[1] = 0;
+      this.draw(Draggables._lastScrollPointer);
+    }
+    
+    if(this.options.change) this.options.change(this);
+  },
+  
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
+  }
+}
+
+/*--------------------------------------------------------------------------*/
+
+var SortableObserver = Class.create();
+SortableObserver.prototype = {
+  initialize: function(element, observer) {
+    this.element   = $(element);
+    this.observer  = observer;
+    this.lastValue = Sortable.serialize(this.element);
+  },
+  
+  onStart: function() {
+    this.lastValue = Sortable.serialize(this.element);
+  },
+  
+  onEnd: function() {
+    Sortable.unmark();
+    if(this.lastValue != Sortable.serialize(this.element))
+      this.observer(this.element)
+  }
+}
+
+var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+  
+  sortables: { },
+  
+  _findRootElement: function(element) {
+    while (element.tagName.toUpperCase() != "BODY") {  
+      if(element.id && Sortable.sortables[element.id]) return element;
+      element = element.parentNode;
+    }
+  },
+
+  options: function(element) {
+    element = Sortable._findRootElement($(element));
+    if(!element) return;
+    return Sortable.sortables[element.id];
+  },
+  
+  destroy: function(element){
+    var s = Sortable.options(element);
+    
+    if(s) {
+      Draggables.removeObserver(s.element);
+      s.droppables.each(function(d){ Droppables.remove(d) });
+      s.draggables.invoke('destroy');
+      
+      delete Sortable.sortables[s.element.id];
+    }
+  },
+
+  create: function(element) {
+    element = $(element);
+    var options = Object.extend({ 
+      element:     element,
+      tag:         'li',       // assumes li children, override with tag: 'tagname'
+      dropOnEmpty: false,
+      tree:        false,
+      treeTag:     'ul',
+      overlap:     'vertical', // one of 'vertical', 'horizontal'
+      constraint:  'vertical', // one of 'vertical', 'horizontal', false
+      containment: element,    // also takes array of elements (or id's); or false
+      handle:      false,      // or a CSS class
+      only:        false,
+      delay:       0,
+      hoverclass:  null,
+      ghosting:    false,
+      quiet:       false, 
+      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      format:      this.SERIALIZE_RULE,
+      
+      // these take arrays of elements or ids and can be 
+      // used for better initialization performance
+      elements:    false,
+      handles:     false,
+      
+      onChange:    Prototype.emptyFunction,
+      onUpdate:    Prototype.emptyFunction
+    }, arguments[1] || { });
+
+    // clear any old sortable with same element
+    this.destroy(element);
+
+    // build options for the draggables
+    var options_for_draggable = {
+      revert:      true,
+      quiet:       options.quiet,
+      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
+      ghosting:    options.ghosting,
+      constraint:  options.constraint,
+      handle:      options.handle };
+
+    if(options.starteffect)
+      options_for_draggable.starteffect = options.starteffect;
+
+    if(options.reverteffect)
+      options_for_draggable.reverteffect = options.reverteffect;
+    else
+      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
+        element.style.top  = 0;
+        element.style.left = 0;
+      };
+
+    if(options.endeffect)
+      options_for_draggable.endeffect = options.endeffect;
+
+    if(options.zindex)
+      options_for_draggable.zindex = options.zindex;
+
+    // build options for the droppables  
+    var options_for_droppable = {
+      overlap:     options.overlap,
+      containment: options.containment,
+      tree:        options.tree,
+      hoverclass:  options.hoverclass,
+      onHover:     Sortable.onHover
+    }
+    
+    var options_for_tree = {
+      onHover:      Sortable.onEmptyHover,
+      overlap:      options.overlap,
+      containment:  options.containment,
+      hoverclass:   options.hoverclass
+    }
+
+    // fix for gecko engine
+    Element.cleanWhitespace(element); 
+
+    options.draggables = [];
+    options.droppables = [];
+
+    // drop on empty handling
+    if(options.dropOnEmpty || options.tree) {
+      Droppables.add(element, options_for_tree);
+      options.droppables.push(element);
+    }
+
+    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
+      var handle = options.handles ? $(options.handles[i]) :
+        (options.handle ? $(e).getElementsByClassName(options.handle)[0] : e); 
+      options.draggables.push(
+        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
+      Droppables.add(e, options_for_droppable);
+      if(options.tree) e.treeNode = element;
+      options.droppables.push(e);      
+    });
+    
+    if(options.tree) {
+      (Sortable.findTreeElements(element, options) || []).each( function(e) {
+        Droppables.add(e, options_for_tree);
+        e.treeNode = element;
+        options.droppables.push(e);
+      });
+    }
+
+    // keep reference
+    this.sortables[element.id] = options;
+
+    // for onupdate
+    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
+
+  },
+
+  // return all suitable-for-sortable elements in a guaranteed order
+  findElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.tag);
+  },
+  
+  findTreeElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.treeTag);
+  },
+
+  onHover: function(element, dropon, overlap) {
+    if(Element.isParent(dropon, element)) return;
+
+    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
+      return;
+    } else if(overlap>0.5) {
+      Sortable.mark(dropon, 'before');
+      if(dropon.previousSibling != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, dropon);
+        if(dropon.parentNode!=oldParentNode) 
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    } else {
+      Sortable.mark(dropon, 'after');
+      var nextElement = dropon.nextSibling || null;
+      if(nextElement != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, nextElement);
+        if(dropon.parentNode!=oldParentNode) 
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    }
+  },
+  
+  onEmptyHover: function(element, dropon, overlap) {
+    var oldParentNode = element.parentNode;
+    var droponOptions = Sortable.options(dropon);
+        
+    if(!Element.isParent(dropon, element)) {
+      var index;
+      
+      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
+      var child = null;
+            
+      if(children) {
+        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+        
+        for (index = 0; index < children.length; index += 1) {
+          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
+            offset -= Element.offsetSize (children[index], droponOptions.overlap);
+          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
+            child = index + 1 < children.length ? children[index + 1] : null;
+            break;
+          } else {
+            child = children[index];
+            break;
+          }
+        }
+      }
+      
+      dropon.insertBefore(element, child);
+      
+      Sortable.options(oldParentNode).onChange(element);
+      droponOptions.onChange(element);
+    }
+  },
+
+  unmark: function() {
+    if(Sortable._marker) Sortable._marker.hide();
+  },
+
+  mark: function(dropon, position) {
+    // mark on ghosting only
+    var sortable = Sortable.options(dropon.parentNode);
+    if(sortable && !sortable.ghosting) return; 
+
+    if(!Sortable._marker) {
+      Sortable._marker = 
+        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
+          hide().addClassName('dropmarker').setStyle({position:'absolute'});
+      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
+    }    
+    var offsets = Position.cumulativeOffset(dropon);
+    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
+    
+    if(position=='after')
+      if(sortable.overlap == 'horizontal') 
+        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
+      else
+        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+    
+    Sortable._marker.show();
+  },
+  
+  _tree: function(element, options, parent) {
+    var children = Sortable.findElements(element, options) || [];
+  
+    for (var i = 0; i < children.length; ++i) {
+      var match = children[i].id.match(options.format);
+
+      if (!match) continue;
+      
+      var child = {
+        id: encodeURIComponent(match ? match[1] : null),
+        element: element,
+        parent: parent,
+        children: [],
+        position: parent.children.length,
+        container: $(children[i]).down(options.treeTag)
+      }
+      
+      /* Get the element containing the children and recurse over it */
+      if (child.container)
+        this._tree(child.container, options, child)
+      
+      parent.children.push (child);
+    }
+
+    return parent; 
+  },
+
+  tree: function(element) {
+    element = $(element);
+    var sortableOptions = this.options(element);
+    var options = Object.extend({
+      tag: sortableOptions.tag,
+      treeTag: sortableOptions.treeTag,
+      only: sortableOptions.only,
+      name: element.id,
+      format: sortableOptions.format
+    }, arguments[1] || { });
+    
+    var root = {
+      id: null,
+      parent: null,
+      children: [],
+      container: element,
+      position: 0
+    }
+    
+    return Sortable._tree(element, options, root);
+  },
+
+  /* Construct a [i] index for a particular node */
+  _constructIndex: function(node) {
+    var index = '';
+    do {
+      if (node.id) index = '[' + node.position + ']' + index;
+    } while ((node = node.parent) != null);
+    return index;
+  },
+
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || { });
+    
+    return $(this.findElements(element, options) || []).map( function(item) {
+      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+    });
+  },
+
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || { });
+    
+    var nodeMap = { };
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+   
+    new_sequence.each(function(ident) {
+      var n = nodeMap[ident];
+      if (n) {
+        n[1].appendChild(n[0]);
+        delete nodeMap[ident];
+      }
+    });
+  },
+  
+  serialize: function(element) {
+    element = $(element);
+    var options = Object.extend(Sortable.options(element), arguments[1] || { });
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
+    
+    if (options.tree) {
+      return Sortable.tree(element, arguments[1]).children.map( function (item) {
+        return [name + Sortable._constructIndex(item) + "[id]=" + 
+                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
+      }).flatten().join('&');
+    } else {
+      return Sortable.sequence(element, arguments[1]).map( function(item) {
+        return name + "[]=" + encodeURIComponent(item);
+      }).join('&');
+    }
+  }
+}
+
+// Returns true if child is contained within element
+Element.isParent = function(child, element) {
+  if (!child.parentNode || child == element) return false;
+  if (child.parentNode == element) return true;
+  return Element.isParent(child.parentNode, element);
+}
+
+Element.findChildren = function(element, only, recursive, tagName) {   
+  if(!element.hasChildNodes()) return null;
+  tagName = tagName.toUpperCase();
+  if(only) only = [only].flatten();
+  var elements = [];
+  $A(element.childNodes).each( function(e) {
+    if(e.tagName && e.tagName.toUpperCase()==tagName &&
+      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
+        elements.push(e);
+    if(recursive) {
+      var grandchildren = Element.findChildren(e, only, recursive, tagName);
+      if(grandchildren) elements.push(grandchildren);
+    }
+  });
+
+  return (elements.length>0 ? elements.flatten() : []);
+}
+
+Element.offsetSize = function (element, type) {
+  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
+}
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/effects.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/effects.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/effects.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/effects.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,1117 @@
+// script.aculo.us effects.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Contributors:
+//  Justin Palmer (http://encytemedia.com/)
+//  Mark Pilgrim (http://diveintomark.org/)
+//  Martin Bialasinki
+// 
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/ 
+
+// converts rgb() and #xxx to #xxxxxx format,  
+// returns self (or first argument) if not convertable  
+String.prototype.parseColor = function() {  
+  var color = '#';
+  if (this.slice(0,4) == 'rgb(') {  
+    var cols = this.slice(4,this.length-1).split(',');  
+    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
+  } else {  
+    if (this.slice(0,1) == '#') {  
+      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
+      if (this.length==7) color = this.toLowerCase();  
+    }  
+  }  
+  return (color.length==7 ? color : (arguments[0] || this));  
+};
+
+/*--------------------------------------------------------------------------*/
+
+Element.collectTextNodes = function(element) {  
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue : 
+      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
+  }).flatten().join('');
+};
+
+Element.collectTextNodesIgnoreClass = function(element, className) {  
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue : 
+      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
+        Element.collectTextNodesIgnoreClass(node, className) : ''));
+  }).flatten().join('');
+};
+
+Element.setContentZoom = function(element, percent) {
+  element = $(element);  
+  element.setStyle({fontSize: (percent/100) + 'em'});   
+  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+  return element;
+};
+
+Element.getInlineOpacity = function(element){
+  return $(element).style.opacity || '';
+};
+
+Element.forceRerendering = function(element) {
+  try {
+    element = $(element);
+    var n = document.createTextNode(' ');
+    element.appendChild(n);
+    element.removeChild(n);
+  } catch(e) { }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
+  Transitions: {
+    linear: Prototype.K,
+    sinoidal: function(pos) {
+      return (-Math.cos(pos*Math.PI)/2) + 0.5;
+    },
+    reverse: function(pos) {
+      return 1-pos;
+    },
+    flicker: function(pos) {
+      var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+      return pos > 1 ? 1 : pos;
+    },
+    wobble: function(pos) {
+      return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+    },
+    pulse: function(pos, pulses) { 
+      pulses = pulses || 5; 
+      return (
+        ((pos % (1/pulses)) * pulses).round() == 0 ? 
+              ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 
+          1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
+        );
+    },
+    spring: function(pos) { 
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); 
+    },
+    none: function(pos) {
+      return 0;
+    },
+    full: function(pos) {
+      return 1;
+    }
+  },
+  DefaultOptions: {
+    duration:   1.0,   // seconds
+    fps:        100,   // 100= assume 66fps max.
+    sync:       false, // true for combining
+    from:       0.0,
+    to:         1.0,
+    delay:      0.0,
+    queue:      'parallel'
+  },
+  tagifyText: function(element) {
+    var tagifyStyle = 'position:relative';
+    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
+    
+    element = $(element);
+    $A(element.childNodes).each( function(child) {
+      if (child.nodeType==3) {
+        child.nodeValue.toArray().each( function(character) {
+          element.insertBefore(
+            new Element('span', {style: tagifyStyle}).update(
+              character == ' ' ? String.fromCharCode(160) : character), 
+              child);
+        });
+        Element.remove(child);
+      }
+    });
+  },
+  multiple: function(element, effect) {
+    var elements;
+    if (((typeof element == 'object') || 
+        Object.isFunction(element)) && 
+       (element.length))
+      elements = element;
+    else
+      elements = $(element).childNodes;
+      
+    var options = Object.extend({
+      speed: 0.1,
+      delay: 0.0
+    }, arguments[2] || { });
+    var masterDelay = options.delay;
+
+    $A(elements).each( function(element, index) {
+      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
+    });
+  },
+  PAIRS: {
+    'slide':  ['SlideDown','SlideUp'],
+    'blind':  ['BlindDown','BlindUp'],
+    'appear': ['Appear','Fade']
+  },
+  toggle: function(element, effect) {
+    element = $(element);
+    effect = (effect || 'appear').toLowerCase();
+    var options = Object.extend({
+      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
+    }, arguments[2] || { });
+    Effect[element.visible() ? 
+      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
+  }
+};
+
+Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
+
+/* ------------- core effects ------------- */
+
+Effect.ScopedQueue = Class.create(Enumerable, {
+  initialize: function() {
+    this.effects  = [];
+    this.interval = null;    
+  },
+  _each: function(iterator) {
+    this.effects._each(iterator);
+  },
+  add: function(effect) {
+    var timestamp = new Date().getTime();
+    
+    var position = Object.isString(effect.options.queue) ? 
+      effect.options.queue : effect.options.queue.position;
+    
+    switch(position) {
+      case 'front':
+        // move unstarted effects after this effect  
+        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
+            e.startOn  += effect.finishOn;
+            e.finishOn += effect.finishOn;
+          });
+        break;
+      case 'with-last':
+        timestamp = this.effects.pluck('startOn').max() || timestamp;
+        break;
+      case 'end':
+        // start effect after last queued effect has finished
+        timestamp = this.effects.pluck('finishOn').max() || timestamp;
+        break;
+    }
+    
+    effect.startOn  += timestamp;
+    effect.finishOn += timestamp;
+
+    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
+      this.effects.push(effect);
+    
+    if (!this.interval)
+      this.interval = setInterval(this.loop.bind(this), 15);
+  },
+  remove: function(effect) {
+    this.effects = this.effects.reject(function(e) { return e==effect });
+    if (this.effects.length == 0) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+  },
+  loop: function() {
+    var timePos = new Date().getTime();
+    for(var i=0, len=this.effects.length;i<len;i++) 
+      this.effects[i] && this.effects[i].loop(timePos);
+  }
+});
+
+Effect.Queues = {
+  instances: $H(),
+  get: function(queueName) {
+    if (!Object.isString(queueName)) return queueName;
+    
+    if (!this.instances[queueName])
+      this.instances[queueName] = new Effect.ScopedQueue();
+      
+    return this.instances[queueName];
+  }
+};
+Effect.Queue = Effect.Queues.get('global');
+
+Effect.Base = Class.create();
+Effect.Base.prototype = {
+  position: null,
+  start: function(options) {
+    function codeForEvent(options,eventName){
+      return (
+        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
+        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
+      );
+    }
+    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
+    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
+    this.currentFrame = 0;
+    this.state        = 'idle';
+    this.startOn      = this.options.delay*1000;
+    this.finishOn     = this.startOn+(this.options.duration*1000);
+    this.fromToDelta  = this.options.to-this.options.from;
+    this.totalTime    = this.finishOn-this.startOn;
+    this.totalFrames  = this.options.fps*this.options.duration;
+    
+    eval('this.render = function(pos){ '+
+      'if (this.state=="idle"){this.state="running";'+
+      codeForEvent(this.options,'beforeSetup')+
+      (this.setup ? 'this.setup();':'')+ 
+      codeForEvent(this.options,'afterSetup')+
+      '};if (this.state=="running"){'+
+      'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
+      'this.position=pos;'+
+      codeForEvent(this.options,'beforeUpdate')+
+      (this.update ? 'this.update(pos);':'')+
+      codeForEvent(this.options,'afterUpdate')+
+      '}}');
+    
+    this.event('beforeStart');
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ? 
+        'global' : this.options.queue.scope).add(this);
+  },
+  loop: function(timePos) {
+    if (timePos >= this.startOn) {
+      if (timePos >= this.finishOn) {
+        this.render(1.0);
+        this.cancel();
+        this.event('beforeFinish');
+        if (this.finish) this.finish(); 
+        this.event('afterFinish');
+        return;  
+      }
+      var pos   = (timePos - this.startOn) / this.totalTime,
+          frame = (pos * this.totalFrames).round();
+      if (frame > this.currentFrame) {
+        this.render(pos);
+        this.currentFrame = frame;
+      }
+    }
+  },
+  cancel: function() {
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ? 
+        'global' : this.options.queue.scope).remove(this);
+    this.state = 'finished';
+  },
+  event: function(eventName) {
+    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
+    if (this.options[eventName]) this.options[eventName](this);
+  },
+  inspect: function() {
+    var data = $H();
+    for(property in this)
+      if (!Object.isFunction(this[property])) data[property] = this[property];
+    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
+  }
+};
+
+Effect.Parallel = Class.create(Effect.Base, {
+  initialize: function(effects) {
+    this.effects = effects || [];
+    this.start(arguments[1]);
+  },
+  update: function(position) {
+    this.effects.invoke('render', position);
+  },
+  finish: function(position) {
+    this.effects.each( function(effect) {
+      effect.render(1.0);
+      effect.cancel();
+      effect.event('beforeFinish');
+      if (effect.finish) effect.finish(position);
+      effect.event('afterFinish');
+    });
+  }
+});
+
+Effect.Tween = Class.create(Effect.Base, {
+  initialize: function(object, from, to) {
+    object = Object.isString(object) ? $(object) : object;
+    var args = $A(arguments), method = args.last(), 
+      options = args.length == 5 ? args[3] : null;
+    this.method = Object.isFunction(method) ? method.bind(object) :
+      Object.isFunction(object[method]) ? object[method].bind(object) : 
+      function(value) { object[method] = value };
+    this.start(Object.extend({ from: from, to: to }, options || { }));
+  },
+  update: function(position) {
+    this.method(position);
+  }
+});
+
+Effect.Event = Class.create(Effect.Base, {
+  initialize: function() {
+    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
+  },
+  update: Prototype.emptyFunction
+});
+
+Effect.Opacity = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    // make this work on IE on elements without 'layout'
+    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+      this.element.setStyle({zoom: 1});
+    var options = Object.extend({
+      from: this.element.getOpacity() || 0.0,
+      to:   1.0
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  update: function(position) {
+    this.element.setOpacity(position);
+  }
+});
+
+Effect.Move = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      x:    0,
+      y:    0,
+      mode: 'relative'
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.element.makePositioned();
+    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
+    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
+    if (this.options.mode == 'absolute') {
+      this.options.x = this.options.x - this.originalLeft;
+      this.options.y = this.options.y - this.originalTop;
+    }
+  },
+  update: function(position) {
+    this.element.setStyle({
+      left: (this.options.x  * position + this.originalLeft).round() + 'px',
+      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
+    });
+  }
+});
+
+// for backwards compatibility
+Effect.MoveBy = function(element, toTop, toLeft) {
+  return new Effect.Move(element, 
+    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
+};
+
+Effect.Scale = Class.create(Effect.Base, {
+  initialize: function(element, percent) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      scaleX: true,
+      scaleY: true,
+      scaleContent: true,
+      scaleFromCenter: false,
+      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
+      scaleFrom: 100.0,
+      scaleTo:   percent
+    }, arguments[2] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
+    this.elementPositioning = this.element.getStyle('position');
+    
+    this.originalStyle = { };
+    ['top','left','width','height','fontSize'].each( function(k) {
+      this.originalStyle[k] = this.element.style[k];
+    }.bind(this));
+      
+    this.originalTop  = this.element.offsetTop;
+    this.originalLeft = this.element.offsetLeft;
+    
+    var fontSize = this.element.getStyle('font-size') || '100%';
+    ['em','px','%','pt'].each( function(fontSizeType) {
+      if (fontSize.indexOf(fontSizeType)>0) {
+        this.fontSize     = parseFloat(fontSize);
+        this.fontSizeType = fontSizeType;
+      }
+    }.bind(this));
+    
+    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
+    
+    this.dims = null;
+    if (this.options.scaleMode=='box')
+      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
+    if (/^content/.test(this.options.scaleMode))
+      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
+    if (!this.dims)
+      this.dims = [this.options.scaleMode.originalHeight,
+                   this.options.scaleMode.originalWidth];
+  },
+  update: function(position) {
+    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
+    if (this.options.scaleContent && this.fontSize)
+      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
+    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
+  },
+  finish: function(position) {
+    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
+  },
+  setDimensions: function(height, width) {
+    var d = { };
+    if (this.options.scaleX) d.width = width.round() + 'px';
+    if (this.options.scaleY) d.height = height.round() + 'px';
+    if (this.options.scaleFromCenter) {
+      var topd  = (height - this.dims[0])/2;
+      var leftd = (width  - this.dims[1])/2;
+      if (this.elementPositioning == 'absolute') {
+        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
+        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
+      } else {
+        if (this.options.scaleY) d.top = -topd + 'px';
+        if (this.options.scaleX) d.left = -leftd + 'px';
+      }
+    }
+    this.element.setStyle(d);
+  }
+});
+
+Effect.Highlight = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    // Prevent executing on elements not in the layout flow
+    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
+    // Disable background image during the effect
+    this.oldStyle = { };
+    if (!this.options.keepBackgroundImage) {
+      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
+      this.element.setStyle({backgroundImage: 'none'});
+    }
+    if (!this.options.endcolor)
+      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
+    if (!this.options.restorecolor)
+      this.options.restorecolor = this.element.getStyle('background-color');
+    // init color calculations
+    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
+    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
+  },
+  update: function(position) {
+    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
+      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
+  },
+  finish: function() {
+    this.element.setStyle(Object.extend(this.oldStyle, {
+      backgroundColor: this.options.restorecolor
+    }));
+  }
+});
+
+Effect.ScrollTo = function(element) {
+  var options = arguments[1] || { },
+    scrollOffsets = document.viewport.getScrollOffsets(),
+    elementOffsets = $(element).cumulativeOffset(),
+    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();  
+
+  if (options.offset) elementOffsets[1] += options.offset;
+
+  return new Effect.Tween(null,
+    scrollOffsets.top,
+    elementOffsets[1] > max ? max : elementOffsets[1],
+    options,
+    function(p){ scrollTo(scrollOffsets.left, p.round()) }
+  );
+};
+
+/* ------------- combination effects ------------- */
+
+Effect.Fade = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  var options = Object.extend({
+    from: element.getOpacity() || 1.0,
+    to:   0.0,
+    afterFinishInternal: function(effect) { 
+      if (effect.options.to!=0) return;
+      effect.element.hide().setStyle({opacity: oldOpacity}); 
+    }
+  }, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Appear = function(element) {
+  element = $(element);
+  var options = Object.extend({
+  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
+  to:   1.0,
+  // force Safari to render floated elements properly
+  afterFinishInternal: function(effect) {
+    effect.element.forceRerendering();
+  },
+  beforeSetup: function(effect) {
+    effect.element.setOpacity(effect.options.from).show(); 
+  }}, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Puff = function(element) {
+  element = $(element);
+  var oldStyle = { 
+    opacity: element.getInlineOpacity(), 
+    position: element.getStyle('position'),
+    top:  element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height
+  };
+  return new Effect.Parallel(
+   [ new Effect.Scale(element, 200, 
+      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), 
+     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], 
+     Object.extend({ duration: 1.0, 
+      beforeSetupInternal: function(effect) {
+        Position.absolutize(effect.effects[0].element)
+      },
+      afterFinishInternal: function(effect) {
+         effect.effects[0].element.hide().setStyle(oldStyle); }
+     }, arguments[1] || { })
+   );
+};
+
+Effect.BlindUp = function(element) {
+  element = $(element);
+  element.makeClipping();
+  return new Effect.Scale(element, 0,
+    Object.extend({ scaleContent: false, 
+      scaleX: false, 
+      restoreAfterFinish: true,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping();
+      } 
+    }, arguments[1] || { })
+  );
+};
+
+Effect.BlindDown = function(element) {
+  element = $(element);
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({ 
+    scaleContent: false, 
+    scaleX: false,
+    scaleFrom: 0,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
+    },  
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping();
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.SwitchOff = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  return new Effect.Appear(element, Object.extend({
+    duration: 0.4,
+    from: 0,
+    transition: Effect.Transitions.flicker,
+    afterFinishInternal: function(effect) {
+      new Effect.Scale(effect.element, 1, { 
+        duration: 0.3, scaleFromCenter: true,
+        scaleX: false, scaleContent: false, restoreAfterFinish: true,
+        beforeSetup: function(effect) { 
+          effect.element.makePositioned().makeClipping();
+        },
+        afterFinishInternal: function(effect) {
+          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
+        }
+      })
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.DropOut = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left'),
+    opacity: element.getInlineOpacity() };
+  return new Effect.Parallel(
+    [ new Effect.Move(element, {x: 0, y: 100, sync: true }), 
+      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
+    Object.extend(
+      { duration: 0.5,
+        beforeSetup: function(effect) {
+          effect.effects[0].element.makePositioned(); 
+        },
+        afterFinishInternal: function(effect) {
+          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
+        } 
+      }, arguments[1] || { }));
+};
+
+Effect.Shake = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left') };
+    return new Effect.Move(element, 
+      { x:  20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
+        effect.element.undoPositioned().setStyle(oldStyle);
+  }}) }}) }}) }}) }}) }});
+};
+
+Effect.SlideDown = function(element) {
+  element = $(element).cleanWhitespace();
+  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({ 
+    scaleContent: false, 
+    scaleX: false, 
+    scaleFrom: window.opera ? 0 : 1,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
+    },
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' }); 
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
+    }, arguments[1] || { })
+  );
+};
+
+Effect.SlideUp = function(element) {
+  element = $(element).cleanWhitespace();
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, window.opera ? 0 : 1,
+   Object.extend({ scaleContent: false, 
+    scaleX: false, 
+    scaleMode: 'box',
+    scaleFrom: 100,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().show();
+    },  
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
+    }
+   }, arguments[1] || { })
+  );
+};
+
+// Bug in opera makes the TD containing this element expand for a instance after finish 
+Effect.Squish = function(element) {
+  return new Effect.Scale(element, window.opera ? 1 : 0, { 
+    restoreAfterFinish: true,
+    beforeSetup: function(effect) {
+      effect.element.makeClipping(); 
+    },  
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping(); 
+    }
+  });
+};
+
+Effect.Grow = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.full
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();    
+  var initialMoveX, initialMoveY;
+  var moveX, moveY;
+  
+  switch (options.direction) {
+    case 'top-left':
+      initialMoveX = initialMoveY = moveX = moveY = 0; 
+      break;
+    case 'top-right':
+      initialMoveX = dims.width;
+      initialMoveY = moveY = 0;
+      moveX = -dims.width;
+      break;
+    case 'bottom-left':
+      initialMoveX = moveX = 0;
+      initialMoveY = dims.height;
+      moveY = -dims.height;
+      break;
+    case 'bottom-right':
+      initialMoveX = dims.width;
+      initialMoveY = dims.height;
+      moveX = -dims.width;
+      moveY = -dims.height;
+      break;
+    case 'center':
+      initialMoveX = dims.width / 2;
+      initialMoveY = dims.height / 2;
+      moveX = -dims.width / 2;
+      moveY = -dims.height / 2;
+      break;
+  }
+  
+  return new Effect.Move(element, {
+    x: initialMoveX,
+    y: initialMoveY,
+    duration: 0.01, 
+    beforeSetup: function(effect) {
+      effect.element.hide().makeClipping().makePositioned();
+    },
+    afterFinishInternal: function(effect) {
+      new Effect.Parallel(
+        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
+          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
+          new Effect.Scale(effect.element, 100, {
+            scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, 
+            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
+        ], Object.extend({
+             beforeSetup: function(effect) {
+               effect.effects[0].element.setStyle({height: '0px'}).show(); 
+             },
+             afterFinishInternal: function(effect) {
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); 
+             }
+           }, options)
+      )
+    }
+  });
+};
+
+Effect.Shrink = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.none
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();
+  var moveX, moveY;
+  
+  switch (options.direction) {
+    case 'top-left':
+      moveX = moveY = 0;
+      break;
+    case 'top-right':
+      moveX = dims.width;
+      moveY = 0;
+      break;
+    case 'bottom-left':
+      moveX = 0;
+      moveY = dims.height;
+      break;
+    case 'bottom-right':
+      moveX = dims.width;
+      moveY = dims.height;
+      break;
+    case 'center':  
+      moveX = dims.width / 2;
+      moveY = dims.height / 2;
+      break;
+  }
+  
+  return new Effect.Parallel(
+    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
+      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
+      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
+    ], Object.extend({            
+         beforeStartInternal: function(effect) {
+           effect.effects[0].element.makePositioned().makeClipping(); 
+         },
+         afterFinishInternal: function(effect) {
+           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
+       }, options)
+  );
+};
+
+Effect.Pulsate = function(element) {
+  element = $(element);
+  var options    = arguments[1] || { };
+  var oldOpacity = element.getInlineOpacity();
+  var transition = options.transition || Effect.Transitions.sinoidal;
+  var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
+  reverser.bind(transition);
+  return new Effect.Opacity(element, 
+    Object.extend(Object.extend({  duration: 2.0, from: 0,
+      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
+    }, options), {transition: reverser}));
+};
+
+Effect.Fold = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height };
+  element.makeClipping();
+  return new Effect.Scale(element, 5, Object.extend({   
+    scaleContent: false,
+    scaleX: false,
+    afterFinishInternal: function(effect) {
+    new Effect.Scale(element, 1, { 
+      scaleContent: false, 
+      scaleY: false,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping().setStyle(oldStyle);
+      } });
+  }}, arguments[1] || { }));
+};
+
+Effect.Morph = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      style: { }
+    }, arguments[1] || { });
+    
+    if (!Object.isString(options.style)) this.style = $H(options.style);
+    else {
+      if (options.style.include(':'))
+        this.style = options.style.parseStyle();
+      else {
+        this.element.addClassName(options.style);
+        this.style = $H(this.element.getStyles());
+        this.element.removeClassName(options.style);
+        var css = this.element.getStyles();
+        this.style = this.style.reject(function(style) {
+          return style.value == css[style.key];
+        });
+        options.afterFinishInternal = function(effect) {
+          effect.element.addClassName(effect.options.style);
+          effect.transforms.each(function(transform) {
+            effect.element.style[transform.style] = '';
+          });
+        }
+      }
+    }
+    this.start(options);
+  },
+  
+  setup: function(){
+    function parseColor(color){
+      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
+      color = color.parseColor();
+      return $R(0,2).map(function(i){
+        return parseInt( color.slice(i*2+1,i*2+3), 16 ) 
+      });
+    }
+    this.transforms = this.style.map(function(pair){
+      var property = pair[0], value = pair[1], unit = null;
+
+      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
+        value = value.parseColor();
+        unit  = 'color';
+      } else if (property == 'opacity') {
+        value = parseFloat(value);
+        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+          this.element.setStyle({zoom: 1});
+      } else if (Element.CSS_LENGTH.test(value)) {
+          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
+          value = parseFloat(components[1]);
+          unit = (components.length == 3) ? components[2] : null;
+      }
+
+      var originalValue = this.element.getStyle(property);
+      return { 
+        style: property.camelize(), 
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
+        targetValue: unit=='color' ? parseColor(value) : value,
+        unit: unit
+      };
+    }.bind(this)).reject(function(transform){
+      return (
+        (transform.originalValue == transform.targetValue) ||
+        (
+          transform.unit != 'color' &&
+          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
+        )
+      )
+    });
+  },
+  update: function(position) {
+    var style = { }, transform, i = this.transforms.length;
+    while(i--)
+      style[(transform = this.transforms[i]).style] = 
+        transform.unit=='color' ? '#'+
+          (Math.round(transform.originalValue[0]+
+            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
+          (Math.round(transform.originalValue[1]+
+            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
+          (Math.round(transform.originalValue[2]+
+            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
+        (transform.originalValue +
+          (transform.targetValue - transform.originalValue) * position).toFixed(3) + 
+            (transform.unit === null ? '' : transform.unit);
+    this.element.setStyle(style, true);
+  }
+});
+
+Effect.Transform = Class.create({
+  initialize: function(tracks){
+    this.tracks  = [];
+    this.options = arguments[1] || { };
+    this.addTracks(tracks);
+  },
+  addTracks: function(tracks){
+    tracks.each(function(track){
+      var data = $H(track).values().first();
+      this.tracks.push($H({
+        ids:     $H(track).keys().first(),
+        effect:  Effect.Morph,
+        options: { style: data }
+      }));
+    }.bind(this));
+    return this;
+  },
+  play: function(){
+    return new Effect.Parallel(
+      this.tracks.map(function(track){
+        var elements = [$(track.ids) || $$(track.ids)].flatten();
+        return elements.map(function(e){ return new track.effect(e, Object.extend({ sync:true }, track.options)) });
+      }).flatten(),
+      this.options
+    );
+  }
+});
+
+Element.CSS_PROPERTIES = $w(
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 
+  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
+  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
+  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
+  'fontSize fontWeight height left letterSpacing lineHeight ' +
+  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
+  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
+  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
+  'right textIndent top width wordSpacing zIndex');
+  
+Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
+
+String.__parseStyleElement = document.createElement('div');
+String.prototype.parseStyle = function(){
+  var style, styleRules = $H();
+  if (Prototype.Browser.WebKit)
+    style = new Element('div',{style:this}).style;
+  else {
+    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
+    style = String.__parseStyleElement.childNodes[0].style;
+  }
+  
+  Element.CSS_PROPERTIES.each(function(property){
+    if (style[property]) styleRules[property] = style[property]; 
+  });
+  
+  if (Prototype.Browser.IE && this.include('opacity'))
+    styleRules.opacity = this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1];
+
+  return styleRules;
+};
+
+if (document.defaultView && document.defaultView.getComputedStyle) {
+  Element.getStyles = function(element) {
+    var css = document.defaultView.getComputedStyle($(element), null);
+    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
+      styles[property] = css[property];
+      return styles;
+    });
+  };
+} else {
+  Element.getStyles = function(element) {
+    element = $(element);
+    var css = element.currentStyle, styles;
+    styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
+      hash[property] = css[property];
+      return hash;
+    });
+    if (!styles.opacity) styles.opacity = element.getOpacity();
+    return styles;
+  };
+};
+
+Effect.Methods = {
+  morph: function(element, style) {
+    element = $(element);
+    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
+    return element;
+  },
+  visualEffect: function(element, effect, options) {
+    element = $(element)
+    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
+    new Effect[klass](element, options);
+    return element;
+  },
+  highlight: function(element, options) {
+    element = $(element);
+    new Effect.Highlight(element, options);
+    return element;
+  }
+};
+
+$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
+  'pulsate shake puff squish switchOff dropOut').each(
+  function(effect) { 
+    Effect.Methods[effect] = function(element, options){
+      element = $(element);
+      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
+      return element;
+    }
+  }
+);
+
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( 
+  function(f) { Effect.Methods[f] = Element[f]; }
+);
+
+Element.addMethods(Effect.Methods);
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/prototype.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/prototype.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/prototype.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/prototype.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4140 @@
+/*  Prototype JavaScript framework, version 1.6.0_rc0
+ *  (c) 2005-2007 Sam Stephenson
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Prototype web site: http://www.prototypejs.org/
+ *
+ *--------------------------------------------------------------------------*/
+
+var Prototype = {
+  Version: '1.6.0_rc0',
+
+  Browser: {
+    IE:     !!(window.attachEvent && !window.opera),
+    Opera:  !!window.opera,
+    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
+    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
+  },
+
+  BrowserFeatures: {
+    XPath: !!document.evaluate,
+    ElementExtensions: !!window.HTMLElement,
+    SpecificElementExtensions:
+      document.createElement('div').__proto__ !==
+       document.createElement('form').__proto__
+  },
+
+  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
+  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
+
+  emptyFunction: function() { },
+  K: function(x) { return x }
+};
+
+if (Prototype.Browser.MobileSafari)
+  Prototype.BrowserFeatures.SpecificElementExtensions = false;
+
+/* Based on Alex Arnell's inheritance implementation. */
+var Class = {
+  create: function() {
+    var parent = null, properties = $A(arguments);
+    if (Object.isFunction(properties[0]))
+      parent = properties.shift();
+
+    function klass() {
+      this.initialize.apply(this, arguments);
+    }
+
+    Object.extend(klass, Class.Methods);
+    klass.superclass = parent;
+    klass.subclasses = [];
+
+    if (parent) {
+      var subclass = function() { };
+      subclass.prototype = parent.prototype;
+      klass.prototype = new subclass;
+      parent.subclasses.push(klass);
+    }
+
+    for (var i = 0; i < properties.length; i++)
+      klass.addMethods(properties[i]);
+
+    if (!klass.prototype.initialize)
+      klass.prototype.initialize = Prototype.emptyFunction;
+
+    klass.prototype.constructor = klass;
+
+    return klass;
+  }
+};
+
+Class.Methods = {
+  addMethods: function(source) {
+    var ancestor = this.superclass && this.superclass.prototype;
+
+    for (var property in source) {
+      var value = source[property];
+      if (ancestor && Object.isFunction(value) &&
+          value.argumentNames().first() == "$super") {
+        var method = value, value = Object.extend((function(m) {
+          return function() { return ancestor[m].apply(this, arguments) };
+        })(property).wrap(method), {
+          valueOf:  function() { return method },
+          toString: function() { return method.toString() }
+        });
+      }
+      this.prototype[property] = value;
+    }
+
+    return this;
+  }
+};
+
+var Abstract = { };
+
+Object.extend = function(destination, source) {
+  for (var property in source)
+    destination[property] = source[property];
+  return destination;
+};
+
+Object.extend(Object, {
+  inspect: function(object) {
+    try {
+      if (object === undefined) return 'undefined';
+      if (object === null) return 'null';
+      return object.inspect ? object.inspect() : object.toString();
+    } catch (e) {
+      if (e instanceof RangeError) return '...';
+      throw e;
+    }
+  },
+
+  toJSON: function(object) {
+    var type = typeof object;
+    switch (type) {
+      case 'undefined':
+      case 'function':
+      case 'unknown': return;
+      case 'boolean': return object.toString();
+    }
+
+    if (object === null) return 'null';
+    if (object.toJSON) return object.toJSON();
+    if (Object.isElement(object)) return;
+
+    var results = [];
+    for (var property in object) {
+      var value = Object.toJSON(object[property]);
+      if (value !== undefined)
+        results.push(property.toJSON() + ': ' + value);
+    }
+
+    return '{' + results.join(', ') + '}';
+  },
+
+  toHTML: function(object) {
+    return object && object.toHTML ? object.toHTML() : String.interpret(object);
+  },
+
+  keys: function(object) {
+    var keys = [];
+    for (var property in object)
+      keys.push(property);
+    return keys;
+  },
+
+  values: function(object) {
+    var values = [];
+    for (var property in object)
+      values.push(object[property]);
+    return values;
+  },
+
+  clone: function(object) {
+    return Object.extend({ }, object);
+  },
+
+  isElement: function(object) {
+    return object && object.nodeType == 1;
+  },
+
+  isArray: function(object) {
+    return object && object.constructor === Array;
+  },
+
+  isFunction: function(object) {
+    return typeof object == "function";
+  },
+
+  isString: function(object) {
+    return typeof object == "string";
+  },
+
+  isNumber: function(object) {
+    return typeof object == "number";
+  },
+
+  isUndefined: function(object) {
+    return typeof object == "undefined";
+  }
+});
+
+Object.extend(Function.prototype, {
+  argumentNames: function() {
+    var names = this.toString().match(/^[\s\(]*function\s*\((.*?)\)/)[1].split(",").invoke("strip");
+    return names.length == 1 && !names[0] ? [] : names;
+  },
+
+  bind: function() {
+    if (arguments.length < 2 && arguments[0] === undefined) return this;
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function() {
+      return __method.apply(object, args.concat($A(arguments)));
+    }
+  },
+
+  bindAsEventListener: function() {
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function(event) {
+      return __method.apply(object, [event || window.event].concat(args));
+    }
+  },
+
+  curry: function() {
+    if (!arguments.length) return this;
+    var __method = this, args = $A(arguments);
+    return function() {
+      return __method.apply(this, args.concat($A(arguments)));
+    }
+  },
+
+  delay: function() {
+    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
+    return window.setTimeout(function() {
+      return __method.apply(__method, args);
+    }, timeout);
+  },
+
+  wrap: function(wrapper) {
+    var __method = this;
+    return function() {
+      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
+    }
+  },
+
+  methodize: function() {
+    if (this._methodized) return this._methodized;
+    var __method = this;
+    return this._methodized = function() {
+      return __method.apply(null, [this].concat($A(arguments)));
+    };
+  }
+});
+
+Function.prototype.defer = Function.prototype.delay.curry(0.01);
+
+Date.prototype.toJSON = function() {
+  return '"' + this.getUTCFullYear() + '-' +
+    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+    this.getUTCDate().toPaddedString(2) + 'T' +
+    this.getUTCHours().toPaddedString(2) + ':' +
+    this.getUTCMinutes().toPaddedString(2) + ':' +
+    this.getUTCSeconds().toPaddedString(2) + 'Z"';
+};
+
+var Try = {
+  these: function() {
+    var returnValue;
+
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) { }
+    }
+
+    return returnValue;
+  }
+};
+
+RegExp.prototype.match = RegExp.prototype.test;
+
+RegExp.escape = function(str) {
+  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+};
+
+/*--------------------------------------------------------------------------*/
+
+var PeriodicalExecuter = Class.create({
+  initialize: function(callback, frequency) {
+    this.callback = callback;
+    this.frequency = frequency;
+    this.currentlyExecuting = false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  execute: function() {
+    this.callback(this);
+  },
+
+  stop: function() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer = null;
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting = true;
+        this.execute();
+      } finally {
+        this.currentlyExecuting = false;
+      }
+    }
+  }
+});
+Object.extend(String, {
+  interpret: function(value) {
+    return value == null ? '' : String(value);
+  },
+  specialChar: {
+    '\b': '\\b',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\f': '\\f',
+    '\r': '\\r',
+    '\\': '\\\\'
+  }
+});
+
+Object.extend(String.prototype, {
+  gsub: function(pattern, replacement) {
+    var result = '', source = this, match;
+    replacement = arguments.callee.prepareReplacement(replacement);
+
+    while (source.length > 0) {
+      if (match = source.match(pattern)) {
+        result += source.slice(0, match.index);
+        result += String.interpret(replacement(match));
+        source  = source.slice(match.index + match[0].length);
+      } else {
+        result += source, source = '';
+      }
+    }
+    return result;
+  },
+
+  sub: function(pattern, replacement, count) {
+    replacement = this.gsub.prepareReplacement(replacement);
+    count = count === undefined ? 1 : count;
+
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  },
+
+  scan: function(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return String(this);
+  },
+
+  truncate: function(length, truncation) {
+    length = length || 30;
+    truncation = truncation === undefined ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : String(this);
+  },
+
+  strip: function() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  },
+
+  stripTags: function() {
+    return this.replace(/<\/?[^>]+>/gi, '');
+  },
+
+  stripScripts: function() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  },
+
+  extractScripts: function() {
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  },
+
+  evalScripts: function() {
+    return this.extractScripts().map(function(script) { return eval(script) });
+  },
+
+  escapeHTML: function() {
+    var self = arguments.callee;
+    self.text.data = this;
+    return self.div.innerHTML;
+  },
+
+  unescapeHTML: function() {
+    var div = new Element('div');
+    div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? (div.childNodes.length > 1 ?
+      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
+      div.childNodes[0].nodeValue) : '';
+  },
+
+  toQueryParams: function(separator) {
+    var match = this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return { };
+
+    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
+      if ((pair = pair.split('='))[0]) {
+        var key = decodeURIComponent(pair.shift());
+        var value = pair.length > 1 ? pair.join('=') : pair[0];
+        if (value != undefined) value = decodeURIComponent(value);
+
+        if (key in hash) {
+          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
+          hash[key].push(value);
+        }
+        else hash[key] = value;
+      }
+      return hash;
+    });
+  },
+
+  toArray: function() {
+    return this.split('');
+  },
+
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
+
+  times: function(count) {
+    var result = '';
+    for (var i = 0; i < count; i++) result += this;
+    return result;
+  },
+
+  camelize: function() {
+    var parts = this.split('-'), len = parts.length;
+    if (len == 1) return parts[0];
+
+    var camelized = this.charAt(0) == '-'
+      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+      : parts[0];
+
+    for (var i = 1; i < len; i++)
+      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
+
+    return camelized;
+  },
+
+  capitalize: function() {
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  },
+
+  underscore: function() {
+    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+  },
+
+  dasherize: function() {
+    return this.gsub(/_/,'-');
+  },
+
+  inspect: function(useDoubleQuotes) {
+    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
+      var character = String.specialChar[match[0]];
+      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
+    });
+    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  },
+
+  toJSON: function() {
+    return this.inspect(true);
+  },
+
+  unfilterJSON: function(filter) {
+    return this.sub(filter || Prototype.JSONFilter, '#{1}');
+  },
+
+  isJSON: function() {
+    var str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
+    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+  },
+
+  evalJSON: function(sanitize) {
+    var json = this.unfilterJSON();
+    try {
+      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
+    } catch (e) { }
+    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+  },
+
+  include: function(pattern) {
+    return this.indexOf(pattern) > -1;
+  },
+
+  startsWith: function(pattern) {
+    return this.indexOf(pattern) === 0;
+  },
+
+  endsWith: function(pattern) {
+    var d = this.length - pattern.length;
+    return d >= 0 && this.lastIndexOf(pattern) === d;
+  },
+
+  empty: function() {
+    return this == '';
+  },
+
+  blank: function() {
+    return /^\s*$/.test(this);
+  },
+
+  interpolate: function(object, pattern) {
+    return new Template(this, pattern).evaluate(object);
+  }
+});
+
+if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
+  escapeHTML: function() {
+    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  },
+  unescapeHTML: function() {
+    return this.replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+  }
+});
+
+String.prototype.gsub.prepareReplacement = function(replacement) {
+  if (Object.isFunction(replacement)) return replacement;
+  var template = new Template(replacement);
+  return function(match) { return template.evaluate(match) };
+};
+
+String.prototype.parseQuery = String.prototype.toQueryParams;
+
+Object.extend(String.prototype.escapeHTML, {
+  div:  document.createElement('div'),
+  text: document.createTextNode('')
+});
+
+with (String.prototype.escapeHTML) div.appendChild(text);
+
+var Template = Class.create({
+  initialize: function(template, pattern) {
+    this.template = template.toString();
+    this.pattern = pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    if (Object.isFunction(object.toTemplateReplacements))
+      object = object.toTemplateReplacements();
+
+    return this.template.gsub(this.pattern, function(match) {
+      if (object == null) return '';
+
+      var before = match[1] || '';
+      if (before == '\\') return match[2];
+
+      var ctx = object, expr = match[3];
+      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/, match = pattern.exec(expr);
+      if (match == null) return '';
+
+      while (match != null) {
+        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
+        ctx = ctx[comp];
+        if (null == ctx || '' == match[3]) break;
+        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
+        match = pattern.exec(expr);
+      }
+
+      return before + String.interpret(ctx);
+    }.bind(this));
+  }
+});
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+
+var $break = { };
+
+var Enumerable = {
+  each: function(iterator, context) {
+    var index = 0;
+    iterator = iterator.bind(context);
+    try {
+      this._each(function(value) {
+        iterator(value, index++);
+      });
+    } catch (e) {
+      if (e != $break) throw e;
+    }
+    return this;
+  },
+
+  eachSlice: function(number, iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var index = -number, slices = [], array = this.toArray();
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.collect(iterator, context);
+  },
+
+  all: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var result = true;
+    this.each(function(value, index) {
+      result = result && !!iterator(value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  },
+
+  any: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var result = false;
+    this.each(function(value, index) {
+      if (result = !!iterator(value, index))
+        throw $break;
+    });
+    return result;
+  },
+
+  collect: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var results = [];
+    this.each(function(value, index) {
+      results.push(iterator(value, index));
+    });
+    return results;
+  },
+
+  detect: function(iterator, context) {
+    iterator = iterator.bind(context);
+    var result;
+    this.each(function(value, index) {
+      if (iterator(value, index)) {
+        result = value;
+        throw $break;
+      }
+    });
+    return result;
+  },
+
+  findAll: function(iterator, context) {
+    iterator = iterator.bind(context);
+    var results = [];
+    this.each(function(value, index) {
+      if (iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  grep: function(filter, iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var results = [];
+
+    if (Object.isString(filter))
+      filter = new RegExp(filter);
+
+    this.each(function(value, index) {
+      if (filter.match(value))
+        results.push(iterator(value, index));
+    });
+    return results;
+  },
+
+  include: function(object) {
+    if (Object.isFunction(this.indexOf))
+      if (this.indexOf(object) != -1) return true;
+
+    var found = false;
+    this.each(function(value) {
+      if (value == object) {
+        found = true;
+        throw $break;
+      }
+    });
+    return found;
+  },
+
+  inGroupsOf: function(number, fillWith) {
+    fillWith = fillWith === undefined ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
+
+  inject: function(memo, iterator, context) {
+    iterator = iterator.bind(context);
+    this.each(function(value, index) {
+      memo = iterator(memo, value, index);
+    });
+    return memo;
+  },
+
+  invoke: function(method) {
+    var args = $A(arguments).slice(1);
+    return this.map(function(value) {
+      return value[method].apply(value, args);
+    });
+  },
+
+  max: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator(value, index);
+      if (result == undefined || value >= result)
+        result = value;
+    });
+    return result;
+  },
+
+  min: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator(value, index);
+      if (result == undefined || value < result)
+        result = value;
+    });
+    return result;
+  },
+
+  partition: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
+    var trues = [], falses = [];
+    this.each(function(value, index) {
+      (iterator(value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  },
+
+  pluck: function(property) {
+    var results = [];
+    this.each(function(value) {
+      results.push(value[property]);
+    });
+    return results;
+  },
+
+  reject: function(iterator, context) {
+    iterator = iterator.bind(context);
+    var results = [];
+    this.each(function(value, index) {
+      if (!iterator(value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  sortBy: function(iterator, context) {
+    iterator = iterator.bind(context);
+    return this.map(function(value, index) {
+      return {value: value, criteria: iterator(value, index)};
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  },
+
+  toArray: function() {
+    return this.map();
+  },
+
+  zip: function() {
+    var iterator = Prototype.K, args = $A(arguments);
+    if (Object.isFunction(args.last()))
+      iterator = args.pop();
+
+    var collections = [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      return iterator(collections.pluck(index));
+    });
+  },
+
+  size: function() {
+    return this.toArray().length;
+  },
+
+  inspect: function() {
+    return '#<Enumerable:' + this.toArray().inspect() + '>';
+  }
+};
+
+Object.extend(Enumerable, {
+  map:     Enumerable.collect,
+  find:    Enumerable.detect,
+  select:  Enumerable.findAll,
+  filter:  Enumerable.findAll,
+  member:  Enumerable.include,
+  entries: Enumerable.toArray,
+  every:   Enumerable.all,
+  some:    Enumerable.any
+});
+function $A(iterable) {
+  if (!iterable) return [];
+  if (iterable.toArray) return iterable.toArray();
+  else {
+    var results = [];
+    for (var i = 0, length = iterable.length; i < length; i++)
+      results.push(iterable[i]);
+    return results;
+  }
+}
+
+if (Prototype.Browser.WebKit) {
+  function $A(iterable) {
+    if (!iterable) return [];
+    if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
+        iterable.toArray) {
+      return iterable.toArray();
+    } else {
+      var results = [];
+      for (var i = 0, length = iterable.length; i < length; i++)
+        results.push(iterable[i]);
+      return results;
+    }
+  }
+}
+
+Array.from = $A;
+
+Object.extend(Array.prototype, Enumerable);
+
+if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
+
+Object.extend(Array.prototype, {
+  _each: function(iterator) {
+    for (var i = 0, length = this.length; i < length; i++)
+      iterator(this[i]);
+  },
+
+  clear: function() {
+    this.length = 0;
+    return this;
+  },
+
+  first: function() {
+    return this[0];
+  },
+
+  last: function() {
+    return this[this.length - 1];
+  },
+
+  compact: function() {
+    return this.select(function(value) {
+      return value != null;
+    });
+  },
+
+  flatten: function() {
+    return this.inject([], function(array, value) {
+      return array.concat(Object.isArray(value) ?
+        value.flatten() : [value]);
+    });
+  },
+
+  without: function() {
+    var values = $A(arguments);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  },
+
+  reverse: function(inline) {
+    return (inline !== false ? this : this.toArray())._reverse();
+  },
+
+  reduce: function() {
+    return this.length > 1 ? this : this[0];
+  },
+
+  uniq: function(sorted) {
+    return this.inject([], function(array, value, index) {
+      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
+        array.push(value);
+      return array;
+    });
+  },
+
+  intersect: function(array) {
+    return this.uniq().findAll(function(item) {
+      return array.detect(function(value) { return item === value });
+    });
+  },
+
+  clone: function() {
+    return [].concat(this);
+  },
+
+  size: function() {
+    return this.length;
+  },
+
+  inspect: function() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  },
+
+  toJSON: function() {
+    var results = [];
+    this.each(function(object) {
+      var value = Object.toJSON(object);
+      if (value !== undefined) results.push(value);
+    });
+    return '[' + results.join(', ') + ']';
+  }
+});
+
+// use native browser JS 1.6 implementation if available
+if (Object.isFunction(Array.prototype.forEach))
+  Array.prototype._each = Array.prototype.forEach;
+
+if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
+  i || (i = 0);
+  var length = this.length;
+  if (i < 0) i = length + i;
+  for (; i < length; i++)
+    if (this[i] === item) return i;
+  return -1;
+};
+
+if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
+  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
+  var n = this.slice(0, i).reverse().indexOf(item);
+  return (n < 0) ? n : i - n - 1;
+};
+
+Array.prototype.toArray = Array.prototype.clone;
+
+function $w(string) {
+  string = string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+
+if (Prototype.Browser.Opera){
+  Array.prototype.concat = function() {
+    var array = [];
+    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      if (Object.isArray(arguments[i])) {
+        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+          array.push(arguments[i][j]);
+      } else {
+        array.push(arguments[i]);
+      }
+    }
+    return array;
+  };
+}
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    return this.toPaddedString(2, 16);
+  },
+
+  succ: function() {
+    return this + 1;
+  },
+
+  times: function(iterator) {
+    $R(0, this, true).each(iterator);
+    return this;
+  },
+
+  toPaddedString: function(length, radix) {
+    var string = this.toString(radix || 10);
+    return '0'.times(length - string.length) + string;
+  },
+
+  toJSON: function() {
+    return isFinite(this) ? this.toString() : 'null';
+  }
+});
+
+$w('abs round ceil floor').each(function(method){
+  Number.prototype[method] = Math[method].methodize();
+});
+var Hash = function(object) {
+  if (object instanceof Hash) this.merge(object);
+  else Object.extend(this, object || { });
+};
+
+Object.extend(Hash, {
+  toQueryString: function(obj) {
+    var parts = [];
+    parts.add = arguments.callee.addPair;
+
+    this.prototype._each.call(obj, function(pair) {
+      if (!pair.key) return;
+      var value = pair.value;
+
+      if (value && typeof value == 'object') {
+        if (Object.isArray(value)) value.each(function(value) {
+          parts.add(pair.key, value);
+        });
+        return;
+      }
+      parts.add(pair.key, value);
+    });
+
+    return parts.join('&');
+  },
+
+  toJSON: function(object) {
+    var results = [];
+    this.prototype._each.call(object, function(pair) {
+      var value = Object.toJSON(pair.value);
+      if (value !== undefined) results.push(pair.key.toJSON() + ': ' + value);
+    });
+    return '{' + results.join(', ') + '}';
+  }
+});
+
+Hash.toQueryString.addPair = function(key, value, prefix) {
+  key = encodeURIComponent(key);
+  if (value === undefined) this.push(key);
+  else this.push(key + '=' + (value == null ? '' : encodeURIComponent(value)));
+};
+
+Object.extend(Hash.prototype, Enumerable);
+Object.extend(Hash.prototype, {
+  _each: function(iterator) {
+    for (var key in this) {
+      var value = this[key];
+      if (value && value == Hash.prototype[key]) continue;
+
+      var pair = [key, value];
+      pair.key = key;
+      pair.value = value;
+      iterator(pair);
+    }
+  },
+
+  keys: function() {
+    return this.pluck('key');
+  },
+
+  values: function() {
+    return this.pluck('value');
+  },
+
+  index: function(value) {
+    var match = this.detect(function(pair) {
+      return pair.value === value;
+    });
+    return match && match.key;
+  },
+
+  merge: function(hash) {
+    return $H(hash).inject(this, function(mergedHash, pair) {
+      mergedHash[pair.key] = pair.value;
+      return mergedHash;
+    });
+  },
+
+  remove: function() {
+    var result;
+    for(var i = 0, length = arguments.length; i < length; i++) {
+      var value = this[arguments[i]];
+      if (value !== undefined){
+        if (result === undefined) result = value;
+        else {
+          if (!Object.isArray(result)) result = [result];
+          result.push(value);
+        }
+      }
+      delete this[arguments[i]];
+    }
+    return result;
+  },
+
+  toQueryString: function() {
+    return Hash.toQueryString(this);
+  },
+
+  inspect: function() {
+    return '#<Hash:{' + this.map(function(pair) {
+      return pair.map(Object.inspect).join(': ');
+    }).join(', ') + '}>';
+  },
+
+  toJSON: function() {
+    return Hash.toJSON(this);
+  }
+});
+
+function $H(object) {
+  if (object instanceof Hash) return object;
+  return new Hash(object);
+};
+
+// Safari iterates over shadowed properties
+if (function() {
+  var i = 0, Test = function(value) { this.key = value };
+  Test.prototype.key = 'foo';
+  for (var property in new Test('bar')) i++;
+  return i > 1;
+}()) Hash.prototype._each = function(iterator) {
+  var cache = [];
+  for (var key in this) {
+    var value = this[key];
+    if ((value && value == Hash.prototype[key]) || cache.include(key)) continue;
+    cache.push(key);
+    var pair = [key, value];
+    pair.key = key;
+    pair.value = value;
+    iterator(pair);
+  }
+};
+ObjectRange = Class.create({
+  initialize: function(start, end, exclusive) {
+    this.start = start;
+    this.end = end;
+    this.exclusive = exclusive;
+  },
+
+  _each: function(iterator) {
+    var value = this.start;
+    while (this.include(value)) {
+      iterator(value);
+      value = value.succ();
+    }
+  }
+});
+
+Object.extend(ObjectRange.prototype, Enumerable);
+
+ObjectRange.prototype.include = function(value) {
+  if (value < this.start)
+    return false;
+  if (this.exclusive)
+    return value < this.end;
+  return value <= this.end;
+};
+
+var $R = function(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+};
+
+var Ajax = {
+  getTransport: function() {
+    return Try.these(
+      function() {return new XMLHttpRequest()},
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+};
+
+Ajax.Responders = {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
+  },
+
+  unregister: function(responder) {
+    this.responders = this.responders.without(responder);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (Object.isFunction(responder[callback])) {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) { }
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate:   function() { Ajax.activeRequestCount++ },
+  onComplete: function() { Ajax.activeRequestCount-- }
+});
+
+Ajax.Base = Class.create({
+  initialize: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
+      parameters:   '',
+      evalJSON:     true,
+      evalJS:       true
+    };
+    Object.extend(this.options, options || { });
+
+    this.options.method = this.options.method.toLowerCase();
+    if (Object.isString(this.options.parameters))
+      this.options.parameters = this.options.parameters.toQueryParams();
+  }
+});
+
+Ajax.Request = Class.create(Ajax.Base, {
+  _complete: false,
+
+  initialize: function($super, url, options) {
+    $super(options);
+    this.transport = Ajax.getTransport();
+    this.request(url);
+  },
+
+  request: function(url) {
+    this.url = url;
+    this.method = this.options.method;
+    var params = Object.clone(this.options.parameters);
+
+    if (!['get', 'post'].include(this.method)) {
+      // simulate other verbs over post
+      params['_method'] = this.method;
+      this.method = 'post';
+    }
+
+    this.parameters = params;
+
+    if (params = Hash.toQueryString(params)) {
+      // when GET, append parameters to URL
+      if (this.method == 'get')
+        this.url += (this.url.include('?') ? '&' : '?') + params;
+      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+        params += '&_=';
+    }
+
+    try {
+      var response = new Ajax.Response(this);
+      if (this.options.onCreate) this.options.onCreate(response);
+      Ajax.Responders.dispatch('onCreate', this, response);
+
+      this.transport.open(this.method.toUpperCase(), this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
+
+      this.transport.onreadystatechange = this.onStateChange.bind(this);
+      this.setRequestHeaders();
+
+      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
+      this.transport.send(this.body);
+
+      /* Force Firefox to handle ready state 4 for synchronous requests */
+      if (!this.options.asynchronous && this.transport.overrideMimeType)
+        this.onStateChange();
+
+    }
+    catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState > 1 && !((readyState == 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  setRequestHeaders: function() {
+    var headers = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+    };
+
+    if (this.method == 'post') {
+      headers['Content-type'] = this.options.contentType +
+        (this.options.encoding ? '; charset=' + this.options.encoding : '');
+
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
+            headers['Connection'] = 'close';
+    }
+
+    // user-defined headers
+    if (typeof this.options.requestHeaders == 'object') {
+      var extras = this.options.requestHeaders;
+
+      if (Object.isFunction(extras.push))
+        for (var i = 0, length = extras.length; i < length; i += 2)
+          headers[extras[i]] = extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
+    }
+
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
+  },
+
+  success: function() {
+    var status = this.getStatus();
+    return !status || (status >= 200 && status < 300);
+  },
+
+  getStatus: function() {
+    try {
+      return this.transport.status || 0;
+    } catch (e) { return 0 }
+  },
+
+  respondToReadyState: function(readyState) {
+    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
+
+    if (state == 'Complete') {
+      try {
+        this._complete = true;
+        (this.options['on' + response.status]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(response, response.headerJSON);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      var contentType = response.getHeader('Content-type');
+      if (this.options.evalJS == 'force'
+          || (this.options.evalJS && contentType
+          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
+      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    if (state == 'Complete') {
+      // avoid memory leak in MSIE: clean up
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+    }
+  },
+
+  getHeader: function(name) {
+    try {
+      return this.transport.getResponseHeader(name);
+    } catch (e) { return null }
+  },
+
+  evalResponse: function() {
+    try {
+      return eval((this.transport.responseText || '').unfilterJSON());
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+Ajax.Response = Class.create({
+  initialize: function(request){
+    this.request = request;
+    var transport  = this.transport  = request.transport,
+        readyState = this.readyState = transport.readyState;
+
+    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
+      this.status       = this.getStatus();
+      this.statusText   = this.getStatusText();
+      this.responseText = String.interpret(transport.responseText);
+      this.headerJSON   = this.getHeaderJSON();
+    }
+
+    if(readyState == 4) {
+      var xml = transport.responseXML;
+      this.responseXML  = xml === undefined ? null : xml;
+      this.responseJSON = this.getResponseJSON();
+    }
+  },
+
+  status:      0,
+  statusText: '',
+
+  getStatus: Ajax.Request.prototype.getStatus,
+
+  getStatusText: function() {
+    try {
+      return this.transport.statusText || '';
+    } catch (e) { return '' }
+  },
+
+  getHeader: Ajax.Request.prototype.getHeader,
+
+  getAllHeaders: function() {
+    try {
+      return this.getAllResponseHeaders();
+    } catch (e) { return null }
+  },
+
+  getResponseHeader: function(name) {
+    return this.transport.getResponseHeader(name);
+  },
+
+  getAllResponseHeaders: function() {
+    return this.transport.getAllResponseHeaders();
+  },
+
+  getHeaderJSON: function() {
+    var json = this.getHeader('X-JSON');
+    try {
+      return json ? json.evalJSON(this.request.options.sanitizeJSON) : null;
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  },
+
+  getResponseJSON: function() {
+    var options = this.request.options;
+    try {
+      if (options.evalJSON == 'force' || (options.evalJSON &&
+          (this.getHeader('Content-type') || '').include('application/json')))
+        return this.transport.responseText.evalJSON(options.sanitizeJSON);
+      return null;
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  }
+});
+
+Ajax.Updater = Class.create(Ajax.Request, {
+  initialize: function($super, container, url, options) {
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
+    };
+
+    options = options || { };
+    var onComplete = options.onComplete;
+    options.onComplete = (function(response, param) {
+      this.updateContent(response.responseText);
+      if (Object.isFunction(onComplete)) onComplete(response, param);
+    }).bind(this);
+
+    $super(url, options);
+  },
+
+  updateContent: function(responseText) {
+    var receiver = this.container[this.success() ? 'success' : 'failure'],
+        options = this.options;
+
+    if (!options.evalScripts) responseText = responseText.stripScripts();
+
+    if (receiver = $(receiver)) {
+      if (options.insertion) {
+        if (Object.isString(options.insertion)) {
+          var insertion = { }; insertion[options.insertion] = responseText;
+          receiver.insert(insertion);
+        }
+        else options.insertion(receiver, responseText);
+      }
+      else receiver.update(responseText);
+    }
+
+    if (this.success()) {
+      if (this.onComplete) this.onComplete.bind(this).defer();
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
+  initialize: function($super, container, url, options) {
+    $super(options);
+    this.onComplete = this.options.onComplete;
+
+    this.frequency = (this.options.frequency || 2);
+    this.decay = (this.options.decay || 1);
+
+    this.updater = { };
+    this.container = container;
+    this.url = url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete = this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.options.onComplete = undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(response) {
+    if (this.options.decay) {
+      this.decay = (response.responseText == this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText = response.responseText;
+    }
+    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
+  },
+
+  onTimerEvent: function() {
+    this.updater = new Ajax.Updater(this.container, this.url, this.options);
+  }
+});
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+      elements.push($(arguments[i]));
+    return elements;
+  }
+  if (Object.isString(element))
+    element = document.getElementById(element);
+  return Element.extend(element);
+}
+
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath = function(expression, parentElement) {
+    var results = [];
+    var query = document.evaluate(expression, $(parentElement) || document,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0, length = query.snapshotLength; i < length; i++)
+      results.push(Element.extend(query.snapshotItem(i)));
+    return results;
+  };
+}
+
+/*--------------------------------------------------------------------------*/
+
+if (!window.Node) var Node = { };
+
+if (!Node.ELEMENT_NODE) {
+  // DOM level 2 ECMAScript Language Binding
+  Object.extend(Node, {
+    ELEMENT_NODE: 1,
+    ATTRIBUTE_NODE: 2,
+    TEXT_NODE: 3,
+    CDATA_SECTION_NODE: 4,
+    ENTITY_REFERENCE_NODE: 5,
+    ENTITY_NODE: 6,
+    PROCESSING_INSTRUCTION_NODE: 7,
+    COMMENT_NODE: 8,
+    DOCUMENT_NODE: 9,
+    DOCUMENT_TYPE_NODE: 10,
+    DOCUMENT_FRAGMENT_NODE: 11,
+    NOTATION_NODE: 12
+  });
+}
+
+(function() {
+  var element = this.Element;
+  this.Element = function(tagName, attributes) {
+    attributes = attributes || { };
+    tagName = tagName.toLowerCase();
+    var cache = Element.cache;
+    if (Prototype.Browser.IE && attributes.name) {
+      tagName = '<' + tagName + ' name="' + attributes.name + '">';
+      delete attributes.name;
+      return Element.writeAttribute(document.createElement(tagName), attributes);
+    }
+    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
+    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
+  };
+  Object.extend(this.Element, element || { });
+}).call(window);
+
+Element.cache = { };
+
+Element.Methods = {
+  visible: function(element) {
+    return $(element).style.display != 'none';
+  },
+
+  toggle: function(element) {
+    element = $(element);
+    Element[Element.visible(element) ? 'hide' : 'show'](element);
+    return element;
+  },
+
+  hide: function(element) {
+    $(element).style.display = 'none';
+    return element;
+  },
+
+  show: function(element) {
+    $(element).style.display = '';
+    return element;
+  },
+
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+    return element;
+  },
+
+  update: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+    content = Object.toHTML(content);
+    element.innerHTML = content.stripScripts();
+    content.evalScripts.bind(content).defer();
+    return element;
+  },
+
+  replace: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    else if (!Object.isElement(content)) {
+      content = Object.toHTML(content);
+      var range = element.ownerDocument.createRange();
+      range.selectNode(element);
+      content.evalScripts.bind(content).defer();
+      content = range.createContextualFragment(content.stripScripts());
+    }
+    element.parentNode.replaceChild(content, element);
+    return element;
+  },
+
+  insert: function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = {bottom:insertions};
+
+    var content, t, range;
+
+    for (position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      t = Element._insertionTranslations[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        t.insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+
+      range = element.ownerDocument.createRange();
+      t.initializeRange(element, range);
+      t.insert(element, range.createContextualFragment(content.stripScripts()));
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  },
+
+  wrap: function(element, wrapper, attributes) {
+    element = $(element);
+    if (Object.isElement(wrapper))
+      $(wrapper).writeAttribute(attributes || { });
+    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
+    else wrapper = new Element('div', wrapper);
+    if (element.parentNode)
+      element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return wrapper;
+  },
+
+  inspect: function(element) {
+    element = $(element);
+    var result = '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property = pair.first(), attribute = pair.last();
+      var value = (element[property] || '').toString();
+      if (value) result += ' ' + attribute + '=' + value.inspect(true);
+    });
+    return result + '>';
+  },
+
+  recursivelyCollect: function(element, property) {
+    element = $(element);
+    var elements = [];
+    while (element = element[property])
+      if (element.nodeType == 1)
+        elements.push(Element.extend(element));
+    return elements;
+  },
+
+  ancestors: function(element) {
+    return $(element).recursivelyCollect('parentNode');
+  },
+
+  descendants: function(element) {
+    return $A($(element).getElementsByTagName('*')).each(Element.extend);
+  },
+
+  firstDescendant: function(element) {
+    element = $(element).firstChild;
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    return $(element);
+  },
+
+  immediateDescendants: function(element) {
+    if (!(element = $(element).firstChild)) return [];
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+
+  previousSiblings: function(element) {
+    return $(element).recursivelyCollect('previousSibling');
+  },
+
+  nextSiblings: function(element) {
+    return $(element).recursivelyCollect('nextSibling');
+  },
+
+  siblings: function(element) {
+    element = $(element);
+    return element.previousSiblings().reverse().concat(element.nextSiblings());
+  },
+
+  match: function(element, selector) {
+    if (Object.isString(selector))
+      selector = new Selector(selector);
+    return selector.match($(element));
+  },
+
+  up: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(element.parentNode);
+    var ancestors = element.ancestors();
+    return expression ? Selector.findElement(ancestors, expression, index) :
+      ancestors[index || 0];
+  },
+
+  down: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return element.firstDescendant();
+    var descendants = element.descendants();
+    return expression ? Selector.findElement(descendants, expression, index) :
+      descendants[index || 0];
+  },
+
+  previous: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
+    var previousSiblings = element.previousSiblings();
+    return expression ? Selector.findElement(previousSiblings, expression, index) :
+      previousSiblings[index || 0];
+  },
+
+  next: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
+    var nextSiblings = element.nextSiblings();
+    return expression ? Selector.findElement(nextSiblings, expression, index) :
+      nextSiblings[index || 0];
+  },
+
+  select: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element, args);
+  },
+
+  adjacent: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element.parentNode, args).without(element);
+  },
+
+  identify: function(element) {
+    element = $(element);
+    var id = element.readAttribute('id'), self = arguments.callee;
+    if (id) return id;
+    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
+    element.writeAttribute('id', id);
+    return id;
+  },
+
+  readAttribute: function(element, name) {
+    element = $(element);
+    if (Prototype.Browser.IE) {
+      var t = Element._attributeTranslations.read;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name]) name = t.names[name];
+      if (name.include(':')) {
+        return (!element.attributes || !element.attributes[name]) ? null :
+         element.attributes[name].value;
+      }
+    }
+    return element.getAttribute(name);
+  },
+
+  writeAttribute: function(element, name, value) {
+    element = $(element);
+    var attributes = { }, t = Element._attributeTranslations.write;
+
+    if (typeof name == 'object') attributes = name;
+    else attributes[name] = value === undefined ? true : value;
+
+    for (var attr in attributes) {
+      var name = t.names[attr] || attr, value = attributes[attr];
+      if (t.values[attr]) name = t.values[attr](element, value);
+      if (value === false || value === null)
+        element.removeAttribute(name);
+      else if (value === true)
+        element.setAttribute(name, name);
+      else element.setAttribute(name, value);
+    }
+    return element;
+  },
+
+  getHeight: function(element) {
+    return $(element).getDimensions().height;
+  },
+
+  getWidth: function(element) {
+    return $(element).getDimensions().width;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    var elementClassName = element.className;
+    return (elementClassName.length > 0 && (elementClassName == className ||
+      elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))));
+  },
+
+  addClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    if (!element.hasClassName(className))
+      element.className += (element.className ? ' ' : '') + className;
+    return element;
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    element.className = element.className.replace(
+      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
+    return element;
+  },
+
+  toggleClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return element[element.hasClassName(className) ?
+      'removeClassName' : 'addClassName'](className);
+  },
+
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element = $(element);
+    var node = element.firstChild;
+    while (node) {
+      var nextNode = node.nextSibling;
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        element.removeChild(node);
+      node = nextNode;
+    }
+    return element;
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.blank();
+  },
+
+  descendantOf: function(element, ancestor) {
+    element = $(element), ancestor = $(ancestor);
+    while (element = element.parentNode)
+      if (element == ancestor) return true;
+    return false;
+  },
+
+  scrollTo: function(element) {
+    element = $(element);
+    var pos = element.cumulativeOffset();
+    window.scrollTo(pos[0], pos[1]);
+    return element;
+  },
+
+  getStyle: function(element, style) {
+    element = $(element);
+    style = style == 'float' ? 'cssFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value) {
+      var css = document.defaultView.getComputedStyle(element, null);
+      value = css ? css[style] : null;
+    }
+    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
+    return value == 'auto' ? null : value;
+  },
+
+  getOpacity: function(element) {
+    return $(element).getStyle('opacity');
+  },
+
+  setStyle: function(element, styles) {
+    element = $(element);
+    var elementStyle = element.style, match;
+    if (Object.isString(styles)) {
+      element.style.cssText += ';' + styles;
+      return styles.include('opacity') ?
+        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
+    }
+    for (var property in styles)
+      if (property == 'opacity') element.setOpacity(styles[property]);
+      else
+        elementStyle[(property == 'float' || property == 'cssFloat') ?
+          (elementStyle.styleFloat === undefined ? 'cssFloat' : 'styleFloat') :
+            property] = styles[property];
+
+    return element;
+  },
+
+  setOpacity: function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+    return element;
+  },
+
+  getDimensions: function(element) {
+    element = $(element);
+    var display = $(element).getStyle('display');
+    if (display != 'none' && display != null) // Safari bug
+      return {width: element.offsetWidth, height: element.offsetHeight};
+
+    // All *Width and *Height properties give 0 on elements with display none,
+    // so enable the element temporarily
+    var els = element.style;
+    var originalVisibility = els.visibility;
+    var originalPosition = els.position;
+    var originalDisplay = els.display;
+    els.visibility = 'hidden';
+    els.position = 'absolute';
+    els.display = 'block';
+    var originalWidth = element.clientWidth;
+    var originalHeight = element.clientHeight;
+    els.display = originalDisplay;
+    els.position = originalPosition;
+    els.visibility = originalVisibility;
+    return {width: originalWidth, height: originalHeight};
+  },
+
+  makePositioned: function(element) {
+    element = $(element);
+    var pos = Element.getStyle(element, 'position');
+    if (pos == 'static' || !pos) {
+      element._madePositioned = true;
+      element.style.position = 'relative';
+      // Opera returns the offset relative to the positioning context, when an
+      // element is position relative but top and left have not been defined
+      if (window.opera) {
+        element.style.top = 0;
+        element.style.left = 0;
+      }
+    }
+    return element;
+  },
+
+  undoPositioned: function(element) {
+    element = $(element);
+    if (element._madePositioned) {
+      element._madePositioned = undefined;
+      element.style.position =
+        element.style.top =
+        element.style.left =
+        element.style.bottom =
+        element.style.right = '';
+    }
+    return element;
+  },
+
+  makeClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return element;
+    element._overflow = element.style.overflow || 'auto';
+    if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
+      element.style.overflow = 'hidden';
+    return element;
+  },
+
+  undoClipping: function(element) {
+    element = $(element);
+    if (!element._overflow) return element;
+    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
+    element._overflow = null;
+    return element;
+  },
+
+  cumulativeOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  positionedOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        if (element.tagName == 'BODY') break;
+        var p = Element.getStyle(element, 'position');
+        if (p == 'relative' || p == 'absolute') break;
+      }
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  absolutize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'absolute') return;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    var offsets = element.positionedOffset();
+    var top     = offsets[1];
+    var left    = offsets[0];
+    var width   = element.clientWidth;
+    var height  = element.clientHeight;
+
+    element._originalLeft   = left - parseFloat(element.style.left  || 0);
+    element._originalTop    = top  - parseFloat(element.style.top || 0);
+    element._originalWidth  = element.style.width;
+    element._originalHeight = element.style.height;
+
+    element.style.position = 'absolute';
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.width  = width + 'px';
+    element.style.height = height + 'px';
+    return element;
+  },
+
+  relativize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'relative') return;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    element.style.position = 'relative';
+    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
+    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.height = element._originalHeight;
+    element.style.width  = element._originalWidth;
+    return element;
+  },
+
+  cumulativeScrollOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  getOffsetParent: function(element) {
+    if (element.offsetParent) return $(element.offsetParent);
+    if (element == document.body) return $(element);
+
+    while ((element = element.parentNode) && element != document.body)
+      if (Element.getStyle(element, 'position') != 'static')
+        return $(element);
+
+    return $(document.body);
+  },
+
+  viewportOffset: function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent == document.body &&
+        Element.getStyle(element, 'position') == 'absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      if (!Prototype.Browser.Opera || element.tagName == 'BODY') {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
+    } while (element = element.parentNode);
+
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  clonePosition: function(element, source) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || { });
+
+    // find page position of source
+    source = $(source);
+    var p = source.viewportOffset();
+
+    // find coordinate system to use
+    element = $(element);
+    var delta = [0, 0];
+    var parent = null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(element, 'position') == 'absolute') {
+      parent = element.getOffsetParent();
+      delta = parent.viewportOffset();
+    }
+
+    // correct by body offsets (fixes Safari)
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    // set position
+    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
+    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
+    return element;
+  }
+};
+
+Element.Methods.identify.counter = 1;
+
+Object.extend(Element.Methods, {
+  getElementsBySelector: Element.Methods.select,
+  childElements: Element.Methods.immediateDescendants
+});
+
+Element._attributeTranslations = {
+  write: {
+    names: {
+      className: 'class',
+      htmlFor:   'for'
+    },
+    values: { }
+  }
+};
+
+
+if (!document.createRange || Prototype.Browser.Opera) {
+  Element.Methods.insert = function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = { bottom: insertions };
+
+    var t = Element._insertionTranslations, content, position, pos, tagName;
+
+    for (position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      pos      = t[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        pos.insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+      tagName = ((position == 'before' || position == 'after')
+        ? element.parentNode : element).tagName.toUpperCase();
+
+      if (t.tags[tagName]) {
+        var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+        if (position == 'top' || position == 'after') fragments.reverse();
+        fragments.each(pos.insert.curry(element));
+      }
+      else element.insertAdjacentHTML(pos.adjacency, content.stripScripts());
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  };
+}
+
+if (Prototype.Browser.Opera) {
+  Element.Methods._getStyle = Element.Methods.getStyle;
+  Element.Methods.getStyle = function(element, style) {
+    switch(style) {
+      case 'left':
+      case 'top':
+      case 'right':
+      case 'bottom':
+        if (Element._getStyle(element, 'position') == 'static') return null;
+      default: return Element._getStyle(element, style);
+    }
+  };
+  Element.Methods._readAttribute = Element.Methods.readAttribute;
+  Element.Methods.readAttribute = function(element, attribute) {
+    if (attribute == 'title') return element.title;
+    return Element._readAttribute(element, attribute);
+  };
+}
+
+else if (Prototype.Browser.IE) {
+  $w('positionedOffset getOffsetParent viewportOffset').each(function(method) {
+    Element.Methods[method] = Element.Methods[method].wrap(
+      function(proceed, element) {
+        element = $(element);
+        var position = element.getStyle('position');
+        if (position != 'static') return proceed(element);
+        element.setStyle({ position: 'relative' });
+        var value = proceed(element);
+        element.setStyle({ position: position });
+        return value;
+      }
+    );
+  });
+
+  Element.Methods.getStyle = function(element, style) {
+    element = $(element);
+    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value && element.currentStyle) value = element.currentStyle[style];
+
+    if (style == 'opacity') {
+      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if (value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
+
+    if (value == 'auto') {
+      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
+        return element['offset' + style.capitalize()] + 'px';
+      return null;
+    }
+    return value;
+  };
+
+  Element.Methods.setOpacity = function(element, value) {
+    function stripAlpha(filter){
+      return filter.replace(/alpha\([^\)]*\)/gi,'');
+    }
+    element = $(element);
+    if (!element.currentStyle.hasLayout) element.style.zoom = 1;
+    var filter = element.getStyle('filter'), style = element.style;
+    if (value == 1 || value === '') {
+      (filter = stripAlpha(filter)) ?
+        style.filter = filter : style.removeAttribute('filter');
+      return element;
+    } else if (value < 0.00001) value = 0;
+    style.filter = stripAlpha(filter) +
+      'alpha(opacity=' + (value * 100) + ')';
+    return element;
+  };
+
+  Element._attributeTranslations = {
+    read: {
+      names: {
+        'class': 'className',
+        'for':   'htmlFor'
+      },
+      values: {
+        _getAttr: function(element, attribute) {
+          return element.getAttribute(attribute, 2);
+        },
+        _getAttrNode: function(element, attribute) {
+          var node = element.getAttributeNode(attribute);
+          return node ? node.value : "";
+        },
+        _getEv: function(element, attribute) {
+          var attribute = element.getAttribute(attribute);
+          return attribute ? attribute.toString().slice(23, -2) : null;
+        },
+        _flag: function(element, attribute) {
+          return $(element).hasAttribute(attribute) ? attribute : null;
+        },
+        style: function(element) {
+          return element.style.cssText.toLowerCase();
+        },
+        title: function(element) {
+          return element.title;
+        }
+      }
+    }
+  };
+
+  Element._attributeTranslations.write = {
+    names: Object.clone(Element._attributeTranslations.read.names),
+    values: {
+      checked: function(element, value) {
+        element.checked = !!value;
+      },
+
+      style: function(element, value) {
+        element.style.cssText = value ? value : '';
+      }
+    }
+  };
+
+  Element._attributeTranslations.has = {};
+
+  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
+      'encType maxLength readOnly longDesc').each(function(attr) {
+    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
+    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
+  });
+
+  (function(v) {
+    Object.extend(v, {
+      href:        v._getAttr,
+      src:         v._getAttr,
+      type:        v._getAttr,
+      action:      v._getAttrNode,
+      disabled:    v._flag,
+      checked:     v._flag,
+      readonly:    v._flag,
+      multiple:    v._flag,
+      onload:      v._getEv,
+      onunload:    v._getEv,
+      onclick:     v._getEv,
+      ondblclick:  v._getEv,
+      onmousedown: v._getEv,
+      onmouseup:   v._getEv,
+      onmouseover: v._getEv,
+      onmousemove: v._getEv,
+      onmouseout:  v._getEv,
+      onfocus:     v._getEv,
+      onblur:      v._getEv,
+      onkeypress:  v._getEv,
+      onkeydown:   v._getEv,
+      onkeyup:     v._getEv,
+      onsubmit:    v._getEv,
+      onreset:     v._getEv,
+      onselect:    v._getEv,
+      onchange:    v._getEv
+    });
+  })(Element._attributeTranslations.read.values);
+}
+
+else if (Prototype.Browser.Gecko) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1) ? 0.999999 :
+      (value === '') ? '' : (value < 0.00001) ? 0 : value;
+    return element;
+  };
+}
+
+else if (Prototype.Browser.WebKit) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+
+    if (value == 1)
+      if(element.tagName == 'IMG' && element.width) {
+        element.width++; element.width--;
+      } else try {
+        var n = document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+      } catch (e) { }
+
+    return element;
+  };
+
+  // Safari returns margins on body which is incorrect if the child is absolutely
+  // positioned.  For performance reasons, redefine Position.cumulativeOffset for
+  // KHTML/WebKit only.
+  Element.Methods.cumulativeOffset = function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == document.body)
+        if (Element.getStyle(element, 'position') == 'absolute') break;
+
+      element = element.offsetParent;
+    } while (element);
+
+    return Element._returnOffset(valueL, valueT);
+  };
+}
+
+if (Prototype.Browser.IE || Prototype.Browser.Opera) {
+  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
+  Element.Methods.update = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+
+    content = Object.toHTML(content);
+    var tagName = element.tagName.toUpperCase();
+
+    if (tagName in Element._insertionTranslations.tags) {
+      $A(element.childNodes).each(function(node) { element.removeChild(node) });
+      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
+        .each(function(node) { element.appendChild(node) });
+    }
+    else element.innerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+if (document.createElement('div').outerHTML) {
+  Element.Methods.replace = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) {
+      element.parentNode.replaceChild(content, element);
+      return element;
+    }
+
+    content = Object.toHTML(content);
+    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
+
+    if (Element._insertionTranslations.tags[tagName]) {
+      var nextSibling = element.next();
+      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+      parent.removeChild(element);
+      if (nextSibling)
+        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
+      else
+        fragments.each(function(node) { parent.appendChild(node) });
+    }
+    else element.outerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+Element._returnOffset = function(l, t) {
+  var result = [l, t];
+  result.left = l;
+  result.top = t;
+  return result;
+};
+
+Element._getContentFromAnonymousElement = function(tagName, html) {
+  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
+  div.innerHTML = t[0] + html + t[1];
+  t[2].times(function() { div = div.firstChild });
+  return $A(div.childNodes);
+};
+
+Element._insertionTranslations = {
+  before: {
+    adjacency: 'beforeBegin',
+    insert: function(element, node) {
+      element.parentNode.insertBefore(node, element);
+    },
+    initializeRange: function(element, range) {
+      range.setStartBefore(element);
+    }
+  },
+  top: {
+    adjacency: 'afterBegin',
+    insert: function(element, node) {
+      element.insertBefore(node, element.firstChild);
+    },
+    initializeRange: function(element, range) {
+      range.selectNodeContents(element);
+      range.collapse(true);
+    }
+  },
+  bottom: {
+    adjacency: 'beforeEnd',
+    insert: function(element, node) {
+      element.appendChild(node);
+    }
+  },
+  after: {
+    adjacency: 'afterEnd',
+    insert: function(element, node) {
+      element.parentNode.insertBefore(node, element.nextSibling);
+    },
+    initializeRange: function(element, range) {
+      range.setStartAfter(element);
+    }
+  },
+  tags: {
+    TABLE:  ['<table>',                '</table>',                   1],
+    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
+    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
+    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
+    SELECT: ['<select>',               '</select>',                  1]
+  }
+};
+
+(function() {
+  this.bottom.initializeRange = this.top.initializeRange;
+  Object.extend(this.tags, {
+    THEAD: this.tags.TBODY,
+    TFOOT: this.tags.TBODY,
+    TH:    this.tags.TD
+  });
+}).call(Element._insertionTranslations);
+
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    attribute = Element._attributeTranslations.has[attribute] || attribute;
+    var node = $(element).getAttributeNode(attribute);
+    return node && node.specified;
+  }
+};
+
+Element.Methods.ByTag = { };
+
+Object.extend(Element, Element.Methods);
+
+if (!Prototype.BrowserFeatures.ElementExtensions &&
+    document.createElement('div').__proto__) {
+  window.HTMLElement = { };
+  window.HTMLElement.prototype = document.createElement('div').__proto__;
+  Prototype.BrowserFeatures.ElementExtensions = true;
+}
+
+Element.extend = (function() {
+  if (Prototype.BrowserFeatures.SpecificElementExtensions)
+    return Prototype.K;
+
+  var Methods = { }, ByTag = Element.Methods.ByTag;
+
+  var extend = Object.extend(function(element) {
+    if (!element || element._extendedByPrototype ||
+        element.nodeType != 1 || element == window) return element;
+
+    var methods = Object.clone(Methods),
+      tagName = element.tagName, property, value;
+
+    // extend methods for specific tags
+    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
+
+    for (property in methods) {
+      value = methods[property];
+      if (Object.isFunction(value) && !(property in element))
+        element[property] = value.methodize();
+    }
+
+    element._extendedByPrototype = Prototype.emptyFunction;
+    return element;
+
+  }, {
+    refresh: function() {
+      // extend methods for all tags (Safari doesn't need this)
+      if (!Prototype.BrowserFeatures.ElementExtensions) {
+        Object.extend(Methods, Element.Methods);
+        Object.extend(Methods, Element.Methods.Simulated);
+      }
+    }
+  });
+
+  extend.refresh();
+  return extend;
+})();
+
+Element.hasAttribute = function(element, attribute) {
+  if (element.hasAttribute) return element.hasAttribute(attribute);
+  return Element.Methods.Simulated.hasAttribute(element, attribute);
+};
+
+Element.addMethods = function(methods) {
+  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
+
+  if (!methods) {
+    Object.extend(Form, Form.Methods);
+    Object.extend(Form.Element, Form.Element.Methods);
+    Object.extend(Element.Methods.ByTag, {
+      "FORM":     Object.clone(Form.Methods),
+      "INPUT":    Object.clone(Form.Element.Methods),
+      "SELECT":   Object.clone(Form.Element.Methods),
+      "TEXTAREA": Object.clone(Form.Element.Methods)
+    });
+  }
+
+  if (arguments.length == 2) {
+    var tagName = methods;
+    methods = arguments[1];
+  }
+
+  if (!tagName) Object.extend(Element.Methods, methods || { });
+  else {
+    if (Object.isArray(tagName)) tagName.each(extend);
+    else extend(tagName);
+  }
+
+  function extend(tagName) {
+    tagName = tagName.toUpperCase();
+    if (!Element.Methods.ByTag[tagName])
+      Element.Methods.ByTag[tagName] = { };
+    Object.extend(Element.Methods.ByTag[tagName], methods);
+  }
+
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent = onlyIfAbsent || false;
+    for (var property in methods) {
+      var value = methods[property];
+      if (!Object.isFunction(value)) continue;
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] = value.methodize();
+    }
+  }
+
+  function findDOMClass(tagName) {
+    var klass;
+    var trans = {
+      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
+      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
+      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
+      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
+      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
+      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
+      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
+      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
+      "FrameSet", "IFRAME": "IFrame"
+    };
+    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName.capitalize() + 'Element';
+    if (window[klass]) return window[klass];
+
+    window[klass] = { };
+    window[klass].prototype = document.createElement(tagName).__proto__;
+    return window[klass];
+  }
+
+  if (F.ElementExtensions) {
+    copy(Element.Methods, HTMLElement.prototype);
+    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+  }
+
+  if (F.SpecificElementExtensions) {
+    for (var tag in Element.Methods.ByTag) {
+      var klass = findDOMClass(tag);
+      if (Object.isUndefined(klass)) continue;
+      copy(T[tag], klass.prototype);
+    }
+  }
+
+  Object.extend(Element, Element.Methods);
+  delete Element.ByTag;
+
+  if (Element.extend.refresh) Element.extend.refresh();
+  Element.cache = { };
+};
+
+document.viewport = {
+  getDimensions: function() {
+    var dimensions = { };
+    $w('width height').each(function(d) {
+      var D = d.capitalize();
+      dimensions[d] = self['inner' + D] ||
+       (document.documentElement['client' + D] || document.body['client' + D]);
+    });
+    return dimensions;
+  },
+
+  getWidth: function() {
+    return this.getDimensions().width;
+  },
+
+  getHeight: function() {
+    return this.getDimensions().height;
+  },
+
+  getScrollOffsets: function() {
+    return Element._returnOffset(
+      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
+      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
+  }
+};
+/* Portions of the Selector class are derived from Jack Slocum’s DomQuery,
+ * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
+ * license.  Please see http://www.yui-ext.com/ for more information. */
+
+var Selector = Class.create({
+  initialize: function(expression) {
+    this.expression = expression.strip();
+    this.compileMatcher();
+  },
+
+  compileMatcher: function() {
+    // Selectors with namespaced attributes can't use the XPath version
+    if (Prototype.BrowserFeatures.XPath && !(/\[[\w-]*?:/).test(this.expression))
+      return this.compileXPathMatcher();
+
+    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
+        c = Selector.criteria, le, p, m;
+
+    if (Selector._cache[e]) {
+      this.matcher = Selector._cache[e];
+      return;
+    }
+
+    this.matcher = ["this.matcher = function(root) {",
+                    "var r = root, h = Selector.handlers, c = false, n;"];
+
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
+    	      new Template(c[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.matcher.push("return h.unique(n);\n}");
+    eval(this.matcher.join('\n'));
+    Selector._cache[this.expression] = this.matcher;
+  },
+
+  compileXPathMatcher: function() {
+    var e = this.expression, ps = Selector.patterns,
+        x = Selector.xpath, le, m;
+
+    if (Selector._cache[e]) {
+      this.xpath = Selector._cache[e]; return;
+    }
+
+    this.matcher = ['.//*'];
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        if (m = e.match(ps[i])) {
+          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
+            new Template(x[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.xpath = this.matcher.join('');
+    Selector._cache[this.expression] = this.xpath;
+  },
+
+  findElements: function(root) {
+    root = root || document;
+    if (this.xpath) return document._getElementsByXPath(this.xpath, root);
+    return this.matcher(root);
+  },
+
+  match: function(element) {
+    this.tokens = [];
+
+    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
+    var le, p, m;
+
+    while (e && le !== e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          // use the Selector.assertions methods unless the selector
+          // is too complex.
+          if (as[i]) {
+            this.tokens.push([i, Object.clone(m)]);
+            e = e.replace(m[0], '');
+          } else {
+            // reluctantly do a document-wide search
+            // and look for a match in the array
+            return this.findElements(document).include(element);
+          }
+        }
+      }
+    }
+
+    var match = true, name, matches;
+    for (var i = 0, token; token = this.tokens[i]; i++) {
+      name = token[0], matches = token[1];
+      if (!Selector.assertions[name](element, matches)) {
+        match = false; break;
+      }
+    }
+
+    return match;
+  },
+
+  toString: function() {
+    return this.expression;
+  },
+
+  inspect: function() {
+    return "#<Selector:" + this.expression.inspect() + ">";
+  }
+});
+
+Object.extend(Selector, {
+  _cache: { },
+
+  xpath: {
+    descendant:   "//*",
+    child:        "/*",
+    adjacent:     "/following-sibling::*[1]",
+    laterSibling: '/following-sibling::*',
+    tagName:      function(m) {
+      if (m[1] == '*') return '';
+      return "[local-name()='" + m[1].toLowerCase() +
+             "' or local-name()='" + m[1].toUpperCase() + "']";
+    },
+    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
+    id:           "[@id='#{1}']",
+    attrPresence: "[@#{1}]",
+    attr: function(m) {
+      m[3] = m[5] || m[6];
+      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
+    },
+    pseudo: function(m) {
+      var h = Selector.xpath.pseudos[m[1]];
+      if (!h) return '';
+      if (Object.isFunction(h)) return h(m);
+      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
+    },
+    operators: {
+      '=':  "[@#{1}='#{3}']",
+      '!=': "[@#{1}!='#{3}']",
+      '^=': "[starts-with(@#{1}, '#{3}')]",
+      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
+      '*=': "[contains(@#{1}, '#{3}')]",
+      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
+      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
+    },
+    pseudos: {
+      'first-child': '[not(preceding-sibling::*)]',
+      'last-child':  '[not(following-sibling::*)]',
+      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
+      'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
+      'checked':     "[@checked]",
+      'disabled':    "[@disabled]",
+      'enabled':     "[not(@disabled)]",
+      'not': function(m) {
+        var e = m[6], p = Selector.patterns,
+            x = Selector.xpath, le, m, v;
+
+        var exclusion = [];
+        while (e && le != e && (/\S/).test(e)) {
+          le = e;
+          for (var i in p) {
+            if (m = e.match(p[i])) {
+              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
+              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
+              e = e.replace(m[0], '');
+              break;
+            }
+          }
+        }
+        return "[not(" + exclusion.join(" and ") + ")]";
+      },
+      'nth-child':      function(m) {
+        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
+      },
+      'nth-last-child': function(m) {
+        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
+      },
+      'nth-of-type':    function(m) {
+        return Selector.xpath.pseudos.nth("position() ", m);
+      },
+      'nth-last-of-type': function(m) {
+        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
+      },
+      'first-of-type':  function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
+      },
+      'last-of-type':   function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
+      },
+      'only-of-type':   function(m) {
+        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
+      },
+      nth: function(fragment, m) {
+        var mm, formula = m[6], predicate;
+        if (formula == 'even') formula = '2n+0';
+        if (formula == 'odd')  formula = '2n+1';
+        if (mm = formula.match(/^(\d+)$/)) // digit only
+          return '[' + fragment + "= " + mm[1] + ']';
+        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+          if (mm[1] == "-") mm[1] = -1;
+          var a = mm[1] ? Number(mm[1]) : 1;
+          var b = mm[2] ? Number(mm[2]) : 0;
+          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
+          "((#{fragment} - #{b}) div #{a} >= 0)]";
+          return new Template(predicate).evaluate({
+            fragment: fragment, a: a, b: b });
+        }
+      }
+    }
+  },
+
+  criteria: {
+    tagName:      'n = h.tagName(n, r, "#{1}", c);   c = false;',
+    className:    'n = h.className(n, r, "#{1}", c); c = false;',
+    id:           'n = h.id(n, r, "#{1}", c);        c = false;',
+    attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
+    attr: function(m) {
+      m[3] = (m[5] || m[6]);
+      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
+    },
+    pseudo: function(m) {
+      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
+      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
+    },
+    descendant:   'c = "descendant";',
+    child:        'c = "child";',
+    adjacent:     'c = "adjacent";',
+    laterSibling: 'c = "laterSibling";'
+  },
+
+  patterns: {
+    // combinators must be listed first
+    // (and descendant needs to be last combinator)
+    laterSibling: /^\s*~\s*/,
+    child:        /^\s*>\s*/,
+    adjacent:     /^\s*\+\s*/,
+    descendant:   /^\s/,
+
+    // selectors follow
+    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
+    id:           /^#([\w\-\*]+)(\b|$)/,
+    className:    /^\.([\w\-\*]+)(\b|$)/,
+    pseudo:       /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|\s|(?=:))/,
+    attrPresence: /^\[([\w]+)\]/,
+    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
+  },
+
+  // for Selector.match and Element#match
+  assertions: {
+    tagName: function(element, matches) {
+      return matches[1].toUpperCase() == element.tagName.toUpperCase();
+    },
+
+    className: function(element, matches) {
+      return Element.hasClassName(element, matches[1]);
+    },
+
+    id: function(element, matches) {
+      return element.id === matches[1];
+    },
+
+    attrPresence: function(element, matches) {
+      return Element.hasAttribute(element, matches[1]);
+    },
+
+    attr: function(element, matches) {
+      var nodeValue = Element.readAttribute(element, matches[1]);
+      return Selector.operators[matches[2]](nodeValue, matches[3]);
+    }
+  },
+
+  handlers: {
+    // UTILITY FUNCTIONS
+    // joins two collections
+    concat: function(a, b) {
+      for (var i = 0, node; node = b[i]; i++)
+        a.push(node);
+      return a;
+    },
+
+    // marks an array of nodes for counting
+    mark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._counted = true;
+      return nodes;
+    },
+
+    unmark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._counted = undefined;
+      return nodes;
+    },
+
+    // mark each child node with its position (for nth calls)
+    // "ofType" flag indicates whether we're indexing for nth-of-type
+    // rather than nth-child
+    index: function(parentNode, reverse, ofType) {
+      parentNode._counted = true;
+      if (reverse) {
+        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
+          var node = nodes[i];
+          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+        }
+      } else {
+        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
+          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+      }
+    },
+
+    // filters out duplicates and extends all nodes
+    unique: function(nodes) {
+      if (nodes.length == 0) return nodes;
+      var results = [], n;
+      for (var i = 0, l = nodes.length; i < l; i++)
+        if (!(n = nodes[i])._counted) {
+          n._counted = true;
+          results.push(Element.extend(n));
+        }
+      return Selector.handlers.unmark(results);
+    },
+
+    // COMBINATOR FUNCTIONS
+    descendant: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, node.getElementsByTagName('*'));
+      return results;
+    },
+
+    child: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        for (var j = 0, children = [], child; child = node.childNodes[j]; j++)
+          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
+      }
+      return results;
+    },
+
+    adjacent: function(nodes) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        var next = this.nextElementSibling(node);
+        if (next) results.push(next);
+      }
+      return results;
+    },
+
+    laterSibling: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, Element.nextSiblings(node));
+      return results;
+    },
+
+    nextElementSibling: function(node) {
+      while (node = node.nextSibling)
+	      if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    previousElementSibling: function(node) {
+      while (node = node.previousSibling)
+        if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    // TOKEN FUNCTIONS
+    tagName: function(nodes, root, tagName, combinator) {
+      tagName = tagName.toUpperCase();
+      var results = [], h = Selector.handlers;
+      if (nodes) {
+        if (combinator) {
+          // fastlane for ordinary descendant combinators
+          if (combinator == "descendant") {
+            for (var i = 0, node; node = nodes[i]; i++)
+              h.concat(results, node.getElementsByTagName(tagName));
+            return results;
+          } else nodes = this[combinator](nodes);
+          if (tagName == "*") return nodes;
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.tagName.toUpperCase() == tagName) results.push(node);
+        return results;
+      } else return root.getElementsByTagName(tagName);
+    },
+
+    id: function(nodes, root, id, combinator) {
+      var targetNode = $(id), h = Selector.handlers;
+      if (!targetNode) return [];
+      if (!nodes && root == document) return [targetNode];
+      if (nodes) {
+        if (combinator) {
+          if (combinator == 'child') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (targetNode.parentNode == node) return [targetNode];
+          } else if (combinator == 'descendant') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Element.descendantOf(targetNode, node)) return [targetNode];
+          } else if (combinator == 'adjacent') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Selector.handlers.previousElementSibling(targetNode) == node)
+                return [targetNode];
+          } else nodes = h[combinator](nodes);
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node == targetNode) return [targetNode];
+        return [];
+      }
+      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
+    },
+
+    className: function(nodes, root, className, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      return Selector.handlers.byClassName(nodes, root, className);
+    },
+
+    byClassName: function(nodes, root, className) {
+      if (!nodes) nodes = Selector.handlers.descendant([root]);
+      var needle = ' ' + className + ' ';
+      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
+        nodeClassName = node.className;
+        if (nodeClassName.length == 0) continue;
+        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
+          results.push(node);
+      }
+      return results;
+    },
+
+    attrPresence: function(nodes, root, attr) {
+      var results = [];
+      for (var i = 0, node; node = nodes[i]; i++)
+        if (Element.hasAttribute(node, attr)) results.push(node);
+      return results;
+    },
+
+    attr: function(nodes, root, attr, value, operator) {
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      var handler = Selector.operators[operator], results = [];
+      for (var i = 0, node; node = nodes[i]; i++) {
+        var nodeValue = Element.readAttribute(node, attr);
+        if (nodeValue === null) continue;
+        if (handler(nodeValue, value)) results.push(node);
+      }
+      return results;
+    },
+
+    pseudo: function(nodes, name, value, root, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      return Selector.pseudos[name](nodes, value, root);
+    }
+  },
+
+  pseudos: {
+    'first-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.previousElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'last-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.nextElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'only-child': function(nodes, value, root) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
+          results.push(node);
+      return results;
+    },
+    'nth-child':        function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root);
+    },
+    'nth-last-child':   function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true);
+    },
+    'nth-of-type':      function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, false, true);
+    },
+    'nth-last-of-type': function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true, true);
+    },
+    'first-of-type':    function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, false, true);
+    },
+    'last-of-type':     function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, true, true);
+    },
+    'only-of-type':     function(nodes, formula, root) {
+      var p = Selector.pseudos;
+      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
+    },
+
+    // handles the an+b logic
+    getIndices: function(a, b, total) {
+      if (a == 0) return b > 0 ? [b] : [];
+      return $R(1, total).inject([], function(memo, i) {
+        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
+        return memo;
+      });
+    },
+
+    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
+    nth: function(nodes, formula, root, reverse, ofType) {
+      if (nodes.length == 0) return [];
+      if (formula == 'even') formula = '2n+0';
+      if (formula == 'odd')  formula = '2n+1';
+      var h = Selector.handlers, results = [], indexed = [], m;
+      h.mark(nodes);
+      for (var i = 0, node; node = nodes[i]; i++) {
+        if (!node.parentNode._counted) {
+          h.index(node.parentNode, reverse, ofType);
+          indexed.push(node.parentNode);
+        }
+      }
+      if (formula.match(/^\d+$/)) { // just a number
+        formula = Number(formula);
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.nodeIndex == formula) results.push(node);
+      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+        if (m[1] == "-") m[1] = -1;
+        var a = m[1] ? Number(m[1]) : 1;
+        var b = m[2] ? Number(m[2]) : 0;
+        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
+        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
+          for (var j = 0; j < l; j++)
+            if (node.nodeIndex == indices[j]) results.push(node);
+        }
+      }
+      h.unmark(nodes);
+      h.unmark(indexed);
+      return results;
+    },
+
+    'empty': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        // IE treats comments as element nodes
+        if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
+        results.push(node);
+      }
+      return results;
+    },
+
+    'not': function(nodes, selector, root) {
+      var h = Selector.handlers, selectorType, m;
+      var exclusions = new Selector(selector).findElements(root);
+      h.mark(exclusions);
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node._counted) results.push(node);
+      h.unmark(exclusions);
+      return results;
+    },
+
+    'enabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node.disabled) results.push(node);
+      return results;
+    },
+
+    'disabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.disabled) results.push(node);
+      return results;
+    },
+
+    'checked': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.checked) results.push(node);
+      return results;
+    }
+  },
+
+  operators: {
+    '=':  function(nv, v) { return nv == v; },
+    '!=': function(nv, v) { return nv != v; },
+    '^=': function(nv, v) { return nv.startsWith(v); },
+    '$=': function(nv, v) { return nv.endsWith(v); },
+    '*=': function(nv, v) { return nv.include(v); },
+    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
+    '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
+  },
+
+  matchElements: function(elements, expression) {
+    var matches = new Selector(expression).findElements(), h = Selector.handlers;
+    h.mark(matches);
+    for (var i = 0, results = [], element; element = elements[i]; i++)
+      if (element._counted) results.push(element);
+    h.unmark(matches);
+    return results;
+  },
+
+  findElement: function(elements, expression, index) {
+    if (Object.isNumber(expression)) {
+      index = expression; expression = false;
+    }
+    return Selector.matchElements(elements, expression || '*')[index || 0];
+  },
+
+  findChildElements: function(element, expressions) {
+    var exprs = expressions.join(','), expressions = [];
+    exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+      expressions.push(m[1].strip());
+    });
+    var results = [], h = Selector.handlers;
+    for (var i = 0, l = expressions.length, selector; i < l; i++) {
+      selector = new Selector(expressions[i].strip());
+      h.concat(results, selector.findElements(element));
+    }
+    return (l > 1) ? h.unique(results) : results;
+  }
+});
+
+function $$() {
+  return Selector.findChildElements(document, $A(arguments));
+}
+var Form = {
+  reset: function(form) {
+    $(form).reset();
+    return form;
+  },
+
+  serializeElements: function(elements, options) {
+    if (typeof options != 'object') options = { hash: !!options };
+    else if (options.hash === undefined) options.hash = true;
+    var key, value, submitted = false, submit = options.submit;
+
+    var data = elements.inject({ }, function(result, element) {
+      if (!element.disabled && element.name) {
+        key = element.name; value = $(element).getValue();
+        if (value != null && (element.type != 'submit' || (!submitted &&
+            submit !== false && (!submit || key == submit) && (submitted = true)))) {
+          if (key in result) {
+            // a key is already present; construct an array of values
+            if (!Object.isArray(result[key])) result[key] = [result[key]];
+            result[key].push(value);
+          }
+          else result[key] = value;
+        }
+      }
+      return result;
+    });
+
+    return options.hash ? data : Hash.toQueryString(data);
+  }
+};
+
+Form.Methods = {
+  serialize: function(form, options) {
+    return Form.serializeElements(Form.getElements(form), options);
+  },
+
+  getElements: function(form) {
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) || (name && input.name != name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('disable');
+    return form;
+  },
+
+  enable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('enable');
+    return form;
+  },
+
+  findFirstElement: function(form) {
+    var elements = $(form).getElements().findAll(function(element) {
+      return 'hidden' != element.type && !element.disabled;
+    });
+    var firstByIndex = elements.findAll(function(element) {
+      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
+    }).sortBy(function(element) { return element.tabIndex }).first();
+
+    return firstByIndex ? firstByIndex : elements.find(function(element) {
+      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    form = $(form);
+    form.findFirstElement().activate();
+    return form;
+  },
+
+  request: function(form, options) {
+    form = $(form), options = Object.clone(options || { });
+
+    var params = options.parameters, action = form.readAttribute('action') || '';
+    if (action.blank()) action = window.location.href;
+    options.parameters = form.serialize(true);
+
+    if (params) {
+      if (Object.isString(params)) params = params.toQueryParams();
+      Object.extend(options.parameters, params);
+    }
+
+    if (form.hasAttribute('method') && !options.method)
+      options.method = form.method;
+
+    return new Ajax.Request(action, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element = {
+  focus: function(element) {
+    $(element).focus();
+    return element;
+  },
+
+  select: function(element) {
+    $(element).select();
+    return element;
+  }
+};
+
+Form.Element.Methods = {
+  serialize: function(element) {
+    element = $(element);
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = { };
+        pair[element.name] = value;
+        return Hash.toQueryString(pair);
+      }
+    }
+    return '';
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+
+  setValue: function(element, value) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    Form.Element.Serializers[method](element, value);
+    return element;
+  },
+
+  clear: function(element) {
+    $(element).value = '';
+    return element;
+  },
+
+  present: function(element) {
+    return $(element).value != '';
+  },
+
+  activate: function(element) {
+    element = $(element);
+    try {
+      element.focus();
+      if (element.select && (element.tagName.toLowerCase() != 'input' ||
+          !['button', 'reset', 'submit'].include(element.type)))
+        element.select();
+    } catch (e) { }
+    return element;
+  },
+
+  disable: function(element) {
+    element = $(element);
+    element.blur();
+    element.disabled = true;
+    return element;
+  },
+
+  enable: function(element) {
+    element = $(element);
+    element.disabled = false;
+    return element;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Field = Form.Element;
+var $F = Form.Element.Methods.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element.Serializers = {
+  input: function(element, value) {
+    switch (element.type.toLowerCase()) {
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element, value);
+      default:
+        return Form.Element.Serializers.textarea(element, value);
+    }
+  },
+
+  inputSelector: function(element, value) {
+    if (value === undefined) return element.checked ? element.value : null;
+    else element.checked = !!value;
+  },
+
+  textarea: function(element, value) {
+    if (value === undefined) return element.value;
+    else element.value = value;
+  },
+
+  select: function(element, index) {
+    if (index === undefined)
+      return this[element.type == 'select-one' ?
+        'selectOne' : 'selectMany'](element);
+    else {
+      var opt, value, single = !Object.isArray(index);
+      for (var i = 0, length = element.length; i < length; i++) {
+        opt = element.options[i];
+        value = this.optionValue(opt);
+        if (single) {
+          if (value == index) {
+            opt.selected = true;
+            return;
+          }
+        }
+        else opt.selected = index.include(value);
+      }
+    }
+  },
+
+  selectOne: function(element) {
+    var index = element.selectedIndex;
+    return index >= 0 ? this.optionValue(element.options[index]) : null;
+  },
+
+  selectMany: function(element) {
+    var values, length = element.length;
+    if (!length) return null;
+
+    for (var i = 0, values = []; i < length; i++) {
+      var opt = element.options[i];
+      if (opt.selected) values.push(this.optionValue(opt));
+    }
+    return values;
+  },
+
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
+  initialize: function($super, element, frequency, callback) {
+    $super(callback, frequency);
+    this.element   = $(element);
+    this.lastValue = this.getValue();
+  },
+
+  execute: function() {
+    var value = this.getValue();
+    if (Object.isString(this.lastValue) && Object.isString(value) ?
+        this.lastValue != value : String(this.lastValue) != String(value)) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+});
+
+Form.Element.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = Class.create({
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    Form.getElements(this.element).each(this.registerCallback, this);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        default:
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+});
+
+Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) var Event = { };
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+  KEY_HOME:     36,
+  KEY_END:      35,
+  KEY_PAGEUP:   33,
+  KEY_PAGEDOWN: 34,
+  KEY_INSERT:   45,
+
+  cache: { },
+
+  relatedTarget: function(event) {
+    var element;
+    switch(event.type) {
+      case 'mouseover': element = event.fromElement; break;
+      case 'mouseout':  element = event.toElement;   break;
+      default: return null;
+    }
+    return Element.extend(element);
+  }
+});
+
+Event.Methods = {
+  element: function(event) {
+    var node = event.target;
+    return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
+  },
+
+  findElement: function(event, expression) {
+    var element = Event.element(event);
+    return element.match(expression) ? element : element.up(expression);
+  },
+
+  isLeftClick: function(event) {
+    return (((event.which) && (event.which == 1)) ||
+            ((event.button) && (event.button == 1)));
+  },
+
+  pointer: function(event) {
+    return {
+      x: event.pageX || (event.clientX +
+        (document.documentElement.scrollLeft || document.body.scrollLeft)),
+      y: event.pageY || (event.clientY +
+        (document.documentElement.scrollTop || document.body.scrollTop))
+    };
+  },
+
+  pointerX: function(event) { return Event.pointer(event).x },
+  pointerY: function(event) { return Event.pointer(event).y },
+
+  stop: function(event) {
+    event.preventDefault();
+    event.stopPropagation();
+  }
+};
+
+Event.extend = (function() {
+  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
+    m[name] = Event.Methods[name].methodize();
+    return m;
+  });
+
+  if (Prototype.Browser.IE) {
+    Object.extend(methods, {
+      stopPropagation: function() { this.cancelBubble = true },
+      preventDefault:  function() { this.returnValue = false },
+      inspect: function() { return "[object Event]" }
+    });
+
+    return function(event) {
+      if (!event) return false;
+      if (event._extendedByPrototype) return event;
+
+      event._extendedByPrototype = Prototype.emptyFunction;
+      var pointer = Event.pointer(event);
+      Object.extend(event, {
+        target: event.srcElement,
+        relatedTarget: Event.relatedTarget(event),
+        pageX:  pointer.x,
+        pageY:  pointer.y
+      });
+      return Object.extend(event, methods);
+    };
+
+  } else {
+    Event.prototype = Event.prototype || document.createEvent("HTMLEvents").__proto__;
+    Object.extend(Event.prototype, methods);
+    return Prototype.K;
+  }
+})();
+
+Object.extend(Event, (function() {
+  var cache = Event.cache;
+
+  function getEventID(element) {
+    if (element._eventID) return element._eventID;
+    arguments.callee.id = arguments.callee.id || 1;
+    return element._eventID = ++arguments.callee.id;
+  }
+
+  function getDOMEventName(eventName) {
+    if (eventName && eventName.match(/:/)) return "dataavailable";
+    return { keypress: "keydown" }[eventName] || eventName;
+  }
+
+  function getCacheForID(id) {
+    return cache[id] = cache[id] || { };
+  }
+
+  function getWrappersForEventName(id, eventName) {
+    var c = getCacheForID(id);
+    return c[eventName] = c[eventName] || [];
+  }
+
+  function createWrapper(element, eventName, handler) {
+    var id = getEventID(element);
+    var c = getWrappersForEventName(id, eventName);
+    if (c.pluck("handler").include(handler)) return false;
+
+    var wrapper = function(event) {
+      if (event.eventName && event.eventName != eventName)
+        return false;
+
+      Event.extend(event);
+      handler.call(element, event)
+    };
+
+    wrapper.handler = handler;
+    c.push(wrapper);
+    return wrapper;
+  }
+
+  function findWrapper(id, eventName, handler) {
+    var c = getWrappersForEventName(id, eventName);
+    return c.find(function(wrapper) { return wrapper.handler == handler });
+  }
+
+  function destroyWrapper(id, eventName, handler) {
+    var c = getCacheForID(id);
+    if (!c[eventName]) return false;
+    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
+  }
+
+  function destroyCache() {
+    for (var id in cache)
+      for (var eventName in cache[id])
+        cache[id][eventName] = null;
+  }
+
+  if (window.attachEvent) {
+    window.attachEvent("onunload", destroyCache);
+  }
+
+  return {
+    observe: function(element, eventName, handler) {
+      element = $(element);
+      var name = getDOMEventName(eventName);
+
+      var wrapper = createWrapper(element, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.addEventListener) {
+        element.addEventListener(name, wrapper, false);
+      } else {
+        element.attachEvent("on" + name, wrapper);
+      }
+
+      return element;
+    },
+
+    stopObserving: function(element, eventName, handler) {
+      element = $(element);
+      var id = getEventID(element), name = getDOMEventName(eventName);
+
+      if (!handler && eventName) {
+        getWrappersForEventName(id, eventName).each(function(wrapper) {
+          element.stopObserving(eventName, wrapper.handler);
+        });
+        return element;
+
+      } else if (!eventName) {
+        Object.keys(getCacheForID(id)).each(function(eventName) {
+          element.stopObserving(eventName);
+        });
+        return element;
+      }
+
+      var wrapper = findWrapper(id, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.removeEventListener) {
+        element.removeEventListener(name, wrapper, false);
+      } else {
+        element.detachEvent("on" + name, wrapper);
+      }
+
+      destroyWrapper(id, eventName, handler);
+
+      return element;
+    },
+
+    fire: function(element, eventName, memo) {
+      element = $(element);
+      if (element == document && document.createEvent && !element.dispatchEvent)
+        element = document.documentElement;
+
+      if (document.createEvent) {
+        var event = document.createEvent("HTMLEvents");
+        event.initEvent("dataavailable", true, true);
+      } else {
+        var event = document.createEventObject();
+        event.eventType = "ondataavailable";
+      }
+
+      event.eventName = eventName;
+      event.memo = memo || { };
+
+      if (document.createEvent) {
+        element.dispatchEvent(event);
+      } else {
+        element.fireEvent(event.eventType, event);
+      }
+
+      return event;
+    }
+  };
+})());
+
+Object.extend(Event, Event.Methods);
+
+Element.addMethods({
+  fire:          Event.fire,
+  observe:       Event.observe,
+  stopObserving: Event.stopObserving
+});
+
+Object.extend(document, {
+  fire:          Element.Methods.fire.methodize(),
+  observe:       Element.Methods.observe.methodize(),
+  stopObserving: Element.Methods.stopObserving.methodize()
+});
+
+(function() {
+  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
+     Matthias Miller, Dean Edwards and John Resig. */
+
+  var timer, fired = false;
+
+  function fireContentLoadedEvent() {
+    if (fired) return;
+    if (timer) window.clearInterval(timer);
+    document.fire("dom:loaded");
+    fired = true;
+  }
+
+  if (document.addEventListener) {
+    if (Prototype.Browser.WebKit) {
+      timer = window.setInterval(function() {
+        if (/loaded|complete/.test(document.readyState))
+          fireContentLoadedEvent();
+      }, 0);
+
+      Event.observe(window, "load", fireContentLoadedEvent);
+
+    } else {
+      document.addEventListener("DOMContentLoaded",
+        fireContentLoadedEvent, false);
+    }
+
+  } else {
+    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
+    $("__onDOMContentLoaded").onreadystatechange = function() {
+      if (this.readyState == "complete") {
+        this.onreadystatechange = null;
+        fireContentLoadedEvent();
+      }
+    };
+  }
+})();
+/*------------------------------- DEPRECATED -------------------------------*/
+
+var Toggle = { display: Element.toggle };
+
+Element.Methods.childOf = Element.Methods.descendantOf;
+
+var Insertion = {
+  Before: function(element, content) {
+    return Element.insert(element, {before:content});
+  },
+
+  Top: function(element, content) {
+    return Element.insert(element, {top:content});
+  },
+
+  Bottom: function(element, content) {
+    return Element.insert(element, {bottom:content});
+  },
+
+  After: function(element, content) {
+    return Element.insert(element, {after:content});
+  }
+};
+
+var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
+
+// This should be moved to script.aculo.us; notice the deprecated methods
+// further below, that map to the newer Element methods.
+var Position = {
+  // set to true if needed, warning: firefox performance problems
+  // NOT neeeded for page scrolling, only if draggable contained in
+  // scrollable elements
+  includeScrollOffsets: false,
+
+  // must be called before calling withinIncludingScrolloffset, every time the
+  // page is scrolled
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
+  },
+
+  // caches x/y coordinate pair to use with overlap
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
+  },
+
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = Element.cumulativeScrollOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  // within must be called directly before
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+  // Deprecation layer -- use newer Element methods now (1.5.2).
+
+  cumulativeOffset: Element.Methods.cumulativeOffset,
+
+  positionedOffset: Element.Methods.positionedOffset,
+
+  absolutize: function(element) {
+    Position.prepare();
+    return Element.absolutize(element);
+  },
+
+  relativize: function(element) {
+    Position.prepare();
+    return Element.relativize(element);
+  },
+
+  realOffset: Element.Methods.cumulativeScrollOffset,
+
+  offsetParent: Element.Methods.getOffsetParent,
+
+  page: Element.Methods.viewportOffset,
+
+  clone: function(source, target, options) {
+    options = options || { };
+    return Element.clonePosition(target, source, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
+  function iter(name) {
+    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
+  }
+
+  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
+  function(element, className) {
+    className = className.toString().strip();
+    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
+    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
+  } : function(element, className) {
+    className = className.toString().strip();
+    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
+    if (!classNames && !className) return elements;
+
+    var nodes = $(element).getElementsByTagName('*');
+    className = ' ' + className + ' ';
+
+    for (var i = 0, child, cn; child = nodes[i]; i++) {
+      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
+          (classNames && classNames.all(function(name) {
+            return !name.toString().blank() && cn.include(' ' + name + ' ');
+          }))))
+        elements.push(Element.extend(child));
+    }
+    return elements;
+  };
+
+  return function(className, parentElement) {
+    return $(parentElement || document.body).getElementsByClassName(className);
+  };
+}(Element.Methods);
+
+/*--------------------------------------------------------------------------*/
+
+Element.ClassNames = Class.create();
+Element.ClassNames.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+  },
+
+  _each: function(iterator) {
+    this.element.className.split(/\s+/).select(function(name) {
+      return name.length > 0;
+    })._each(iterator);
+  },
+
+  set: function(className) {
+    this.element.className = className;
+  },
+
+  add: function(classNameToAdd) {
+    if (this.include(classNameToAdd)) return;
+    this.set($A(this).concat(classNameToAdd).join(' '));
+  },
+
+  remove: function(classNameToRemove) {
+    if (!this.include(classNameToRemove)) return;
+    this.set($A(this).without(classNameToRemove).join(' '));
+  },
+
+  toString: function() {
+    return $A(this).join(' ');
+  }
+};
+
+Object.extend(Element.ClassNames.prototype, Enumerable);
+
+/*--------------------------------------------------------------------------*/
+
+Element.addMethods();
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/scriptaculous.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/scriptaculous.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/scriptaculous.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/scriptaculous.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,58 @@
+// script.aculo.us scriptaculous.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// 
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Scriptaculous = {
+  Version: '1.8.0_pre1',
+  require: function(libraryName) {
+    // inserting via DOM fails in Safari 2.0, so brute force approach
+    document.write('<script type="text/javascript" src="'+libraryName+'"></script>');
+  },
+  REQUIRED_PROTOTYPE: '1.6.0',
+  load: function() {
+    function convertVersionString(versionString){
+      var r = versionString.split('.');
+      return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
+    }
+ 
+    if((typeof Prototype=='undefined') || 
+       (typeof Element == 'undefined') || 
+       (typeof Element.Methods=='undefined') ||
+       (convertVersionString(Prototype.Version) < 
+        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
+       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
+        Scriptaculous.REQUIRED_PROTOTYPE);
+    
+    $A(document.getElementsByTagName("script")).findAll( function(s) {
+      return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
+    }).each( function(s) {
+      var path = s.src.replace(/scriptaculous\.js(\?.*)?$/,'');
+      var includes = s.src.match(/\?.*load=([a-z,]*)/);
+      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+       function(include) { Scriptaculous.require(path+include+'.js') });
+    });
+  }
+}
+
+Scriptaculous.load();
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/slider.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/slider.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/slider.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/slider.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,276 @@
+// script.aculo.us slider.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs 
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if (!Control) var Control = { };
+Control.Slider = Class.create();
+
+// options:
+//  axis: 'vertical', or 'horizontal' (default)
+//
+// callbacks:
+//  onChange(value)
+//  onSlide(value)
+Control.Slider.prototype = {
+  initialize: function(handle, track, options) {
+    var slider = this;
+    
+    if (Object.isArray(handle)) {
+      this.handles = handle.collect( function(e) { return $(e) });
+    } else {
+      this.handles = [$(handle)];
+    }
+    
+    this.track   = $(track);
+    this.options = options || { };
+
+    this.axis      = this.options.axis || 'horizontal';
+    this.increment = this.options.increment || 1;
+    this.step      = parseInt(this.options.step || '1');
+    this.range     = this.options.range || $R(0,1);
+    
+    this.value     = 0; // assure backwards compat
+    this.values    = this.handles.map( function() { return 0 });
+    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
+    this.options.startSpan = $(this.options.startSpan || null);
+    this.options.endSpan   = $(this.options.endSpan || null);
+
+    this.restricted = this.options.restricted || false;
+
+    this.maximum   = this.options.maximum || this.range.end;
+    this.minimum   = this.options.minimum || this.range.start;
+
+    // Will be used to align the handle onto the track, if necessary
+    this.alignX = parseInt(this.options.alignX || '0');
+    this.alignY = parseInt(this.options.alignY || '0');
+    
+    this.trackLength = this.maximumOffset() - this.minimumOffset();
+
+    this.handleLength = this.isVertical() ? 
+      (this.handles[0].offsetHeight != 0 ? 
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : 
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : 
+        this.handles[0].style.width.replace(/px$/,""));
+
+    this.active   = false;
+    this.dragging = false;
+    this.disabled = false;
+
+    if (this.options.disabled) this.setDisabled();
+
+    // Allowed values array
+    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
+    if (this.allowedValues) {
+      this.minimum = this.allowedValues.min();
+      this.maximum = this.allowedValues.max();
+    }
+
+    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
+    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+    this.eventMouseMove = this.update.bindAsEventListener(this);
+
+    // Initialize handles in reverse (make sure first handle is active)
+    this.handles.each( function(h,i) {
+      i = slider.handles.length-1-i;
+      slider.setValue(parseFloat(
+        (Object.isArray(slider.options.sliderValue) ? 
+          slider.options.sliderValue[i] : slider.options.sliderValue) || 
+         slider.range.start), i);
+      h.makePositioned().observe("mousedown", slider.eventMouseDown);
+    });
+    
+    this.track.observe("mousedown", this.eventMouseDown);
+    document.observe("mouseup", this.eventMouseUp);
+    document.observe("mousemove", this.eventMouseMove);
+    
+    this.initialized = true;
+  },
+  dispose: function() {
+    var slider = this;    
+    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
+    Event.stopObserving(document, "mouseup", this.eventMouseUp);
+    Event.stopObserving(document, "mousemove", this.eventMouseMove);
+    this.handles.each( function(h) {
+      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
+    });
+  },
+  setDisabled: function(){
+    this.disabled = true;
+  },
+  setEnabled: function(){
+    this.disabled = false;
+  },  
+  getNearestValue: function(value){
+    if (this.allowedValues){
+      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
+      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
+      
+      var offset = Math.abs(this.allowedValues[0] - value);
+      var newValue = this.allowedValues[0];
+      this.allowedValues.each( function(v) {
+        var currentOffset = Math.abs(v - value);
+        if (currentOffset <= offset){
+          newValue = v;
+          offset = currentOffset;
+        } 
+      });
+      return newValue;
+    }
+    if (value > this.range.end) return this.range.end;
+    if (value < this.range.start) return this.range.start;
+    return value;
+  },
+  setValue: function(sliderValue, handleIdx){
+    if (!this.active) {
+      this.activeHandleIdx = handleIdx || 0;
+      this.activeHandle    = this.handles[this.activeHandleIdx];
+      this.updateStyles();
+    }
+    handleIdx = handleIdx || this.activeHandleIdx || 0;
+    if (this.initialized && this.restricted) {
+      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
+        sliderValue = this.values[handleIdx-1];
+      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
+        sliderValue = this.values[handleIdx+1];
+    }
+    sliderValue = this.getNearestValue(sliderValue);
+    this.values[handleIdx] = sliderValue;
+    this.value = this.values[0]; // assure backwards compat
+    
+    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = 
+      this.translateToPx(sliderValue);
+    
+    this.drawSpans();
+    if (!this.dragging || !this.event) this.updateFinished();
+  },
+  setValueBy: function(delta, handleIdx) {
+    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
+      handleIdx || this.activeHandleIdx || 0);
+  },
+  translateToPx: function(value) {
+    return Math.round(
+      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * 
+      (value - this.range.start)) + "px";
+  },
+  translateToValue: function(offset) {
+    return ((offset/(this.trackLength-this.handleLength) * 
+      (this.range.end-this.range.start)) + this.range.start);
+  },
+  getRange: function(range) {
+    var v = this.values.sortBy(Prototype.K); 
+    range = range || 0;
+    return $R(v[range],v[range+1]);
+  },
+  minimumOffset: function(){
+    return(this.isVertical() ? this.alignY : this.alignX);
+  },
+  maximumOffset: function(){
+    return(this.isVertical() ? 
+      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
+        this.track.style.height.replace(/px$/,"")) - this.alignY : 
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
+        this.track.style.width.replace(/px$/,"")) - this.alignY);
+  },  
+  isVertical:  function(){
+    return (this.axis == 'vertical');
+  },
+  drawSpans: function() {
+    var slider = this;
+    if (this.spans)
+      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
+    if (this.options.startSpan)
+      this.setSpan(this.options.startSpan,
+        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
+    if (this.options.endSpan)
+      this.setSpan(this.options.endSpan, 
+        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
+  },
+  setSpan: function(span, range) {
+    if (this.isVertical()) {
+      span.style.top = this.translateToPx(range.start);
+      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
+    } else {
+      span.style.left = this.translateToPx(range.start);
+      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
+    }
+  },
+  updateStyles: function() {
+    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
+    Element.addClassName(this.activeHandle, 'selected');
+  },
+  startDrag: function(event) {
+    if (Event.isLeftClick(event)) {
+      if (!this.disabled){
+        this.active = true;
+        
+        var handle = Event.element(event);
+        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
+        var track = handle;
+        if (track==this.track) {
+          var offsets  = Position.cumulativeOffset(this.track); 
+          this.event = event;
+          this.setValue(this.translateToValue( 
+           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
+          ));
+          var offsets  = Position.cumulativeOffset(this.activeHandle);
+          this.offsetX = (pointer[0] - offsets[0]);
+          this.offsetY = (pointer[1] - offsets[1]);
+        } else {
+          // find the handle (prevents issues with Safari)
+          while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
+            handle = handle.parentNode;
+            
+          if (this.handles.indexOf(handle)!=-1) {
+            this.activeHandle    = handle;
+            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+            this.updateStyles();
+            
+            var offsets  = Position.cumulativeOffset(this.activeHandle);
+            this.offsetX = (pointer[0] - offsets[0]);
+            this.offsetY = (pointer[1] - offsets[1]);
+          }
+        }
+      }
+      Event.stop(event);
+    }
+  },
+  update: function(event) {
+   if (this.active) {
+      if (!this.dragging) this.dragging = true;
+      this.draw(event);
+      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+      Event.stop(event);
+   }
+  },
+  draw: function(event) {
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    var offsets = Position.cumulativeOffset(this.track);
+    pointer[0] -= this.offsetX + offsets[0];
+    pointer[1] -= this.offsetY + offsets[1];
+    this.event = event;
+    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
+    if (this.initialized && this.options.onSlide)
+      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
+  },
+  endDrag: function(event) {
+    if (this.active && this.dragging) {
+      this.finishDrag(event, true);
+      Event.stop(event);
+    }
+    this.active = false;
+    this.dragging = false;
+  },  
+  finishDrag: function(event, success) {
+    this.active = false;
+    this.dragging = false;
+    this.updateFinished();
+  },
+  updateFinished: function() {
+    if (this.initialized && this.options.onChange) 
+      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
+    this.event = null;
+  }
+}
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/sound.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/sound.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/sound.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/sound.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,55 @@
+// script.aculo.us sound.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Based on code created by Jules Gravinese (http://www.webveteran.com/)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+Sound = {
+  tracks: {},
+  _enabled: true,
+  template:
+    new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
+  enable: function(){
+    Sound._enabled = true;
+  },
+  disable: function(){
+    Sound._enabled = false;
+  },
+  play: function(url){
+    if(!Sound._enabled) return;
+    var options = Object.extend({
+      track: 'global', url: url, replace: false
+    }, arguments[1] || {});
+    
+    if(options.replace && this.tracks[options.track]) {
+      $R(0, this.tracks[options.track].id).each(function(id){
+        var sound = $('sound_'+options.track+'_'+id);
+        sound.Stop && sound.Stop();
+        sound.remove();
+      })
+      this.tracks[options.track] = null;
+    }
+      
+    if(!this.tracks[options.track])
+      this.tracks[options.track] = { id: 0 }
+    else
+      this.tracks[options.track].id++;
+      
+    options.id = this.tracks[options.track].id;
+    $$('body')[0].insert( 
+      Prototype.Browser.IE ? new Element('bgsound',{
+        id: 'sound_'+options.track+'_'+options.id,
+        src: options.url, loop: 1, autostart: true
+      }) : Sound.template.evaluate(options));
+  }
+};
+
+if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
+  if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 }))
+    Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>')
+  else
+    Sound.play = function(){}
+}
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/unittest.js technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/unittest.js
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/javascripts/unittest.js	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/javascripts/unittest.js	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,568 @@
+// script.aculo.us unittest.js v1.8.0_pre1, Fri Oct 12 21:34:51 +0200 2007
+
+// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
+//           (c) 2005-2007 Michael Schuerig (http://www.schuerig.de/michael/)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// experimental, Firefox-only
+Event.simulateMouse = function(element, eventName) {
+  var options = Object.extend({
+    pointerX: 0,
+    pointerY: 0,
+    buttons:  0,
+    ctrlKey:  false,
+    altKey:   false,
+    shiftKey: false,
+    metaKey:  false
+  }, arguments[2] || {});
+  var oEvent = document.createEvent("MouseEvents");
+  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
+    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
+  
+  if(this.mark) Element.remove(this.mark);
+  this.mark = document.createElement('div');
+  this.mark.appendChild(document.createTextNode(" "));
+  document.body.appendChild(this.mark);
+  this.mark.style.position = 'absolute';
+  this.mark.style.top = options.pointerY + "px";
+  this.mark.style.left = options.pointerX + "px";
+  this.mark.style.width = "5px";
+  this.mark.style.height = "5px;";
+  this.mark.style.borderTop = "1px solid red;"
+  this.mark.style.borderLeft = "1px solid red;"
+  
+  if(this.step)
+    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
+  
+  $(element).dispatchEvent(oEvent);
+};
+
+// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
+// You need to downgrade to 1.0.4 for now to get this working
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
+Event.simulateKey = function(element, eventName) {
+  var options = Object.extend({
+    ctrlKey: false,
+    altKey: false,
+    shiftKey: false,
+    metaKey: false,
+    keyCode: 0,
+    charCode: 0
+  }, arguments[2] || {});
+
+  var oEvent = document.createEvent("KeyEvents");
+  oEvent.initKeyEvent(eventName, true, true, window, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
+    options.keyCode, options.charCode );
+  $(element).dispatchEvent(oEvent);
+};
+
+Event.simulateKeys = function(element, command) {
+  for(var i=0; i<command.length; i++) {
+    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
+  }
+};
+
+var Test = {}
+Test.Unit = {};
+
+// security exception workaround
+Test.Unit.inspect = Object.inspect;
+
+Test.Unit.Logger = Class.create();
+Test.Unit.Logger.prototype = {
+  initialize: function(log) {
+    this.log = $(log);
+    if (this.log) {
+      this._createLogTable();
+    }
+  },
+  start: function(testName) {
+    if (!this.log) return;
+    this.testName = testName;
+    this.lastLogLine = document.createElement('tr');
+    this.statusCell = document.createElement('td');
+    this.nameCell = document.createElement('td');
+    this.nameCell.className = "nameCell";
+    this.nameCell.appendChild(document.createTextNode(testName));
+    this.messageCell = document.createElement('td');
+    this.lastLogLine.appendChild(this.statusCell);
+    this.lastLogLine.appendChild(this.nameCell);
+    this.lastLogLine.appendChild(this.messageCell);
+    this.loglines.appendChild(this.lastLogLine);
+  },
+  finish: function(status, summary) {
+    if (!this.log) return;
+    this.lastLogLine.className = status;
+    this.statusCell.innerHTML = status;
+    this.messageCell.innerHTML = this._toHTML(summary);
+    this.addLinksToResults();
+  },
+  message: function(message) {
+    if (!this.log) return;
+    this.messageCell.innerHTML = this._toHTML(message);
+  },
+  summary: function(summary) {
+    if (!this.log) return;
+    this.logsummary.innerHTML = this._toHTML(summary);
+  },
+  _createLogTable: function() {
+    this.log.innerHTML =
+    '<div id="logsummary"></div>' +
+    '<table id="logtable">' +
+    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
+    '<tbody id="loglines"></tbody>' +
+    '</table>';
+    this.logsummary = $('logsummary')
+    this.loglines = $('loglines');
+  },
+  _toHTML: function(txt) {
+    return txt.escapeHTML().replace(/\n/g,"<br/>");
+  },
+  addLinksToResults: function(){ 
+    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run only this test"
+      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
+    });
+    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run all tests"
+      Event.observe(td, 'click', function(){ window.location.search = "";});
+    });
+  }
+}
+
+Test.Unit.Runner = Class.create();
+Test.Unit.Runner.prototype = {
+  initialize: function(testcases) {
+    this.options = Object.extend({
+      testLog: 'testlog'
+    }, arguments[1] || {});
+    this.options.resultsURL = this.parseResultsURLQueryParameter();
+    this.options.tests      = this.parseTestsQueryParameter();
+    if (this.options.testLog) {
+      this.options.testLog = $(this.options.testLog) || null;
+    }
+    if(this.options.tests) {
+      this.tests = [];
+      for(var i = 0; i < this.options.tests.length; i++) {
+        if(/^test/.test(this.options.tests[i])) {
+          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
+        }
+      }
+    } else {
+      if (this.options.test) {
+        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
+      } else {
+        this.tests = [];
+        for(var testcase in testcases) {
+          if(/^test/.test(testcase)) {
+            this.tests.push(
+               new Test.Unit.Testcase(
+                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
+                 testcases[testcase], testcases["setup"], testcases["teardown"]
+               ));
+          }
+        }
+      }
+    }
+    this.currentTest = 0;
+    this.logger = new Test.Unit.Logger(this.options.testLog);
+    setTimeout(this.runTests.bind(this), 1000);
+  },
+  parseResultsURLQueryParameter: function() {
+    return window.location.search.parseQuery()["resultsURL"];
+  },
+  parseTestsQueryParameter: function(){
+    if (window.location.search.parseQuery()["tests"]){
+        return window.location.search.parseQuery()["tests"].split(',');
+    };
+  },
+  // Returns:
+  //  "ERROR" if there was an error,
+  //  "FAILURE" if there was a failure, or
+  //  "SUCCESS" if there was neither
+  getResult: function() {
+    var hasFailure = false;
+    for(var i=0;i<this.tests.length;i++) {
+      if (this.tests[i].errors > 0) {
+        return "ERROR";
+      }
+      if (this.tests[i].failures > 0) {
+        hasFailure = true;
+      }
+    }
+    if (hasFailure) {
+      return "FAILURE";
+    } else {
+      return "SUCCESS";
+    }
+  },
+  postResults: function() {
+    if (this.options.resultsURL) {
+      new Ajax.Request(this.options.resultsURL, 
+        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
+    }
+  },
+  runTests: function() {
+    var test = this.tests[this.currentTest];
+    if (!test) {
+      // finished!
+      this.postResults();
+      this.logger.summary(this.summary());
+      return;
+    }
+    if(!test.isWaiting) {
+      this.logger.start(test.name);
+    }
+    test.run();
+    if(test.isWaiting) {
+      this.logger.message("Waiting for " + test.timeToWait + "ms");
+      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
+    } else {
+      this.logger.finish(test.status(), test.summary());
+      this.currentTest++;
+      // tail recursive, hopefully the browser will skip the stackframe
+      this.runTests();
+    }
+  },
+  summary: function() {
+    var assertions = 0;
+    var failures = 0;
+    var errors = 0;
+    var messages = [];
+    for(var i=0;i<this.tests.length;i++) {
+      assertions +=   this.tests[i].assertions;
+      failures   +=   this.tests[i].failures;
+      errors     +=   this.tests[i].errors;
+    }
+    return (
+      (this.options.context ? this.options.context + ': ': '') + 
+      this.tests.length + " tests, " + 
+      assertions + " assertions, " + 
+      failures   + " failures, " +
+      errors     + " errors");
+  }
+}
+
+Test.Unit.Assertions = Class.create();
+Test.Unit.Assertions.prototype = {
+  initialize: function() {
+    this.assertions = 0;
+    this.failures   = 0;
+    this.errors     = 0;
+    this.messages   = [];
+  },
+  summary: function() {
+    return (
+      this.assertions + " assertions, " + 
+      this.failures   + " failures, " +
+      this.errors     + " errors" + "\n" +
+      this.messages.join("\n"));
+  },
+  pass: function() {
+    this.assertions++;
+  },
+  fail: function(message) {
+    this.failures++;
+    this.messages.push("Failure: " + message);
+  },
+  info: function(message) {
+    this.messages.push("Info: " + message);
+  },
+  error: function(error) {
+    this.errors++;
+    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
+  },
+  status: function() {
+    if (this.failures > 0) return 'failed';
+    if (this.errors > 0) return 'error';
+    return 'passed';
+  },
+  assert: function(expression) {
+    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
+    try { expression ? this.pass() : 
+      this.fail(message); }
+    catch(e) { this.error(e); }
+  },
+  assertEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEqual";
+    try { (expected == actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInspect: function(expected, actual) {
+    var message = arguments[2] || "assertInspect";
+    try { (expected == actual.inspect()) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertEnumEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEnumEqual";
+    try { $A(expected).length == $A(actual).length && 
+      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
+        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
+          ', actual ' + Test.Unit.inspect(actual)); }
+    catch(e) { this.error(e); }
+  },
+  assertNotEqual: function(expected, actual) {
+    var message = arguments[2] || "assertNotEqual";
+    try { (expected != actual) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertIdentical"; 
+    try { (expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNotIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertNotIdentical"; 
+    try { !(expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNull: function(obj) {
+    var message = arguments[1] || 'assertNull'
+    try { (obj==null) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertMatch: function(expected, actual) {
+    var message = arguments[2] || 'assertMatch';
+    var regex = new RegExp(expected);
+    try { (regex.exec(actual)) ? this.pass() :
+      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertHidden: function(element) {
+    var message = arguments[1] || 'assertHidden';
+    this.assertEqual("none", element.style.display, message);
+  },
+  assertNotNull: function(object) {
+    var message = arguments[1] || 'assertNotNull';
+    this.assert(object != null, message);
+  },
+  assertType: function(expected, actual) {
+    var message = arguments[2] || 'assertType';
+    try { 
+      (actual.constructor == expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNotOfType: function(expected, actual) {
+    var message = arguments[2] || 'assertNotOfType';
+    try { 
+      (actual.constructor != expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertInstanceOf';
+    try { 
+      (actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was not an instance of the expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertNotInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertNotInstanceOf';
+    try { 
+      !(actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was an instance of the not expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertRespondsTo: function(method, obj) {
+    var message = arguments[2] || 'assertRespondsTo';
+    try {
+      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
+      this.fail(message + ": object doesn't respond to [" + method + "]"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsTrue: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsTrue';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      m() ? this.pass() : 
+      this.fail(message + ": method returned false"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsFalse: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsFalse';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      !m() ? this.pass() : 
+      this.fail(message + ": method returned true"); }
+    catch(e) { this.error(e); }
+  },
+  assertRaise: function(exceptionName, method) {
+    var message = arguments[2] || 'assertRaise';
+    try { 
+      method();
+      this.fail(message + ": exception expected but none was raised"); }
+    catch(e) {
+      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
+    }
+  },
+  assertElementsMatch: function() {
+    var expressions = $A(arguments), elements = $A(expressions.shift());
+    if (elements.length != expressions.length) {
+      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
+      return false;
+    }
+    elements.zip(expressions).all(function(pair, index) {
+      var element = $(pair.first()), expression = pair.last();
+      if (element.match(expression)) return true;
+      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
+    }.bind(this)) && this.pass();
+  },
+  assertElementMatches: function(element, expression) {
+    this.assertElementsMatch([element], expression);
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  },
+  _isVisible: function(element) {
+    element = $(element);
+    if(!element.parentNode) return true;
+    this.assertNotNull(element);
+    if(element.style && Element.getStyle(element, 'display') == 'none')
+      return false;
+    
+    return this._isVisible(element.parentNode);
+  },
+  assertNotVisible: function(element) {
+    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
+  },
+  assertVisible: function(element) {
+    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  }
+}
+
+Test.Unit.Testcase = Class.create();
+Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
+  initialize: function(name, test, setup, teardown) {
+    Test.Unit.Assertions.prototype.initialize.bind(this)();
+    this.name           = name;
+    
+    if(typeof test == 'string') {
+      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
+      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
+      this.test = function() {
+        eval('with(this){'+test+'}');
+      }
+    } else {
+      this.test = test || function() {};
+    }
+    
+    this.setup          = setup || function() {};
+    this.teardown       = teardown || function() {};
+    this.isWaiting      = false;
+    this.timeToWait     = 1000;
+  },
+  wait: function(time, nextPart) {
+    this.isWaiting = true;
+    this.test = nextPart;
+    this.timeToWait = time;
+  },
+  run: function() {
+    try {
+      try {
+        if (!this.isWaiting) this.setup.bind(this)();
+        this.isWaiting = false;
+        this.test.bind(this)();
+      } finally {
+        if(!this.isWaiting) {
+          this.teardown.bind(this)();
+        }
+      }
+    }
+    catch(e) { this.error(e); }
+  }
+});
+
+// *EXPERIMENTAL* BDD-style testing to please non-technical folk
+// This draws many ideas from RSpec http://rspec.rubyforge.org/
+
+Test.setupBDDExtensionMethods = function(){
+  var METHODMAP = {
+    shouldEqual:     'assertEqual',
+    shouldNotEqual:  'assertNotEqual',
+    shouldEqualEnum: 'assertEnumEqual',
+    shouldBeA:       'assertType',
+    shouldNotBeA:    'assertNotOfType',
+    shouldBeAn:      'assertType',
+    shouldNotBeAn:   'assertNotOfType',
+    shouldBeNull:    'assertNull',
+    shouldNotBeNull: 'assertNotNull',
+    
+    shouldBe:        'assertReturnsTrue',
+    shouldNotBe:     'assertReturnsFalse',
+    shouldRespondTo: 'assertRespondsTo'
+  };
+  var makeAssertion = function(assertion, args, object) { 
+   	this[assertion].apply(this,(args || []).concat([object]));
+  }
+  
+  Test.BDDMethods = {};   
+  $H(METHODMAP).each(function(pair) { 
+    Test.BDDMethods[pair.key] = function() { 
+       var args = $A(arguments); 
+       var scope = args.shift(); 
+       makeAssertion.apply(scope, [pair.value, args, this]); }; 
+  });
+  
+  [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
+    function(p){ Object.extend(p, Test.BDDMethods) }
+  );
+}
+
+Test.context = function(name, spec, log){
+  Test.setupBDDExtensionMethods();
+  
+  var compiledSpec = {};
+  var titles = {};
+  for(specName in spec) {
+    switch(specName){
+      case "setup":
+      case "teardown":
+        compiledSpec[specName] = spec[specName];
+        break;
+      default:
+        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
+        var body = spec[specName].toString().split('\n').slice(1);
+        if(/^\{/.test(body[0])) body = body.slice(1);
+        body.pop();
+        body = body.map(function(statement){ 
+          return statement.strip()
+        });
+        compiledSpec[testName] = body.join('\n');
+        titles[testName] = specName;
+    }
+  }
+  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
+};
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/lib/server.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/lib/server.rb
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/lib/server.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/lib/server.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,24 @@
+require 'webrick'
+
+class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_POST(request, response)
+    File.open('story', 'w') do |io|
+      io.write(request.body)
+    end
+
+    response.status = 200
+    response['Content-Type'] = 'text/html'
+    response.body = "body"
+  end
+end
+
+params = { :Port        => 4000,
+           :ServerType  => WEBrick::SimpleServer,
+           :BindAddress => "0.0.0.0",
+           :MimeTypes   => WEBrick::HTTPUtils::DefaultMimeTypes }
+server = WEBrick::HTTPServer.new(params)
+server.mount('/stories', DispatchServlet)
+server.mount('/', WEBrick::HTTPServlet::FileHandler, File.dirname(__FILE__) + '/..', { :FancyIndexing => true })
+
+trap("INT") { server.shutdown }
+server.start
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/stories.html technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/stories.html
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/stories.html	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/stories.html	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <title>Stories</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Expires" content="-1" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <script src="javascripts/prototype.js" type="text/javascript"></script>
+    <script src="javascripts/scriptaculous.js" type="text/javascript"></script>
+    <script src="javascripts/application.js" type="text/javascript"></script>
+    <script src="javascripts/unittest.js" type="text/javascript"></script>
+    
+    <link href="stylesheets/style.css" rel="stylesheet" type="text/css" />
+    <link href="stylesheets/test.css" rel="stylesheet" type="text/css" />
+  </head>
+  <body>
+    <!-- 
+    Classes and ids that are only used by the Story UI, which don't have to be present in
+    the Example report:
+    
+    #nav
+    #stock_steps
+    dl.story
+    ul.steps
+    -->
+    <div id="nav">
+      <a href="#" onclick="javascript:StoryDom.save();">SAVE</a>
+    </div>
+    <div id="container">
+      <ul id="stock_steps" style="display: none;">
+        <li>Given my savings account balance is $balance dollars</li>
+        <li>Given my cash account balance is $balance dollars</li>
+        <li>Given my $which account has been blocked for $n days</li>
+        <li>When I transfer $amount dollars</li>
+        <li>Then my savings account balance should be $balance dollars</li>
+        <li>Then my cash account balance should be $balance dollars</li>
+      </ul>
+      <dl class="story failed">
+        <dt>transfer to cash account</dt>
+        <dd>
+          <p>
+            As a savings account holder<br />
+            I want to transfer money from my savings account<br />
+            So that I can get cash easily from an ATM<br />
+          </p>
+          <dl class="passed">
+            <dt>savings account is in credit</dt>
+            <dd>
+              <ul class="steps">
+                <li class="passed">Given my savings account balance is <span class="param">100</span> dollars</li>
+                <li class="passed">Given my cash account balance is <span class="param">10</span> dollars</li>
+                <li class="passed">When I transfer <span class="param">20</span> dollars</li>
+                <li class="passed">Then my savings account balance should be <span class="param">80</span> dollars</li>
+                <li class="passed">Then my cash account balance should be <span class="param">30</span> dollars</li>
+              </ul>
+            </dd>
+          </dl>
+
+          <dl class="failed">
+            <dt>savings account is overdrawn</dt>
+            <dd>
+              <ul class="steps">
+                <li class="passed">Given my savings account balance is <span class="param">-20</span> dollars</li>
+                <li class="passed">Given my cash account balance is <span class="param">10</span> dollars</li>
+                <li class="passed">When I transfer <span class="param">20</span> dollars</li>
+                <li class="failed">Then my savings account balance should be <span class="param">-20</span> dollars</li>
+                <li class="failed">Then my cash account balance should be <span class="param">10</span> dollars</li>
+                <li class="pending">Then I should still be poor</li>
+              </ul>
+            </dd>
+          </dl>
+        </dd>
+      </dl>
+      <!-- More stories here... -->
+
+      <!-- Tests follow -->
+      <div id="testlog"> </div>
+      <script type="text/javascript" language="javascript" charset="utf-8">
+      // <![CDATA[
+      Test.context("RSpec editor tests (this won't be in the final editor - it's just self tests)",{
+        'should extract story narrative': function() {
+          var narrative = StoryDom.narrativeText($$('p')[0].innerHTML);
+          narrative.shouldEqual(
+            "  As a savings account holder\n" + 
+            "  I want to transfer money from my savings account\n" +
+            "  So that I can get cash easily from an ATM\n"
+          );
+        },
+
+        'should extract step text with two spans': function() {
+          var stepText = StoryDom.stepText('Given <span class="param">this</span> and <span class="param">that</span> stuff');
+          stepText.shouldEqual("Given this and that stuff");
+        },
+
+        'should extract scenario': function() {
+          var scenario = StoryDom.scenario($$('dl')[1]);
+          scenario.shouldEqual(
+            "  Scenario: savings account is in credit\n" + 
+            "    Given my savings account balance is 100 dollars\n" +
+            "    Given my cash account balance is 10 dollars\n" +
+            "    When I transfer 20 dollars\n" +
+            "    Then my savings account balance should be 80 dollars\n" +
+            "    Then my cash account balance should be 30 dollars\n"
+          );
+        },
+
+        'should extract story from page': function() {
+          var story = StoryDom.story();
+          story.shouldEqual(
+            "Story: transfer to cash account\n" + 
+            "\n" +
+            "  As a savings account holder\n" +
+            "  I want to transfer money from my savings account\n" +
+            "  So that I can get cash easily from an ATM\n" +
+            "\n" +
+            "  Scenario: savings account is in credit\n" + 
+            "    Given my savings account balance is 100 dollars\n" +
+            "    Given my cash account balance is 10 dollars\n" +
+            "    When I transfer 20 dollars\n" +
+            "    Then my savings account balance should be 80 dollars\n" +
+            "    Then my cash account balance should be 30 dollars\n" +
+            "\n" +
+            "  Scenario: savings account is overdrawn\n" + 
+            "    Given my savings account balance is -20 dollars\n" +
+            "    Given my cash account balance is 10 dollars\n" +
+            "    When I transfer 20 dollars\n" +
+            "    Then my savings account balance should be -20 dollars\n" +
+            "    Then my cash account balance should be 10 dollars\n" +
+            "    Then I should still be poor\n"
+          );
+        },
+
+        'should extract stock steps from dom': function() {
+          var stockSteps = RSpec.stockSteps();
+          stockSteps.shouldEqualEnum([
+            'Given my $which account has been blocked for $n days',
+            'Given my cash account balance is $balance dollars',
+            'Given my savings account balance is $balance dollars',
+            'Then my cash account balance should be $balance dollars',
+            'Then my savings account balance should be $balance dollars',
+            'When I transfer $amount dollars'
+          ]);
+        },
+
+        'should add new stock steps unless they already exist': function() {
+          RSpec.addStockStep('When Godzilla chews over a cable');
+          RSpec.stockSteps().shouldEqualEnum([
+            'Given my $which account has been blocked for $n days',
+            'Given my cash account balance is $balance dollars',
+            'Given my savings account balance is $balance dollars',
+            'Then my cash account balance should be $balance dollars',
+            'Then my savings account balance should be $balance dollars',
+            'When Godzilla chews over a cable',
+            'When I transfer $amount dollars'
+          ]);
+          RSpec.addStockStep('When Godzilla chews over a cable');
+          RSpec.stockSteps().shouldEqualEnum([
+            'Given my $which account has been blocked for $n days',
+            'Given my cash account balance is $balance dollars',
+            'Given my savings account balance is $balance dollars',
+            'Then my cash account balance should be $balance dollars',
+            'Then my savings account balance should be $balance dollars',
+            'When Godzilla chews over a cable',
+            'When I transfer $amount dollars'
+          ]);
+        }
+      });
+      // ]]>
+      </script>
+
+    </div>
+  </body>
+</html>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/stylesheets/style.css technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/stylesheets/style.css
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/stylesheets/style.css	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/stylesheets/style.css	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,136 @@
+body {
+  background: #fff;
+  font-size: 80%;
+  margin:0pt;
+  padding:0pt;
+}
+
+#nav {
+  border-bottom:1px solid #222222;
+  border-top-style:solid;
+  border-top-width:0.5em;
+  font-family:Helvetica,Arial,sans-serif;
+  font-size:1.1em;
+  padding:0.2em 0pt;
+  position:fixed;
+  text-align:center;
+  width:100%;
+  z-index:50;
+
+  background-color: #000000;
+  opacity: 0.6;
+}
+
+#container {
+  background:white none repeat scroll 0%;
+  font-family:Helvetica,Arial,sans-serif;
+  margin:0pt auto;
+  position:relative;
+  text-align:left;
+  top:4.0em;
+  width:78em;
+}
+
+dl {
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif;
+}
+
+dt {
+  color: #fff;
+}
+
+dl.passed {
+  border-left: 5px solid #65C400;
+}
+
+dl.failed {
+  border-left: 5px solid #C20000;
+}
+
+dt {
+  padding: 3px;
+  font-weight: bold;
+}
+
+dd {
+  margin: 0px 0px 0px 0px;
+}
+
+dd p {
+  padding: 5px;
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+
+dd > dl {
+  margin-left: 5px;
+}
+
+dl.passed > dt {
+  background: #65C400;
+}
+
+dl.failed > dt {
+  background: #C20000;
+}
+
+dl.passed > dd > p, li.passed {
+  background: #DBFFB4; color: #3D7700;
+  border-bottom: 1px solid #65C400;
+}
+
+dl.failed > dd > p, li.failed {
+  color: #C20000; background: #FFFBD3;
+  border-bottom: 1px solid #C20000;
+}
+
+dl.pending > dd > p, li.pending {
+  color: #131313; background: #FCFB98;
+  border-bottom: 1px solid #FAF834;
+}
+
+dl.new > dd > p, li.new {
+  color: #444444; background: #DDDDDD;
+  border-bottom: 1px solid #444444;
+}
+
+dl > dd > p.wastebin {
+  background-color: black;
+}
+
+span.param, span.param_editor {
+  font-weight: bold;
+}
+
+input {
+  width: 100%;
+}
+
+ul.steps {
+  padding: 0px;
+  list-style: none;
+}
+
+ul.steps > li {
+  margin: 5px 0px 5px 5px;
+  padding: 3px 3px 3px 5px;
+}
+
+div.auto_complete ul {
+  list-style-type: none;
+  border: 2px solid #F0F0F0;
+  margin: 0px;
+  padding: 0px;
+}
+
+div.auto_complete ul li {
+  background-color: white;
+  list-style-type: none;
+  display: block;
+  margin: 0;
+  padding: 2px;
+}
+
+div.auto_complete ul li.selected {
+  color: #444444; background: #DDDDDD;
+}
diff -Nur mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/stylesheets/test.css technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/stylesheets/test.css
--- mephisto-0.7.3/vendor/plugins/rspec/story_server/prototype/stylesheets/test.css	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec/story_server/prototype/stylesheets/test.css	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,90 @@
+body, div, p, h1, h2, h3, ul, ol, span, a, table, td, form, img, li {
+  font-family: sans-serif;
+}
+
+body {
+  font-size:0.8em;
+}
+
+.navigation {
+  background: #9DC569;
+  color: #fff;
+}
+
+.navigation h1 {
+  font-size: 20px;
+}
+
+.navigation h2 {
+  font-size: 16px;
+  font-weight: normal;
+  margin: 0;
+  border: 1px solid #e8a400;
+  border-bottom: 0;
+  background: #ffc;
+  color: #E8A400;
+  padding: 8px;
+  padding-bottom: 0;
+}
+
+.navigation ul {
+  margin-top: 0;
+  border: 1px solid #E8A400;
+  border-top: none;
+  background: #ffc;
+  padding: 8px;
+  margin-left: 0;
+}
+
+.navigation ul li {
+  font-size: 12px;
+  list-style-type: none;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  color: #555;
+}
+
+.navigation a {
+  color: #ffc;
+}
+
+.navigation ul li a {
+  color: #000;
+}
+
+#log {
+  padding-bottom: 1em;
+  border-bottom: 2px solid #000;
+  margin-bottom: 2em;
+}
+
+#logsummary {
+  margin-bottom: 1em;
+  padding: 1ex;
+  border: 1px solid #000;
+  font-weight: bold;
+}
+
+#logtable {
+  width:100%;
+  border-collapse: collapse;
+  border: 1px dotted #666;
+}
+
+#logtable td, #logtable th {
+  text-align: left;
+  padding: 3px 8px;
+  border: 1px dotted #666;
+}
+
+#logtable .passed {
+  background-color: #cfc;
+}
+
+#logtable .failed, #logtable .error {
+  background-color: #fcc;
+}
+
+#logtable .nameCell {
+  cursor: pointer;
+}
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/MIT-LICENSE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/MIT-LICENSE
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/MIT-LICENSE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/MIT-LICENSE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+====================================================================
+== RSpec
+Copyright (c) 2005-2007 The RSpec Development Team
+====================================================================
+== ARTS
+Copyright (c) 2006 Kevin Clark, Jake Howerton
+====================================================================
+== ZenTest
+Copyright (c) 2001-2006 Ryan Davis, Eric Hodel, Zen Spider Software
+====================================================================
+== AssertSelect
+Copyright (c) 2006 Assaf Arkin
+====================================================================
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do 
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/README
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+See Spec::Rails
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/Rakefile
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/Rakefile	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+require 'rake'
+require 'rake/rdoctask'
+
+desc 'Generate RDoc'
+rd = Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = '../doc/output/rdoc-rails'
+  rdoc.options << '--title' << 'Spec::Rails' << '--line-numbers' << '--inline-source' << '--main' << 'Spec::Rails'
+  rdoc.rdoc_files.include('MIT-LICENSE', 'lib/**/*.rb')
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/CHANGES technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/CHANGES
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/CHANGES	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/CHANGES	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+Please refer to the CHANGES file for RSpec's core
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/rspec_generator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/rspec_generator.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/rspec_generator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/rspec_generator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,35 @@
+require 'rbconfig'
+
+# This generator bootstraps a Rails project for use with RSpec
+class RspecGenerator < Rails::Generator::Base
+  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+                              Config::CONFIG['ruby_install_name'])
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+  end
+
+  def manifest
+    record do |m|
+      script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
+
+      m.directory 'spec'
+      m.template  'spec_helper.rb',                'spec/spec_helper.rb'
+      m.file      'spec.opts',                     'spec/spec.opts'
+      m.file      'rcov.opts',                     'spec/rcov.opts'
+      m.file      'script/spec_server',            'script/spec_server', script_options
+      m.file      'script/spec',                   'script/spec',        script_options
+
+      m.directory 'stories'
+      m.file      'all_stories.rb',                'stories/all.rb'
+      m.file      'stories_helper.rb',             'stories/helper.rb'
+    end
+  end
+
+protected
+
+  def banner
+    "Usage: #{$0} rspec"
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/all_stories.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/all_stories.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/all_stories.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/all_stories.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+dir = File.dirname(__FILE__)
+Dir[File.expand_path("#{dir}/**/*.rb")].uniq.each do |file|
+  require file
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/rcov.opts technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/rcov.opts
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/rcov.opts	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/rcov.opts	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+--exclude "spec/*,gems/*" 
+--rails
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
+require 'spec'
+exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec_server technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec_server
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec_server	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/script/spec_server	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../rspec/lib' # For svn
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../vendor/plugins/rspec/lib' # For rspec installed as plugin
+require 'rubygems'
+require 'drb/drb'
+require 'rbconfig'
+require 'spec'
+require 'optparse'
+
+# This is based on Florian Weber's TDDMate
+module Spec
+  module Runner
+    class RailsSpecServer
+      def run(argv, stderr, stdout)
+        $stdout = stdout
+        $stderr = stderr
+
+        base = ActiveRecord::Base
+        def base.clear_reloadable_connections!
+          active_connections.each do |name, conn|
+            if conn.requires_reloading?
+              conn.disconnect!
+              active_connections.delete(name)
+            end
+          end
+        end        
+
+        if ::Dispatcher.respond_to?(:cleanup_application)
+          ::Dispatcher.cleanup_application
+        elsif ::Dispatcher.respond_to?(:reset_application!)
+          ::Dispatcher.reset_application!
+        end
+        ::Dependencies.mechanism = :load
+        require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
+        load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
+
+        ::Spec::Runner::CommandLine.run(
+          ::Spec::Runner::OptionParser.parse(
+            argv,
+            $stderr,
+            $stdout
+          )
+        )
+      end
+    end
+  end
+end
+puts "Loading Rails environment"
+
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'dispatcher'
+
+def restart_test_server
+  puts "restarting"
+  config       = ::Config::CONFIG
+  ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
+  command_line = [ruby, $0, ARGV].flatten.join(' ')
+  exec(command_line)
+end
+
+def daemonize(pid_file = nil)
+  return yield if $DEBUG
+  pid = Process.fork{
+    Process.setsid
+    Dir.chdir(RAILS_ROOT)
+    trap("SIGINT"){ exit! 0 }
+    trap("SIGTERM"){ exit! 0 }
+    trap("SIGHUP"){ restart_test_server }
+    File.open("/dev/null"){|f|
+      STDERR.reopen f
+      STDIN.reopen  f
+      STDOUT.reopen f
+    }
+    yield
+  }
+  puts "spec_server launched. (PID: %d)" % pid
+  File.open(pid_file,"w"){|f| f.puts pid } if pid_file
+  exit! 0
+end
+
+options = Hash.new
+opts = OptionParser.new
+opts.on("-d", "--daemon"){|v| options[:daemon] = true }
+opts.on("-p", "--pid PIDFILE"){|v| options[:pid] = v }
+opts.parse!(ARGV)
+
+puts "Ready"
+exec_server = lambda {
+  trap("USR2") { restart_test_server } if Signal.list.has_key?("USR2")
+  DRb.start_service("druby://localhost:8989", Spec::Runner::RailsSpecServer.new)
+  DRb.thread.join
+}
+
+if options[:daemon]
+  daemonize(options[:pid], &exec_server)
+else
+  exec_server.call
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec.opts	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+--colour
+--format
+progress
+--loadby
+mtime
+--reverse
+--backtrace
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,24 @@
+# This file is copied to ~/spec when you run 'ruby script/generate rspec'
+# from the project root directory.
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'spec'
+require 'spec/rails'
+
+Spec::Runner.configure do |config|
+  config.use_transactional_fixtures = true
+  config.use_instantiated_fixtures  = false
+  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+
+  # You can declare fixtures for each behaviour like this:
+  #   describe "...." do
+  #     fixtures :table_a, :table_b
+  #
+  # Alternatively, if you prefer to declare them only once, you can
+  # do so here, like so ...
+  #
+  #   config.global_fixtures = :table_a, :table_b
+  #
+  # If you declare global fixtures, be aware that they will be declared
+  # for all of your examples, even those that don't use them.
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/stories_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/stories_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec/templates/stories_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec/templates/stories_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'spec/rails/story_adapter'
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/USAGE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/USAGE
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/USAGE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/USAGE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,33 @@
+Description:
+    The rspec_controller generator creates stub specs and files for a new
+    controller and its views.
+
+    The generator takes a controller name and a list of views as arguments.
+    The controller name may be given in CamelCase or under_score and should
+    not be suffixed with 'Controller'.  To create a controller within a
+    module, specify the controller name as 'module/controller'.
+
+    The generator creates stubs for a controller (and spec), a view (and spec)
+    for each view in the argument list, plus a helper. 
+
+Example:
+    ./script/generate rspec_controller dog bark fetch
+        ...
+        create  spec/controllers/dog_controller_spec.rb
+        create  app/controllers/dog_controller.rb
+        create  app/helpers/dog_helper.rb
+        create  spec/views/dog/bark_view_spec.rb
+        create  app/views/dog/bark.rhtml
+        create  spec/views/dog/fetch_view_spec.rb
+        create  app/views/dog/fetch.rhtml
+
+Modules Example:
+    ./script/generate rspec_controller 'pets/dog' bark fetch
+        ...
+        create  spec/controllers/pets/dog_controller_spec.rb
+        create  app/controllers/pets/dog_controller.rb
+        create  app/helpers/pets/dog_helper.rb
+        create  spec/views/pets/dog/bark_view_spec.rb
+        create  app/views/pets/dog/bark.rhtml
+        create  spec/views/pets/dog/fetch_view_spec.rb
+        create  app/views/pets/dog/fetch.rhtml
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/rspec_controller_generator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,49 @@
+require 'rails_generator/generators/components/controller/controller_generator'
+
+class RspecControllerGenerator < ControllerGenerator
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, "#{class_name}Controller", "#{class_name}Helper"
+
+      # Controller, helper, views, and spec directories.
+      m.directory File.join('app/controllers', class_path)
+      m.directory File.join('app/helpers', class_path)
+      m.directory File.join('app/views', class_path, file_name)
+      m.directory File.join('spec/controllers', class_path)
+      m.directory File.join('spec/helpers', class_path)
+      m.directory File.join('spec/views', class_path, file_name)
+
+      if ActionView::Base.const_defined?('DEFAULT_TEMPLATE_HANDLER_PREFERENCE') &&
+         ActionView::Base::DEFAULT_TEMPLATE_HANDLER_PREFERENCE.include?(:erb) then
+        @default_file_extension = "html.erb"
+      else
+        @default_file_extension = "rhtml"
+      end
+
+      # Controller spec, class, and helper.
+      m.template 'controller_spec.rb',
+        File.join('spec/controllers', class_path, "#{file_name}_controller_spec.rb")
+
+      m.template 'helper_spec.rb',
+        File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
+
+      m.template 'controller:controller.rb',
+        File.join('app/controllers', class_path, "#{file_name}_controller.rb")
+
+      m.template 'controller:helper.rb',
+        File.join('app/helpers', class_path, "#{file_name}_helper.rb")
+
+      # Spec and view template for each action.
+      actions.each do |action|
+        m.template 'view_spec.rb',
+          File.join('spec/views', class_path, file_name, "#{action}.#{@default_file_extension}_spec.rb"),
+          :assigns => { :action => action, :model => file_name }
+        path = File.join('app/views', class_path, file_name, "#{action}.#{@default_file_extension}")
+        m.template "controller:view.#{@default_file_extension}",
+          path,
+          :assigns => { :action => action, :path => path }
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/controller_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/controller_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/controller_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/controller_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
+
+describe <%= class_name %>Controller do
+
+<% if actions.empty? -%>
+  #Delete this example and add some real ones
+<% else -%>
+  #Delete these examples and add some real ones
+<% end -%>
+  it "should use <%= class_name %>Controller" do
+    controller.should be_an_instance_of(<%= class_name %>Controller)
+  end
+
+<% unless actions.empty? -%>
+<% for action in actions -%>
+
+  it "GET '<%= action %>' should be successful" do
+    get '<%= action %>'
+    response.should be_success
+  end
+<% end -%>
+<% end -%>
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
+
+describe <%= class_name %>Helper do
+  
+  #Delete this example and add some real ones or delete this file
+  it "should include the <%= class_name %>Helper" do
+    included_modules = self.metaclass.send :included_modules
+    included_modules.should include(<%= class_name %>Helper)
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_controller/templates/view_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
+
+describe "/<%= class_name.underscore %>/<%= action %>" do
+  before do
+    render '<%= class_name.underscore %>/<%= action %>'
+  end
+  
+  #Delete this example and add some real ones or delete this file
+  it "should tell you where to find the file" do
+    response.should have_tag('p', /Find me in app\/views\/<%= class_name.underscore %>\/<%= action %>/)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_model/USAGE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_model/USAGE
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_model/USAGE	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_model/USAGE	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,18 @@
+Description:
+    The rspec_model generator creates stubs for a new model.
+
+    The generator takes a model name as its argument.  The model name may be
+    given in CamelCase or under_score and should not be suffixed with 'Model'.
+
+    The generator creates a model class in app/models, an RSpec spec in
+    spec/models, database fixtures in spec/fixtures/plural_name.yml, and a migration
+    in db/migrate.
+
+Example:
+    ./script/generate rspec_model Account
+
+    This will create an Account model:
+        Model:      app/models/account.rb
+        Spec:       spec/models/account_spec.rb
+        Fixtures:   spec/fixtures/accounts.yml
+        Migration:  db/migrate/XXX_add_accounts.rb
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_model/rspec_model_generator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_model/rspec_model_generator.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_model/rspec_model_generator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_model/rspec_model_generator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,30 @@
+require 'rails_generator/generators/components/model/model_generator'
+
+class RspecModelGenerator < ModelGenerator
+
+  def manifest
+
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, class_name
+
+      # Model, spec, and fixture directories.
+      m.directory File.join('app/models', class_path)
+      m.directory File.join('spec/models', class_path)
+      m.directory File.join('spec/fixtures', class_path)
+
+      # Model class, spec and fixtures.
+      m.template 'model:model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
+      m.template 'model:fixtures.yml',  File.join('spec/fixtures', class_path, "#{table_name}.yml")
+      m.template 'model_spec.rb',       File.join('spec/models', class_path, "#{file_name}_spec.rb")
+
+      unless options[:skip_migration]
+        m.migration_template 'model:migration.rb', 'db/migrate', :assigns => {
+          :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
+        }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+      end
+
+    end
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_model/templates/model_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
+
+describe <%= class_name %> do
+  before(:each) do
+    @<%= file_name %> = <%= class_name %>.new
+  end
+
+  it "should be valid" do
+    @<%= file_name %>.should be_valid
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/rspec_scaffold_generator.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,165 @@
+class RspecScaffoldGenerator < Rails::Generator::NamedBase
+  default_options :skip_migration => false
+  
+  attr_reader   :controller_name,
+                :controller_class_path,
+                :controller_file_path,
+                :controller_class_nesting,
+                :controller_class_nesting_depth,
+                :controller_class_name,
+                :controller_singular_name,
+                :controller_plural_name,
+                :resource_edit_path,
+                :default_file_extension
+  alias_method  :controller_file_name,  :controller_singular_name
+  alias_method  :controller_table_name, :controller_plural_name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+
+    @controller_name = @name.pluralize
+
+    base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
+    @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
+
+    if @controller_class_nesting.empty?
+      @controller_class_name = @controller_class_name_without_nesting
+    else
+      @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
+    end
+    
+    if ActionView::Base.const_defined?('DEFAULT_TEMPLATE_HANDLER_PREFERENCE') &&
+       ActionView::Base::DEFAULT_TEMPLATE_HANDLER_PREFERENCE.include?(:erb) then
+      @resource_generator = "scaffold"
+      @default_file_extension = "html.erb"
+    else
+      @resource_generator = "scaffold_resource"
+      @default_file_extension = "rhtml"
+    end
+    
+    if ActionController::Base.respond_to?(:resource_action_separator)
+      @resource_edit_path = "/edit"
+    else
+      @resource_edit_path = ";edit"
+    end
+  end
+
+  def manifest
+    record do |m|
+      
+      # Check for class naming collisions.
+      m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
+      m.class_collisions(class_path, "#{class_name}")
+
+      # Controller, helper, views, and spec directories.
+      m.directory(File.join('app/models', class_path))
+      m.directory(File.join('app/controllers', controller_class_path))
+      m.directory(File.join('app/helpers', controller_class_path))
+      m.directory(File.join('app/views', controller_class_path, controller_file_name))
+      m.directory(File.join('spec/controllers', controller_class_path))
+      m.directory(File.join('spec/models', class_path))
+      m.directory(File.join('spec/helpers', class_path))
+      m.directory File.join('spec/fixtures', class_path)
+      m.directory File.join('spec/views', controller_class_path, controller_file_name)
+      
+      # Controller spec, class, and helper.
+      m.template 'rspec_scaffold:controller_spec.rb',
+        File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
+
+      m.template "#{@resource_generator}:controller.rb",
+        File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
+
+      m.template 'rspec_scaffold:helper_spec.rb',
+        File.join('spec/helpers', class_path, "#{controller_file_name}_helper_spec.rb")
+
+      m.template "#{@resource_generator}:helper.rb",
+        File.join('app/helpers', controller_class_path, "#{controller_file_name}_helper.rb")
+
+      for action in scaffold_views
+        m.template(
+          "#{@resource_generator}:view_#{action}.#{@default_file_extension}",
+          File.join('app/views', controller_class_path, controller_file_name, "#{action}.#{default_file_extension}")
+        )
+      end
+      
+      # Model class, unit test, and fixtures.
+      m.template 'model:model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
+      m.template 'model:fixtures.yml',  File.join('spec/fixtures', class_path, "#{table_name}.yml")
+      m.template 'rspec_model:model_spec.rb',       File.join('spec/models', class_path, "#{file_name}_spec.rb")
+
+      # View specs
+      m.template "rspec_scaffold:edit_erb_spec.rb",
+        File.join('spec/views', controller_class_path, controller_file_name, "edit.#{default_file_extension}_spec.rb")
+      m.template "rspec_scaffold:index_erb_spec.rb",
+        File.join('spec/views', controller_class_path, controller_file_name, "index.#{default_file_extension}_spec.rb")
+      m.template "rspec_scaffold:new_erb_spec.rb",
+        File.join('spec/views', controller_class_path, controller_file_name, "new.#{default_file_extension}_spec.rb")
+      m.template "rspec_scaffold:show_erb_spec.rb",
+        File.join('spec/views', controller_class_path, controller_file_name, "show.#{default_file_extension}_spec.rb")
+
+      unless options[:skip_migration]
+        m.migration_template(
+          'model:migration.rb', 'db/migrate', 
+          :assigns => {
+            :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}",
+            :attributes     => attributes
+          }, 
+          :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+        )
+      end
+
+      m.route_resources controller_file_name
+
+    end
+  end
+
+  protected
+    # Override with your own usage banner.
+    def banner
+      "Usage: #{$0} rspec_scaffold ModelName [field:type field:type]"
+    end
+
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--skip-migration", 
+             "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
+    end
+
+    def scaffold_views
+      %w[ index show new edit ]
+    end
+
+    def model_name 
+      class_name.demodulize
+    end
+end
+
+module Rails
+  module Generator
+    class GeneratedAttribute
+      def default_value
+        @default_value ||= case type
+          when :int, :integer               then "\"1\""
+          when :float                       then "\"1.5\""
+          when :decimal                     then "\"9.99\""
+          when :datetime, :timestamp, :time then "Time.now"
+          when :date                        then "Date.today"
+          when :string                      then "\"MyString\""
+          when :text                        then "\"MyText\""
+          when :boolean                     then "false"
+          else
+            ""
+        end      
+      end
+
+      def input_type
+        @input_type ||= case type
+          when :text                        then "textarea"
+          else
+            "input"
+        end      
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/controller_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,355 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
+
+describe <%= controller_class_name %>Controller, "#route_for" do
+
+  it "should map { :controller => '<%= table_name %>', :action => 'index' } to /<%= table_name %>" do
+    route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>"
+  end
+  
+  it "should map { :controller => '<%= table_name %>', :action => 'new' } to /<%= table_name %>/new" do
+    route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new"
+  end
+  
+  it "should map { :controller => '<%= table_name %>', :action => 'show', :id => 1 } to /<%= table_name %>/1" do
+    route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1"
+  end
+  
+  it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => 1 } to /<%= table_name %>/1<%= resource_edit_path %>" do
+    route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>"
+  end
+  
+  it "should map { :controller => '<%= table_name %>', :action => 'update', :id => 1} to /<%= table_name %>/1" do
+    route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1"
+  end
+  
+  it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => 1} to /<%= table_name %>/1" do
+    route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1"
+  end
+  
+end
+
+describe <%= controller_class_name %>Controller, "#params_from" do
+
+  it "should generate params { :controller => '<%= table_name %>', action => 'index' } from GET /<%= table_name %>" do
+    params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"}
+  end
+  
+  it "should generate params { :controller => '<%= table_name %>', action => 'new' } from GET /<%= table_name %>/new" do
+    params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"}
+  end
+  
+  it "should generate params { :controller => '<%= table_name %>', action => 'create' } from POST /<%= table_name %>" do
+    params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"}
+  end
+  
+  it "should generate params { :controller => '<%= table_name %>', action => 'show', id => '1' } from GET /<%= table_name %>/1" do
+    params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"}
+  end
+  
+  it "should generate params { :controller => '<%= table_name %>', action => 'edit', id => '1' } from GET /<%= table_name %>/1;edit" do
+    params_from(:get, "/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"}
+  end
+  
+  it "should generate params { :controller => '<%= table_name %>', action => 'update', id => '1' } from PUT /<%= table_name %>/1" do
+    params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"}
+  end
+  
+  it "should generate params { :controller => '<%= table_name %>', action => 'destroy', id => '1' } from DELETE /<%= table_name %>/1" do
+    params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"}
+  end
+  
+end
+
+describe <%= controller_class_name %>Controller, "handling GET /<%= table_name %>" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>)
+    <%= class_name %>.stub!(:find).and_return([@<%= file_name %>])
+  end
+  
+  def do_get
+    get :index
+  end
+  
+  it "should be successful" do
+    do_get
+    response.should be_success
+  end
+
+  it "should render index template" do
+    do_get
+    response.should render_template('index')
+  end
+  
+  it "should find all <%= table_name %>" do
+    <%= class_name %>.should_receive(:find).with(:all).and_return([@<%= file_name %>])
+    do_get
+  end
+  
+  it "should assign the found <%= table_name %> for the view" do
+    do_get
+    assigns[:<%= table_name %>].should == [@<%= file_name %>]
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling GET /<%= table_name %>.xml" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>, :to_xml => "XML")
+    <%= class_name %>.stub!(:find).and_return(@<%= file_name %>)
+  end
+  
+  def do_get
+    @request.env["HTTP_ACCEPT"] = "application/xml"
+    get :index
+  end
+  
+  it "should be successful" do
+    do_get
+    response.should be_success
+  end
+
+  it "should find all <%= table_name %>" do
+    <%= class_name %>.should_receive(:find).with(:all).and_return([@<%= file_name %>])
+    do_get
+  end
+  
+  it "should render the found <%= table_name %> as xml" do
+    @<%= file_name %>.should_receive(:to_xml).and_return("XML")
+    do_get
+    response.body.should == "XML"
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling GET /<%= table_name %>/1" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>)
+    <%= class_name %>.stub!(:find).and_return(@<%= file_name %>)
+  end
+  
+  def do_get
+    get :show, :id => "1"
+  end
+
+  it "should be successful" do
+    do_get
+    response.should be_success
+  end
+  
+  it "should render show template" do
+    do_get
+    response.should render_template('show')
+  end
+  
+  it "should find the <%= file_name %> requested" do
+    <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>)
+    do_get
+  end
+  
+  it "should assign the found <%= file_name %> for the view" do
+    do_get
+    assigns[:<%= file_name %>].should equal(@<%= file_name %>)
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling GET /<%= table_name %>/1.xml" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>, :to_xml => "XML")
+    <%= class_name %>.stub!(:find).and_return(@<%= file_name %>)
+  end
+  
+  def do_get
+    @request.env["HTTP_ACCEPT"] = "application/xml"
+    get :show, :id => "1"
+  end
+
+  it "should be successful" do
+    do_get
+    response.should be_success
+  end
+  
+  it "should find the <%= file_name %> requested" do
+    <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>)
+    do_get
+  end
+  
+  it "should render the found <%= file_name %> as xml" do
+    @<%= file_name %>.should_receive(:to_xml).and_return("XML")
+    do_get
+    response.body.should == "XML"
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling GET /<%= table_name %>/new" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>)
+    <%= class_name %>.stub!(:new).and_return(@<%= file_name %>)
+  end
+  
+  def do_get
+    get :new
+  end
+
+  it "should be successful" do
+    do_get
+    response.should be_success
+  end
+  
+  it "should render new template" do
+    do_get
+    response.should render_template('new')
+  end
+  
+  it "should create an new <%= file_name %>" do
+    <%= class_name %>.should_receive(:new).and_return(@<%= file_name %>)
+    do_get
+  end
+  
+  it "should not save the new <%= file_name %>" do
+    @<%= file_name %>.should_not_receive(:save)
+    do_get
+  end
+  
+  it "should assign the new <%= file_name %> for the view" do
+    do_get
+    assigns[:<%= file_name %>].should equal(@<%= file_name %>)
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling GET /<%= table_name %>/1/edit" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>)
+    <%= class_name %>.stub!(:find).and_return(@<%= file_name %>)
+  end
+  
+  def do_get
+    get :edit, :id => "1"
+  end
+
+  it "should be successful" do
+    do_get
+    response.should be_success
+  end
+  
+  it "should render edit template" do
+    do_get
+    response.should render_template('edit')
+  end
+  
+  it "should find the <%= file_name %> requested" do
+    <%= class_name %>.should_receive(:find).and_return(@<%= file_name %>)
+    do_get
+  end
+  
+  it "should assign the found <%= class_name %> for the view" do
+    do_get
+    assigns[:<%= file_name %>].should equal(@<%= file_name %>)
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling POST /<%= table_name %>" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>, :to_param => "1")
+    <%= class_name %>.stub!(:new).and_return(@<%= file_name %>)
+  end
+  
+  def post_with_successful_save
+    @<%= file_name %>.should_receive(:save).and_return(true)
+    post :create, :<%= file_name %> => {}
+  end
+  
+  def post_with_failed_save
+    @<%= file_name %>.should_receive(:save).and_return(false)
+    post :create, :<%= file_name %> => {}
+  end
+  
+  it "should create a new <%= file_name %>" do
+    <%= class_name %>.should_receive(:new).with({}).and_return(@<%= file_name %>)
+    post_with_successful_save
+  end
+
+  it "should redirect to the new <%= file_name %> on successful save" do
+    post_with_successful_save
+    response.should redirect_to(<%= table_name.singularize %>_url("1"))
+  end
+
+  it "should re-render 'new' on failed save" do
+    post_with_failed_save
+    response.should render_template('new')
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling PUT /<%= table_name %>/1" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>, :to_param => "1")
+    <%= class_name %>.stub!(:find).and_return(@<%= file_name %>)
+  end
+  
+  def put_with_successful_update
+    @<%= file_name %>.should_receive(:update_attributes).and_return(true)
+    put :update, :id => "1"
+  end
+  
+  def put_with_failed_update
+    @<%= file_name %>.should_receive(:update_attributes).and_return(false)
+    put :update, :id => "1"
+  end
+  
+  it "should find the <%= file_name %> requested" do
+    <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>)
+    put_with_successful_update
+  end
+
+  it "should update the found <%= file_name %>" do
+    put_with_successful_update
+    assigns(:<%= file_name %>).should equal(@<%= file_name %>)
+  end
+
+  it "should assign the found <%= file_name %> for the view" do
+    put_with_successful_update
+    assigns(:<%= file_name %>).should equal(@<%= file_name %>)
+  end
+
+  it "should redirect to the <%= file_name %> on successful update" do
+    put_with_successful_update
+    response.should redirect_to(<%= table_name.singularize %>_url("1"))
+  end
+
+  it "should re-render 'edit' on failed update" do
+    put_with_failed_update
+    response.should render_template('edit')
+  end
+end
+
+describe <%= controller_class_name %>Controller, "handling DELETE /<%= table_name %>/1" do
+
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>, :destroy => true)
+    <%= class_name %>.stub!(:find).and_return(@<%= file_name %>)
+  end
+  
+  def do_delete
+    delete :destroy, :id => "1"
+  end
+
+  it "should find the <%= file_name %> requested" do
+    <%= class_name %>.should_receive(:find).with("1").and_return(@<%= file_name %>)
+    do_delete
+  end
+  
+  it "should call destroy on the found <%= file_name %>" do
+    @<%= file_name %>.should_receive(:destroy)
+    do_delete
+  end
+  
+  it "should redirect to the <%= table_name %> list" do
+    do_delete
+    response.should redirect_to(<%= table_name %>_url)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/edit_erb_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
+
+describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
+  include <%= controller_class_name %>Helper
+  
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>)
+<% for attribute in attributes -%>
+    @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>)
+<% end -%>
+    assigns[:<%= file_name %>] = @<%= file_name %>
+  end
+
+  it "should render edit form" do
+    render "/<%= table_name %>/edit.<%= default_file_extension %>"
+    
+    response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do
+<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+      with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]")
+<% end -%><% end -%>
+    end
+  end
+end
+
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,4 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper'
+
+describe <%= controller_class_name %>Helper do # Helper methods can be called directly in the examples (it blocks)
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/index_erb_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
+
+describe "/<%= table_name %>/index.<%= default_file_extension %>" do
+  include <%= controller_class_name %>Helper
+  
+  before do
+<% [98,99].each do |id| -%>
+    <%= file_name %>_<%= id %> = mock_model(<%= class_name %>)
+<% for attribute in attributes -%>
+    <%= file_name %>_<%= id %>.should_receive(:<%= attribute.name %>).and_return(<%= attribute.default_value %>)
+<% end -%><% end %>
+    assigns[:<%= table_name %>] = [<%= file_name %>_98, <%= file_name %>_99]
+  end
+
+  it "should render list of <%= table_name %>" do
+    render "/<%= table_name %>/index.<%= default_file_extension %>"
+<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+    response.should have_tag("tr>td", <%= attribute.default_value %>, 2)
+<% end -%><% end -%>
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/new_erb_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
+
+describe "/<%= table_name %>/new.<%= default_file_extension %>" do
+  include <%= controller_class_name %>Helper
+  
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>)
+    @<%= file_name %>.stub!(:new_record?).and_return(true)
+<% for attribute in attributes -%>
+    @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>)
+<% end -%>
+    assigns[:<%= file_name %>] = @<%= file_name %>
+  end
+
+  it "should render new form" do
+    render "/<%= table_name %>/new.<%= default_file_extension %>"
+    
+    response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do
+<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+      with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]")
+<% end -%><% end -%>
+    end
+  end
+end
+
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/generators/rspec_scaffold/templates/show_erb_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper'
+
+describe "/<%= table_name %>/show.<%= default_file_extension %>" do
+  include <%= controller_class_name %>Helper
+  
+  before do
+    @<%= file_name %> = mock_model(<%= class_name %>)
+<% for attribute in attributes -%>
+    @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>)
+<% end -%>
+
+    assigns[:<%= file_name %>] = @<%= file_name %>
+  end
+
+  it "should render attributes in <p>" do
+    render "/<%= table_name %>/show.<%= default_file_extension %>"
+<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+    response.should have_text(/<%= Regexp.escape(attribute.default_value)[1..-2]%>/)
+<% end -%><% end -%>
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/init.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+# Placeholder to satisfy Rails.
+#
+# Do NOT add any require statements to this file. Doing
+# so will cause Rails to load this plugin all of the time.
+#
+# Running 'ruby script/generate rspec' will
+# generate spec/spec_helper.rb, which includes the necessary
+# require statements and configuration. This file should
+# be required by all of your spec files.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/autotest/rails_rspec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,81 @@
+# (c) Copyright 2006 Nick Sieger <nicksieger@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+$:.push(*Dir["vendor/rails/*/lib"])
+
+require 'active_support'
+require 'autotest/rspec'
+
+class Autotest::RailsRspec < Autotest::Rspec
+
+  def initialize # :nodoc:
+    super
+    @exceptions = %r%^\./(?:coverage|db|doc|log|public|script|vendor\/rails|previous_failures.txt)%
+    @test_mappings = {
+      %r%^(test|spec)/fixtures/(.*).yml$% => proc { |_, m|
+        ["spec/models/#{m[2].singularize}_spec.rb"] + files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
+      },
+      %r%^spec/(models|controllers|views|helpers|lib)/.*rb$% => proc { |filename, _|
+        filename
+      },
+      %r%^app/models/(.*)\.rb$% => proc { |_, m|
+        ["spec/models/#{m[1]}_spec.rb"]
+      },
+      %r%^app/views/(.*)$% => proc { |_, m|
+        files_matching %r%^spec/views/#{m[1]}_spec.rb$%
+      },
+      %r%^app/controllers/(.*)\.rb$% => proc { |_, m|
+        ["spec/controllers/#{m[1]}_spec.rb"]
+      },
+      %r%^app/helpers/(.*)_helper\.rb$% => proc { |_, m|
+        if m[1] == "application" then
+          files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
+        else
+          ["spec/helpers/#{m[1]}_helper_spec.rb"] + files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
+        end
+      },
+      %r%^app/helpers/application_helper\.rb$% => proc {
+        files_matching %r%^spec/(views|helpers)/.*_spec\.rb$%
+      },
+      %r%^app/controllers/application\.rb$% => proc { |_, m|
+        files_matching %r%^spec/controllers/.*_spec\.rb$%
+      },
+      %r%^config/routes\.rb$% => proc {
+        files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
+      },
+      %r%^config/database\.yml$% => proc { |_, m|
+        files_matching %r%^spec/models/.*_spec\.rb$%
+      },
+      %r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$% => proc {
+        files_matching %r%^spec/(models|controllers|views|helpers)/.*_spec\.rb$%
+      },
+      %r%^lib/(.*)\.rb$% => proc { |_, m|
+        ["spec/lib/#{m[1]}_spec.rb"]
+      },
+    }    
+  end
+  
+  def spec_command
+    "script/spec"
+  end
+    
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+module Spec
+  module Rails
+    module Example
+      class AssignsHashProxy #:nodoc:
+        def initialize(object)
+          @object = object
+        end
+
+        def [](ivar)
+          if assigns.include?(ivar.to_s)
+            assigns[ivar.to_s]
+          elsif assigns.include?(ivar)
+            assigns[ivar]
+          else
+            nil
+          end
+        end
+
+        def []=(ivar, val)
+          assigns[ivar.to_s] = val
+        end
+
+        def delete(name)
+          assigns.delete(name.to_s)
+        end
+
+        def each(&block)
+          assigns.each &block
+        end
+
+        def has_key?(key)
+          assigns.key?(key.to_s)
+        end
+
+        protected
+        def assigns
+          @object.assigns
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/controller_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/controller_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/controller_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/controller_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,244 @@
+module Spec
+  module Rails
+    module Example
+      # Controller Examples live in $RAILS_ROOT/spec/controllers/.
+      #
+      # Controller Examples use Spec::Rails::Example::ControllerExample, which supports running specs for
+      # Controllers in two modes, which represent the tension between the more granular
+      # testing common in TDD and the more high level testing built into
+      # rails. BDD sits somewhere in between: we want to a balance between
+      # specs that are close enough to the code to enable quick fault
+      # isolation and far enough away from the code to enable refactoring
+      # with minimal changes to the existing specs.
+      #
+      # == Isolation mode (default)
+      #
+      # No dependencies on views because none are ever rendered. The
+      # benefit of this mode is that can spec the controller completely
+      # independent of the view, allowing that responsibility to be
+      # handled later, or by somebody else. Combined w/ separate view
+      # specs, this also provides better fault isolation.
+      #
+      # == Integration mode
+      #
+      # To run in this mode, include the +integrate_views+ declaration
+      # in your controller context:
+      #
+      #   describe ThingController do
+      #     integrate_views
+      #     ...
+      #
+      # In this mode, controller specs are run in the same way that
+      # rails functional tests run - one set of tests for both the
+      # controllers and the views. The benefit of this approach is that
+      # you get wider coverage from each spec. Experienced rails
+      # developers may find this an easier approach to begin with, however
+      # we encourage you to explore using the isolation mode and revel
+      # in its benefits.
+      #
+      # == Expecting Errors
+      #
+      # Rspec on Rails will raise errors that occur in controller actions.
+      # In contrast, Rails will swallow errors that are raised in controller
+      # actions and return an error code in the header. If you wish to override
+      # Rspec and have Rail's default behaviour,tell the controller to use
+      # rails error handling ...
+      #
+      #   before(:each) do
+      #     controller.use_rails_error_handling!
+      #   end
+      #
+      # When using Rail's error handling, you can expect error codes in headers ...
+      #
+      #   it "should return an error in the header" do
+      #     response.should be_error
+      #   end
+      #
+      #   it "should return a 501" do
+      #     response.response_code.should == 501
+      #   end
+      #
+      #   it "should return a 501" do
+      #     response.code.should == "501"
+      #   end
+      class ControllerExample < FunctionalExample
+        class << self
+          # Use this to instruct RSpec to render views in your controller examples (Integration Mode).
+          #
+          #   describe ThingController do
+          #     integrate_views
+          #     ...
+          #
+          # See Spec::Rails::Example::ControllerExample for more information about
+          # Integration and Isolation modes.
+          def integrate_views
+            @integrate_views = true
+          end
+          def integrate_views? # :nodoc:
+            @integrate_views
+          end
+
+          # You MUST provide a controller_name within the context of
+          # your controller specs:
+          #
+          #   describe "ThingController" do
+          #     controller_name :thing
+          #     ...
+          def controller_name(name)
+            @controller_class_name = "#{name}_controller".camelize
+          end
+          attr_accessor :controller_class_name # :nodoc:
+        end
+
+        before(:each) do
+          # Some Rails apps explicitly disable ActionMailer in environment.rb
+          if defined?(ActionMailer)
+            @deliveries = []
+            ActionMailer::Base.deliveries = @deliveries
+          end
+
+          unless @controller.class.ancestors.include?(ActionController::Base)
+            Spec::Expectations.fail_with <<-EOE
+            You have to declare the controller name in controller specs. For example:
+            describe "The ExampleController" do
+            controller_name "example" #invokes the ExampleController
+            end
+            EOE
+          end
+          @controller.metaclass.class_eval do
+            def controller_path #:nodoc:
+              self.class.name.underscore.gsub('_controller', '')
+            end
+            include ControllerInstanceMethods
+          end
+          @controller.integrate_views! if @integrate_views
+          @controller.session = session
+        end
+
+        attr_reader :response, :request, :controller
+
+        def initialize(example)
+          super
+          controller_class_name = self.class.controller_class_name
+          if controller_class_name
+            @controller_class_name = controller_class_name.to_s
+          else
+            @controller_class_name = self.class.described_type.to_s
+          end
+          @integrate_views = self.class.integrate_views?
+        end
+
+        # Uses ActionController::Routing::Routes to generate
+        # the correct route for a given set of options.
+        # == Example
+        #   route_for(:controller => 'registrations', :action => 'edit', :id => 1)
+        #     => '/registrations/1;edit'
+        def route_for(options)
+          ensure_that_routes_are_loaded
+          ActionController::Routing::Routes.generate(options)
+        end
+
+        # Uses ActionController::Routing::Routes to parse
+        # an incoming path so the parameters it generates can be checked
+        # == Example
+        #   params_from(:get, '/registrations/1;edit')
+        #     => :controller => 'registrations', :action => 'edit', :id => 1
+        def params_from(method, path)
+          ensure_that_routes_are_loaded
+          ActionController::Routing::Routes.recognize_path(path, :method => method)
+        end
+
+        protected
+        def _controller_ivar_proxy
+          @controller_ivar_proxy ||= AssignsHashProxy.new @controller
+        end
+
+        private
+        def ensure_that_routes_are_loaded
+          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
+        end
+
+        module ControllerInstanceMethods #:nodoc:
+          include Spec::Rails::Example::RenderObserver
+
+          # === render(options = nil, deprecated_status = nil, &block)
+          #
+          # This gets added to the controller's singleton meta class,
+          # allowing Controller Examples to run in two modes, freely switching
+          # from context to context.
+          def render(options=nil, deprecated_status=nil, &block)
+            unless block_given?
+              unless integrate_views?
+                @template.metaclass.class_eval do
+                  define_method :file_exists? do
+                    true
+                  end
+                  define_method :render_file do |*args|
+                    @first_render ||= args[0]
+                  end
+                end
+              end
+            end
+
+            if expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
+              expect_render_mock_proxy.render(options)
+              @performed_render = true
+            else
+              unless expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
+                super(options, deprecated_status, &block)
+              end
+            end
+          end
+
+          if self.respond_to?(:should_receive) && self.respond_to?(:stub!)
+            self.send :alias_method, :orig_should_receive, :should_receive
+            self.send :alias_method, :orig_stub!, :stub!
+            def raise_with_disable_message(old_method, new_method)
+              raise %Q|
+        controller.#{old_method}(:render) has been disabled because it
+        can often produce unexpected results. Instead, you should
+        use the following (before the action):
+
+        controller.#{new_method}(*args)
+
+        See the rdoc for #{new_method} for more information.
+              |
+            end
+            def should_receive(*args)
+              if args[0] == :render
+                raise_with_disable_message("should_receive", "expect_render")
+              else
+                orig_should_receive(*args)
+              end
+            end
+            def stub!(*args)
+              if args[0] == :render
+                raise_with_disable_message("stub!", "stub_render")
+              else
+                orig_stub!(*args)
+              end
+            end
+          end
+
+          def response(&block)
+            # NOTE - we're setting @update for the assert_select_spec - kinda weird, huh?
+            @update = block
+            @_response || @response
+          end
+
+          def integrate_views!
+            @integrate_views = true
+          end
+
+          private
+
+          def integrate_views?
+            @integrate_views
+          end
+        end
+
+        Spec::Example::ExampleGroupFactory.register(:controller, self)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/functional_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/functional_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/functional_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/functional_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,66 @@
+module Spec
+  module Rails
+    module Example
+      class FunctionalExample < RailsExample
+        include ActionController::TestProcess
+        include ActionController::Assertions
+
+        attr_reader :request, :response
+        before(:each) do
+          @controller_class = Object.path2class @controller_class_name
+          raise "Can't determine controller class for #{@controller_class_name}" if @controller_class.nil?
+
+          @controller = @controller_class.new
+
+          @request = ActionController::TestRequest.new
+          @response = ActionController::TestResponse.new
+        end
+
+        def params
+          request.parameters
+        end
+
+        def flash
+          response.flash
+        end
+
+        def session
+          request.session
+        end
+
+        # :call-seq:
+        #   assigns()
+        #
+        # Hash of instance variables to values that are made available to views.
+        # == Examples
+        #
+        #   #in thing_controller.rb
+        #   def new
+        #     @thing = Thing.new
+        #   end
+        #
+        #   #in thing_controller_spec
+        #   get 'new'
+        #   assigns[:registration].should == Thing.new
+        #--
+        # NOTE - Even though docs say only use assigns[:key] format, but allowing assigns(:key)
+        # in order to avoid breaking old specs.
+        #++
+        def assigns(key = nil)
+          if key.nil?
+            @controller.assigns
+            _controller_ivar_proxy
+          else
+            @controller.assigns[key]
+            _controller_ivar_proxy[key]
+          end
+        end
+
+        protected
+        def _controller_ivar_proxy
+          @controller_ivar_proxy ||= IvarProxy.new @controller
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/helper_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/helper_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/helper_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/helper_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,81 @@
+module Spec
+  module Rails
+    module Example
+      # Helper Specs live in $RAILS_ROOT/spec/helpers/.
+      #
+      # Helper Specs use Spec::Rails::Example::HelperExample, which allows you to
+      # include your Helper directly in the context and write specs directly
+      # against its methods.
+      #
+      # HelperExample also includes the standard lot of ActionView::Helpers in case your
+      # helpers rely on any of those.
+      #
+      # == Example
+      #
+      #   class ThingHelper
+      #     def number_of_things
+      #       Thing.count
+      #     end
+      #   end
+      #
+      #   describe "ThingHelper behaviour" do
+      #     include ThingHelper
+      #     it "should tell you the number of things" do
+      #       Thing.should_receive(:count).and_return(37)
+      #       number_of_things.should == 37
+      #     end
+      #   end
+      class HelperExample < FunctionalExample
+        class << self
+          # The helper name....
+          def helper_name(name=nil)
+            send :include, "#{name}_helper".camelize.constantize
+          end
+        end
+
+        ActionView::Base.included_modules.each do |mod|
+          include mod if mod.parents.include?(ActionView::Helpers)
+        end
+        ActionController::Routing::Routes.named_routes.install(self)
+
+        before(:all) do
+          @controller_class_name = 'Spec::Rails::Example::HelperBehaviourController'
+        end
+
+        before(:each) do
+          @controller.request = @request
+          @controller.url = ActionController::UrlRewriter.new @request, {} # url_for
+
+          @flash = ActionController::Flash::FlashHash.new
+          session['flash'] = @flash
+
+          ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
+        end
+
+        def flash
+          @flash
+        end
+
+        def eval_erb(text)
+          ERB.new(text).result(binding)
+        end
+
+
+        # TODO: BT - Helper Examples should proxy method_missing to a Rails View instance.
+        # When that is done, remove this method
+        def protect_against_forgery?
+          false
+        end
+
+        Spec::Example::ExampleGroupFactory.register(:helper, self)
+      end
+
+      class HelperBehaviourController < ApplicationController #:nodoc:
+        attr_accessor :request, :url
+
+        # Re-raise errors
+        def rescue_action(e); raise e; end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/model_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/model_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/model_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/model_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+module Spec
+  module Rails
+    module Example
+      # Model examples live in $RAILS_ROOT/spec/models/.
+      #
+      # Model examples use Spec::Rails::Example::ModelExample, which
+      # provides support for fixtures and some custom expectations via extensions
+      # to ActiveRecord::Base.
+      class ModelExample < RailsExample
+        Spec::Example::ExampleGroupFactory.register(:model, self)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/rails_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/rails_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/rails_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/rails_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,86 @@
+require 'spec/extensions/test'
+
+ActionView::Base.cache_template_extensions = false
+
+module Spec
+  module Rails
+    module Example
+      class RailsExample < Test::Unit::TestCase::ExampleGroup
+        cattr_accessor(
+          :fixture_path,
+          :use_transactional_fixtures,
+          :use_instantiated_fixtures,
+          :global_fixtures
+        )
+        
+        class << self
+          def before_eval #:nodoc:
+            super
+            configure
+          end
+          
+          def configure
+            self.fixture_table_names = []
+            self.fixture_class_names = {}
+            self.use_transactional_fixtures = Spec::Runner.configuration.use_transactional_fixtures
+            self.use_instantiated_fixtures = Spec::Runner.configuration.use_instantiated_fixtures
+            self.fixture_path = Spec::Runner.configuration.fixture_path
+            self.global_fixtures = Spec::Runner.configuration.global_fixtures
+            self.fixtures(self.global_fixtures) if self.global_fixtures
+          end
+        end
+
+        before(:each) {setup}
+        after(:each) {teardown}
+
+        include Spec::Rails::Matchers
+
+        @@model_id = 1000
+        # Creates a mock object instance for a +model_class+ with common
+        # methods stubbed out.
+        # Additional methods may be easily stubbed (via add_stubs) if +stubs+ is passed.
+        def mock_model(model_class, options_and_stubs = {})
+          null = options_and_stubs.delete(:null_object)
+          stubs = options_and_stubs
+          id = @@model_id
+          @@model_id += 1
+          m = mock("#{model_class.name}_#{id}", :null_object => null)
+          m.stub!(:id).and_return(id)
+          m.stub!(:to_param).and_return(id.to_s)
+          m.stub!(:new_record?).and_return(false)
+          m.stub!(:errors).and_return(stub("errors", :count => 0))
+          m.send(:__mock_proxy).instance_eval <<-CODE
+            def @target.is_a?(other)
+              #{model_class}.ancestors.include?(other)
+            end
+            def @target.kind_of?(other)
+              #{model_class}.ancestors.include?(other)
+            end
+            def @target.instance_of?(other)
+              other == #{model_class}
+            end
+            def @target.class
+              #{model_class}
+            end
+          CODE
+          add_stubs(m, stubs)
+          yield m if block_given?
+          m
+        end
+
+        #--
+        # TODO - Shouldn't this just be an extension of stub! ??
+        # - object.stub!(:method => return_value, :method2 => return_value2, :etc => etc)
+        #++
+        # Stubs methods on +object+ (if +object+ is a symbol or string a new mock
+        # with that name will be created). +stubs+ is a Hash of <tt>method=>value</tt>
+        def add_stubs(object, stubs = {}) #:nodoc:
+          m = [String, Symbol].index(object.class) ? mock(object.to_s) : object
+          stubs.each {|k,v| m.stub!(k).and_return(v)}
+          m
+        end
+        Spec::Example::ExampleGroupFactory.register(:default, self)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/render_observer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/render_observer.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/render_observer.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/render_observer.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,90 @@
+require 'spec/mocks'
+
+module Spec
+  module Rails
+    module Example
+      # Provides specialized mock-like behaviour for controller and view examples,
+      # allowing you to mock or stub calls to render with specific arguments while
+      # ignoring all other calls.
+      module RenderObserver
+
+        # Similar to mocking +render+ with the exception that calls to +render+ with
+        # any other options are passed on to the receiver (i.e. controller in
+        # controller examples, template in view examples).
+        #
+        # This is necessary because Rails uses the +render+ method on both
+        # controllers and templates as a dispatcher to render different kinds of
+        # things, sometimes resulting in many calls to the render method within one
+        # request. This approach makes it impossible to use a normal mock object, which
+        # is designed to observe all incoming messages with a given name.
+        #
+        # +expect_render+ is auto-verifying, so failures will be reported without
+        # requiring you to explicitly request verification.
+        #
+        # Also, +expect_render+ uses parts of RSpec's mock expectation framework. Because
+        # it wraps only a subset of the framework, using this will create no conflict with
+        # other mock frameworks if you choose to use them. Additionally, the object returned
+        # by expect_render is an RSpec mock object, which means that you can call any of the
+        # chained methods available in RSpec's mocks.
+        #
+        # == Controller Examples
+        #
+        #   controller.expect_render(:partial => 'thing', :object => thing)
+        #   controller.expect_render(:partial => 'thing', :collection => things).once
+        #
+        #   controller.stub_render(:partial => 'thing', :object => thing)
+        #   controller.stub_render(:partial => 'thing', :collection => things).twice
+        #
+        # == View Examples
+        #
+        #   template.expect_render(:partial => 'thing', :object => thing)
+        #   template.expect_render(:partial => 'thing', :collection => things)
+        #
+        #   template.stub_render(:partial => 'thing', :object => thing)
+        #   template.stub_render(:partial => 'thing', :collection => things)
+        #
+        def expect_render(opts={})
+          register_verify_after_each
+          expect_render_mock_proxy.should_receive(:render, :expected_from => caller(1)[0]).with(opts)
+        end
+
+        # This is exactly like expect_render, with the exception that the call to render will not
+        # be verified. Use this if you are trying to isolate your example from a complicated render
+        # operation but don't care whether it is called or not.
+        def stub_render(opts={})
+          register_verify_after_each
+          expect_render_mock_proxy.stub!(:render, :expected_from => caller(1)[0]).with(opts)
+        end
+  
+        def verify_rendered # :nodoc:
+          expect_render_mock_proxy.rspec_verify
+        end
+  
+        def unregister_verify_after_each #:nodoc:
+          proc = verify_rendered_proc
+          Spec::Example::ExampleGroup.remove_after(:each, &proc)
+        end
+
+        protected
+
+        def verify_rendered_proc #:nodoc:
+          template = self
+          @verify_rendered_proc ||= Proc.new do
+            template.verify_rendered
+            template.unregister_verify_after_each
+          end
+        end
+
+        def register_verify_after_each #:nodoc:
+          proc = verify_rendered_proc
+          Spec::Example::ExampleGroup.after(:each, &proc)
+        end
+  
+        def expect_render_mock_proxy #:nodoc:
+          @expect_render_mock_proxy ||= Spec::Mocks::Mock.new("expect_render_mock_proxy")
+        end
+  
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/view_example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/view_example.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/view_example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour/view_example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,172 @@
+module Spec
+  module Rails
+    module Example
+      # View Examples live in $RAILS_ROOT/spec/views/.
+      #
+      # View Specs use Spec::Rails::Example::ViewExample,
+      # which provides access to views without invoking any of your controllers.
+      # See Spec::Rails::Expectations::Matchers for information about specific
+      # expectations that you can set on views.
+      #
+      # == Example
+      #
+      #   describe "login/login" do
+      #     before do
+      #       render 'login/login'
+      #     end
+      # 
+      #     it "should display login form" do
+      #       response.should have_tag("form[action=/login]") do
+      #         with_tag("input[type=text][name=email]")
+      #         with_tag("input[type=password][name=password]")
+      #         with_tag("input[type=submit][value=Login]")
+      #       end
+      #     end
+      #   end
+      class ViewExample < FunctionalExample
+        before(:each) do
+          ensure_that_flash_and_session_work_properly
+        end
+
+        def initialize(example) #:nodoc:
+          super
+          @controller_class_name = "Spec::Rails::Example::ViewExampleController"
+        end
+
+        def ensure_that_flash_and_session_work_properly #:nodoc:
+          @controller.send :initialize_template_class, @response
+          @controller.send :assign_shortcuts, @request, @response
+          @session = @controller.session
+          @controller.class.send :public, :flash
+        end
+
+        def teardown #:nodoc:
+          super
+          ensure_that_base_view_path_is_not_set_across_behaviours
+        end
+
+        def ensure_that_base_view_path_is_not_set_across_behaviours #:nodoc:
+          ActionView::Base.base_view_path = nil
+        end
+
+        def set_base_view_path(options) #:nodoc:
+          ActionView::Base.base_view_path = base_view_path(options)
+        end
+
+        def base_view_path(options) #:nodoc:
+          "/#{derived_controller_name(options)}/"
+        end
+
+        def derived_controller_name(options) #:nodoc:
+          parts = subject_of_render(options).split('/').reject { |part| part.empty? }
+          "#{parts[0..-2].join('/')}"
+        end
+
+        def derived_action_name(options) #:nodoc:
+          parts = subject_of_render(options).split('/').reject { |part| part.empty? }
+          "#{parts.last}"
+        end
+
+        def subject_of_render(options) #:nodoc:
+          [:template, :partial, :file].each do |render_type|
+            if options.has_key?(render_type)
+              return options[render_type]
+            end
+          end
+          raise Exception.new("Unhandled render type in view spec.")
+        end
+
+        def add_helpers(options) #:nodoc:
+          @controller.add_helper("application")
+          @controller.add_helper(derived_controller_name(options))
+          @controller.add_helper(options[:helper]) if options[:helper]
+          options[:helpers].each { |helper| @controller.add_helper(helper) } if options[:helpers]
+        end
+
+        # Renders a template for a View Spec, which then provides access to the result
+        # through the +response+.
+        #
+        # == Examples
+        #
+        #   render('/people/list')
+        #   render('/people/list', :helper => MyHelper)
+        #   render('/people/list', :helpers => [MyHelper, MyOtherHelper])
+        #   render(:partial => '/people/_address')
+        #
+        # See Spec::Rails::Example::ViewExample for more information.
+        def render(*args)
+          options = Hash === args.last ? args.pop : {}
+          options[:template] = args.first.to_s unless args.empty?
+
+          set_base_view_path(options)
+          add_helpers(options)
+
+          assigns[:action_name] = @action_name
+
+          @request.path_parameters = {
+          :controller => derived_controller_name(options),
+          :action => derived_action_name(options)
+          }
+
+          defaults = { :layout => false }
+          options = defaults.merge options
+
+          @controller.instance_variable_set :@params, @request.parameters
+
+          @controller.send :initialize_current_url
+
+          @controller.class.instance_eval %{
+            def controller_path
+              "#{derived_controller_name(options)}"
+            end
+
+            def controller_name
+              "#{derived_controller_name(options).split('/').last}"
+            end
+          }
+
+          @controller.send :forget_variables_added_to_assigns
+          @controller.send :render, options
+          @controller.send :process_cleanup
+        end
+
+        # This provides the template. Use this to set mock
+        # expectations for dealing with partials
+        #
+        # == Example
+        #
+        #   describe "/person/new" do
+        #     it "should use the form partial" do
+        #       template.should_receive(:render).with(:partial => 'form')
+        #       render "/person/new"
+        #     end
+        #   end
+        def template
+          @controller.template
+        end
+
+        Spec::Example::ExampleGroupFactory.register(:view, self)
+      end
+
+      class ViewExampleController < ApplicationController #:nodoc:
+        include Spec::Rails::Example::RenderObserver
+        attr_reader :template
+
+        def add_helper_for(template_path)
+          add_helper(template_path.split('/')[0])
+        end
+
+        def add_helper(name)
+          begin
+            helper_module = "#{name}_helper".camelize.constantize
+          rescue
+            return
+          end
+          template.metaclass.class_eval do
+            include helper_module
+          end
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/behaviour.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+require "spec/rails/example/behaviour/render_observer"
+require "spec/rails/example/behaviour/rails_example"
+require "spec/rails/example/behaviour/model_example"
+require "spec/rails/example/behaviour/functional_example"
+require "spec/rails/example/behaviour/controller_example"
+require "spec/rails/example/behaviour/helper_example"
+require "spec/rails/example/behaviour/view_example"
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,62 @@
+##
+# A wrapper that allows instance variables to be manipulated using +[]+ and
+# +[]=+
+
+module Spec
+  module Rails
+    module Example
+      class IvarProxy #:nodoc:
+
+        ##
+        # Wraps +object+ allowing its instance variables to be manipulated.
+
+        def initialize(object)
+          @object = object
+        end
+
+        ##
+        # Retrieves +ivar+ from the wrapped object.
+
+        def [](ivar)
+          get_variable "@#{ivar}"
+        end
+
+        ##
+        # Sets +ivar+ to +val+ on the wrapped object.
+
+        def []=(ivar, val)
+          set_variable "@#{ivar}", val
+        end
+
+        def each
+          @object.instance_variables.each do |variable_full_name|
+            variable_name = variable_full_name[1...variable_full_name.length]
+            yield variable_name, get_variable(variable_full_name)
+          end
+        end
+
+        def delete(key)
+          var_name = "@#{key}"
+          if @object.instance_variables.include?(var_name)
+            @object.send(:remove_instance_variable, var_name)
+          else
+            return nil
+          end
+        end
+
+        def has_key?(key)
+          @object.instance_variables.include?("@#{key}")
+        end
+
+        protected
+        def get_variable(name)
+          @object.instance_variable_get name
+        end
+
+        def set_variable(name, value)
+          @object.instance_variable_set name, value
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/example.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/example.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,40 @@
+dir = File.dirname(__FILE__)
+
+require 'spec/rails/example/ivar_proxy'
+require 'spec/rails/example/assigns_hash_proxy'
+require 'spec/rails/example/behaviour'
+
+module Spec
+  module Rails
+    # Spec::Rails::Example extends Spec::Example (RSpec's core Example module) to provide
+    # Rails-specific contexts for describing Rails Models, Views, Controllers and Helpers.
+    #
+    # == Model Examples
+    #
+    # These are the equivalent of unit tests in Rails' built in testing. Ironically (for the traditional TDD'er) these are the only specs that we feel should actually interact with the database.
+    #
+    # See Spec::Rails::Example::ModelExample
+    #
+    # == Controller Examples
+    #
+    # These align somewhat with functional tests in rails, except that they do not actually render views (though you can force rendering of views if you prefer). Instead of setting expectations about what goes on a page, you set expectations about what templates get rendered.
+    #
+    # See Spec::Rails::Example::ControllerExample
+    #
+    # == View Examples
+    #
+    # This is the other half of Rails functional testing. View specs allow you to set up assigns and render
+    # a template. By assigning mock model data, you can specify view behaviour with no dependency on a database
+    # or your real models.
+    #
+    # See Spec::Rails::Example::ViewExample
+    #
+    # == Helper Examples
+    #
+    # These let you specify directly methods that live in your helpers.
+    #
+    # See Spec::Rails::Example::HelperExample
+    module Example
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/base.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,14 @@
+module ActionController
+  class Base
+    class << self
+      def set_view_path(path)
+        [:append_view_path, :view_paths=, :template_root=].each do |method|
+          if respond_to?(method)
+            return send(method, path)
+          end
+        end
+      end
+    end
+  end
+end
+        
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/rescue.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/rescue.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/rescue.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/rescue.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+module ActionController
+  module Rescue
+    def use_rails_error_handling!
+      @use_rails_error_handling = true
+    end
+
+    def use_rails_error_handling?
+      @use_rails_error_handling ||= false
+    end
+
+    protected
+    def rescue_action_with_fast_errors(exception)
+      if use_rails_error_handling?
+        rescue_action_without_fast_errors exception
+      else
+        raise exception
+      end
+    end
+    alias_method_chain :rescue_action, :fast_errors
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/test_response.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/test_response.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/test_response.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_controller/test_response.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+module ActionController #:nodoc:
+  class TestResponse #:nodoc:
+    attr_writer :controller_path
+
+    def capture(name)
+      template.instance_variable_get "@content_for_#{name.to_s}"
+    end
+    alias [] capture
+
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_view/base.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_view/base.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_view/base.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/action_view/base.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,27 @@
+module ActionView #:nodoc:
+  class Base #:nodoc:
+    include Spec::Rails::Example::RenderObserver
+    cattr_accessor :base_view_path
+    def render_partial(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc:
+      if partial_path.is_a?(String)
+        unless partial_path.include?("/")
+          unless self.class.base_view_path.nil?
+            partial_path = "#{self.class.base_view_path}/#{partial_path}"
+          end
+        end
+      end
+      super(partial_path, local_assigns, deprecated_local_assigns)
+    end
+
+    alias_method :orig_render, :render
+    def render(options = {}, old_local_assigns = {}, &block)
+      if expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
+        expect_render_mock_proxy.render(options)
+      else
+        unless expect_render_mock_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
+          orig_render(options, old_local_assigns, &block)
+        end
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/active_record/base.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/active_record/base.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/active_record/base.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/active_record/base.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+module ActiveRecord #:nodoc:
+  class Base
+
+    (class << self; self; end).class_eval do
+      # Extension for <tt>should have</tt> on AR Model classes
+      #
+      #   ModelClass.should have(:no).records
+      #   ModelClass.should have(1).record
+      #   ModelClass.should have(n).records
+      def records
+        find(:all)
+      end
+      alias :record :records
+    end
+
+    # Extension for <tt>should have</tt> on AR Model instances
+    #
+    #   model.should have(:no).errors_on(:attribute)
+    #   model.should have(1).error_on(:attribute)
+    #   model.should have(n).errors_on(:attribute)
+    def errors_on(attribute)
+      self.valid?
+      [self.errors.on(attribute)].flatten.compact
+    end
+    alias :error_on :errors_on
+
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/object.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/object.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/object.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/object.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+class Object # :nodoc:
+  def self.path2class(klassname)
+    klassname.split('::').inject(Object) { |k,n| k.const_get n }
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/example/configuration.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/example/configuration.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/example/configuration.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/example/configuration.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,33 @@
+require 'spec/example/configuration'
+
+module Spec
+  module Example
+    class Configuration
+      attr_writer :use_transactional_fixtures, :use_instantiated_fixtures, :global_fixtures
+
+      def initialize
+        super
+        Test::Unit::TestCase.fixture_path = RAILS_ROOT + '/spec/fixtures'
+      end
+      
+      def use_transactional_fixtures
+        @use_transactional_fixtures.nil? ? @use_transactional_fixtures = true : @use_transactional_fixtures
+      end
+      
+      def use_instantiated_fixtures
+        @use_instantiated_fixtures ||= false
+      end
+      
+      def fixture_path
+        Test::Unit::TestCase.fixture_path
+      end
+      def fixture_path=(path)
+        Test::Unit::TestCase.fixture_path = path
+      end
+      
+      def global_fixtures
+        @global_fixtures ||= []
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/matchers/have.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/matchers/have.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/matchers/have.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions/spec/matchers/have.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+require 'spec/matchers/have'
+
+module Spec #:nodoc:
+  module Matchers #:nodoc:
+    class Have #:nodoc:
+      alias_method :__original_failure_message, :failure_message
+      def failure_message
+        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
+        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}" if @collection_name == :error_on
+        return __original_failure_message
+      end
+      
+      alias_method :__original_description, :description
+      def description
+        return "should have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
+        return "should have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}" if @collection_name == :error_on
+        return __original_description
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/extensions.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,12 @@
+require 'spec'
+
+require 'spec/rails/extensions/object'
+
+require 'spec/rails/extensions/spec/example/configuration'
+require 'spec/rails/extensions/spec/matchers/have'
+
+require 'spec/rails/extensions/active_record/base'
+require 'spec/rails/extensions/action_controller/base'
+require 'spec/rails/extensions/action_controller/rescue'
+require 'spec/rails/extensions/action_controller/test_response'
+require 'spec/rails/extensions/action_view/base'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/assert_select.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,130 @@
+# This is a wrapper of assert_select for rspec.
+
+module Spec # :nodoc:
+  module Rails
+    module Matchers
+
+      class AssertSelect #:nodoc:
+
+        def initialize(assertion, spec_scope, *args, &block)
+          @assertion = assertion
+          @spec_scope = spec_scope
+          @args = args
+          @block = block
+        end
+        
+        def matches?(response_or_text, &block)
+          if ActionController::TestResponse === response_or_text and
+                   response_or_text.headers.key?('Content-Type') and
+                   response_or_text.headers['Content-Type'].to_sym == :xml
+            @args.unshift(HTML::Document.new(response_or_text.body, false, true).root)           
+          elsif String === response_or_text
+            @args.unshift(HTML::Document.new(response_or_text).root)
+          end
+          @block = block if block
+          begin
+            @spec_scope.send(@assertion, *@args, &@block)
+          rescue ::Test::Unit::AssertionFailedError => @error
+          end
+          
+          @error.nil?
+        end
+
+        def failure_message; @error.message; end
+        def negative_failure_message; "should not #{description}, but did"; end
+
+        def description
+          {
+            :assert_select => "have tag#{format_args(*@args)}",
+            :assert_select_email => "send email#{format_args(*@args)}",
+          }[@assertion]
+        end
+
+      private
+
+        def format_args(*args)
+          return "" if args.empty?
+          return "(#{arg_list(*args)})"
+        end
+
+        def arg_list(*args)
+          args.collect do |arg|
+            arg.respond_to?(:description) ? arg.description : arg.inspect
+          end.join(", ")
+        end
+        
+      end
+      
+      # :call-seq:
+      #   response.should have_tag(*args, &block)
+      #   string.should have_tag(*args, &block)
+      #
+      # wrapper for assert_select with additional support for using
+      # css selectors to set expectation on Strings. Use this in
+      # helper specs, for example, to set expectations on the results
+      # of helper methods.
+      #
+      # == Examples
+      #
+      #   # in a controller spec
+      #   response.should have_tag("div", "some text")
+      #
+      #   # in a helper spec (person_address_tag is a method in the helper)
+      #   person_address_tag.should have_tag("input#person_address")
+      #
+      # see documentation for assert_select at http://api.rubyonrails.org/
+      def have_tag(*args, &block)
+        AssertSelect.new(:assert_select, self, *args, &block)
+      end
+    
+      # wrapper for a nested assert_select
+      #
+      #   response.should have_tag("div#form") do
+      #     with_tag("input#person_name[name=?]", "person[name]")
+      #   end
+      #
+      # see documentation for assert_select at http://api.rubyonrails.org/
+      def with_tag(*args, &block)
+        should have_tag(*args, &block)
+      end
+    
+      # wrapper for a nested assert_select with false
+      #
+      #   response.should have_tag("div#1") do
+      #     without_tag("span", "some text that shouldn't be there")
+      #   end
+      #
+      # see documentation for assert_select at http://api.rubyonrails.org/
+      def without_tag(*args, &block)
+        should_not have_tag(*args, &block)
+      end
+    
+      # :call-seq:
+      #   response.should have_rjs(*args, &block)
+      #
+      # wrapper for assert_select_rjs
+      #
+      # see documentation for assert_select_rjs at http://api.rubyonrails.org/
+      def have_rjs(*args, &block)
+        AssertSelect.new(:assert_select_rjs, self, *args, &block)
+      end
+      
+      # :call-seq:
+      #   response.should send_email(*args, &block)
+      #
+      # wrapper for assert_select_email
+      #
+      # see documentation for assert_select_email at http://api.rubyonrails.org/
+      def send_email(*args, &block)
+        AssertSelect.new(:assert_select_email, self, *args, &block)
+      end
+      
+      # wrapper for assert_select_encoded
+      #
+      # see documentation for assert_select_encoded at http://api.rubyonrails.org/
+      def with_encoded(*args, &block)
+        should AssertSelect.new(:assert_select_encoded, self, *args, &block)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/have_text.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,55 @@
+module Spec
+  module Rails
+    module Matchers
+    
+      class HaveText  #:nodoc:
+
+        def initialize(expected)
+          @expected = expected
+        end
+
+        def matches?(response)
+          @actual = response.body
+          return actual =~ expected if Regexp === expected
+          return actual == expected unless Regexp === expected
+        end
+      
+        def failure_message
+          "expected #{expected.inspect}, got #{actual.inspect}"
+        end
+        
+        def negative_failure_message
+          "expected not to have text #{expected.inspect}"
+        end
+        
+        def to_s
+          "have text #{expected.inspect}"
+        end
+      
+        private
+          attr_reader :expected
+          attr_reader :actual
+
+      end
+
+      # :call-seq:
+      #   response.should have_text(expected)
+      #   response.should_not have_text(expected)
+      #
+      # Accepts a String or a Regexp, matching a String using ==
+      # and a Regexp using =~.
+      #
+      # Use this instead of <tt>response.should have_tag()</tt>
+      # when you either don't know or don't care where on the page
+      # this text appears.
+      #
+      # == Examples
+      #
+      #   response.should have_text("This is the expected text")
+      def have_text(text)
+        HaveText.new(text)
+      end
+    
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/redirect_to.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/redirect_to.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/redirect_to.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/redirect_to.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,114 @@
+module Spec
+  module Rails
+    module Matchers
+
+      class RedirectTo  #:nodoc:
+
+        def initialize(request, expected)
+          @expected = expected
+          @request = request
+        end
+
+        def matches?(response)
+          @redirected = response.redirect?
+          @actual = response.redirect_url
+          return false unless @redirected
+          if @expected.instance_of? Hash
+            return false unless @actual =~ %r{^\w+://#{@request.host}}
+            return false unless actual_redirect_to_valid_route
+            return actual_hash == expected_hash
+          else
+            return @actual == expected_url
+          end
+        end
+
+        def actual_hash
+          hash_from_url @actual
+        end
+
+        def expected_hash
+          hash_from_url expected_url
+        end
+
+        def actual_redirect_to_valid_route
+          actual_hash
+        end
+
+        def hash_from_url(url)
+          query_hash(url).merge(path_hash(url)).with_indifferent_access
+        end
+
+        def path_hash(url)
+          path = url.sub(%r{^\w+://#{@request.host}}, "").split("?", 2)[0]
+          path = path.split("/")[1..-1] if ::Rails::VERSION::MINOR < 2
+          ActionController::Routing::Routes.recognize_path path
+        end
+
+        def query_hash(url)
+          query = url.split("?", 2)[1] || ""
+          QueryParameterParser.parse_query_parameters(query, @request)
+        end
+
+       def expected_url
+          case @expected
+            when Hash
+              return ActionController::UrlRewriter.new(@request, {}).rewrite(@expected)
+            when :back
+              return @request.env['HTTP_REFERER']
+            when %r{^\w+://.*}
+              return @expected
+            else
+              return "http://#{@request.host}" + (@expected.split('')[0] == '/' ? '' : '/') + @expected
+          end
+        end
+
+        def failure_message
+          if @redirected
+            return %Q{expected redirect to #{@expected.inspect}, got redirect to #{@actual.inspect}}
+          else
+            return %Q{expected redirect to #{@expected.inspect}, got no redirect}
+          end
+        end
+
+        def negative_failure_message
+            return %Q{expected not to be redirected to #{@expected.inspect}, but was} if @redirected
+        end
+
+        def description
+          "redirect to #{@actual.inspect}"
+        end
+
+        class QueryParameterParser
+          def self.parse_query_parameters(query, request)
+            if defined?(CGIMethods)
+              CGIMethods.parse_query_parameters(query)
+            else
+              request.class.parse_query_parameters(query)
+            end
+          end
+        end
+      end
+
+      # :call-seq:
+      #   response.should redirect_to(url)
+      #   response.should redirect_to(:action => action_name)
+      #   response.should redirect_to(:controller => controller_name, :action => action_name)
+      #   response.should_not redirect_to(url)
+      #   response.should_not redirect_to(:action => action_name)
+      #   response.should_not redirect_to(:controller => controller_name, :action => action_name)
+      #
+      # Passes if the response is a redirect to the url, action or controller/action.
+      # Useful in controller specs (integration or isolation mode).
+      #
+      # == Examples
+      #
+      #   response.should redirect_to("path/to/action")
+      #   response.should redirect_to("http://test.host/path/to/action")
+      #   response.should redirect_to(:action => 'list')
+      def redirect_to(opts)
+        RedirectTo.new(request, opts)
+      end
+    end
+
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers/render_template.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,66 @@
+module Spec
+  module Rails
+    module Matchers
+    
+      class RenderTemplate #:nodoc:
+    
+        def initialize(expected, controller)
+          @controller = controller
+          @expected = expected
+        end
+      
+        def matches?(response)
+          @actual = response.rendered_file
+          full_path(@actual) == full_path(@expected)
+        end
+
+        def failure_message
+          "expected #{@expected.inspect}, got #{@actual.inspect}"
+        end
+        
+        def description
+          "render template #{@expected.inspect}"
+        end
+      
+        private
+          def full_path(path)
+            return nil if path.nil?
+            path.include?('/') ? path : "#{@controller.class.to_s.underscore.gsub('_controller','')}/#{path}"
+          end
+        
+      end
+
+      # :call-seq:
+      #   response.should render_template(path)
+      #   response.should_not render_template(path)
+      #
+      # Passes if the specified template is rendered by the response.
+      # Useful in controller specs (integration or isolation mode).
+      #
+      # <code>path</code> can include the controller path or not. It
+      # can also include an optional extension (no extension assumes .rhtml).
+      #
+      # Note that partials must be spelled with the preceding underscore.
+      #
+      # == Examples
+      #
+      #   response.should render_template('list')
+      #   response.should render_template('same_controller/list')
+      #   response.should render_template('other_controller/list')
+      #
+      #   #rjs
+      #   response.should render_template('list.rjs')
+      #   response.should render_template('same_controller/list.rjs')
+      #   response.should render_template('other_controller/list.rjs')
+      #
+      #   #partials
+      #   response.should render_template('_a_partial')
+      #   response.should render_template('same_controller/_a_partial')
+      #   response.should render_template('other_controller/_a_partial')
+      def render_template(path)
+        RenderTemplate.new(path.to_s, @controller)
+      end
+
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/matchers.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,29 @@
+dir = File.dirname(__FILE__)
+require 'spec/rails/matchers/assert_select'
+require 'spec/rails/matchers/have_text'
+require 'spec/rails/matchers/redirect_to'
+require 'spec/rails/matchers/render_template'
+
+module Spec
+  module Rails
+    # Spec::Rails::Expectations::Matchers provides several expectation matchers
+    # intended to work with Rails components like models and responses. For example:
+    #
+    #   response.should redirect_to("some/url") #redirect_to(url) is the matcher.
+    #
+    # In addition to those you see below, the arbitrary predicate feature of RSpec
+    # makes the following available as well:
+    #
+    #   response.should be_success #passes if response.success?
+    #   response.should be_redirect #passes if response.redirect?
+    #
+    # Note that many of these matchers are part of a wrapper of <tt>assert_select</tt>, so
+    # the documentation comes straight from that with some slight modifications.
+    # <tt>assert_select</tt> is a Test::Unit extension originally contributed to the
+    # Rails community as a plugin by Assaf Arkin and eventually shipped as part of Rails.
+    #
+    # For more info on <tt>assert_select</tt>, see the relevant Rails documentation.
+    module Matchers
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/story_adapter.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+# WARNING - THIS IS PURELY EXPERIMENTAL AT THIS POINT
+# Courtesy of Brian Takita and Yurii Rashkovskii
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec lib])
+require 'test_help'
+require 'test/unit/testresult'
+require 'spec'
+require 'spec/rails'
+
+Test::Unit.run = true
+
+class RailsStory < ActionController::IntegrationTest
+  self.use_transactional_fixtures = true
+  include Spec::Rails::Matchers
+
+  def initialize #:nodoc:
+    @_result = Test::Unit::TestResult.new
+  end
+end
+
+class ActiveRecordSafetyListener
+  include Singleton
+  def scenario_started(*args)
+    ActiveRecord::Base.send :increment_open_transactions unless Rails::VERSION::STRING == "1.1.6"
+    ActiveRecord::Base.connection.begin_db_transaction
+  end
+  def scenario_succeeded(*args)
+    ActiveRecord::Base.connection.rollback_db_transaction
+    ActiveRecord::Base.send :decrement_open_transactions unless Rails::VERSION::STRING == "1.1.6"
+  end
+  alias :scenario_pending :scenario_succeeded
+  alias :scenario_failed :scenario_succeeded
+end
+
+class Spec::Story::Runner::ScenarioRunner
+  def initialize
+    @listeners = [ActiveRecordSafetyListener.instance]
+  end
+end
+
+class Spec::Story::GivenScenario
+  def perform(instance, name = nil)
+    scenario = Spec::Story::Runner::StoryRunner.scenario_from_current_story @name
+    runner = Spec::Story::Runner::ScenarioRunner.new
+    runner.instance_variable_set(:@listeners,[])
+    runner.run(scenario, instance)
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails/version.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,26 @@
+module Spec
+  module Rails
+    module VERSION #:nodoc:
+      unless defined?(REV)
+        # RANDOM_TOKEN: 0.885013695004692
+        REV = "$LastChangedRevision: 2958 $".match(/LastChangedRevision: (\d+)/)[1]
+      end
+    end
+  end
+end
+
+# Verifies that the plugin has the same revision as RSpec
+if Spec::VERSION::REV != Spec::Rails::VERSION::REV
+  raise <<-EOF
+
+############################################################################
+Your RSpec on Rails plugin is incompatible with your installed RSpec.
+
+RSpec          : #{Spec::VERSION::FULL_VERSION}
+RSpec on Rails : r#{Spec::Rails::VERSION::REV}
+
+Make sure your RSpec on Rails plugin is compatible with your RSpec gem.
+See http://rspec.rubyforge.org/documentation/rails/install.html for details.
+############################################################################
+EOF
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/lib/spec/rails.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/lib/spec/rails.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+silence_warnings { RAILS_ENV = "test" }
+
+require 'application'
+require 'action_controller/test_process'
+require 'action_controller/integration'
+require 'active_record/base'
+require 'active_record/fixtures'
+require 'test/unit'
+
+require 'spec'
+
+require 'spec/rails/extensions'
+require 'spec/rails/example'
+require 'spec/rails/version'
+require 'spec/rails/matchers'
+
+module Spec
+  # = Spec::Rails
+  #
+  # Spec::Rails (a.k.a. RSpec on Rails) is a Ruby on Rails plugin that allows you to drive the development
+  # of your RoR application using RSpec, a framework that aims to enable Example Driven Development
+  # in Ruby.
+  # 
+  # == Features
+  # 
+  # * Use RSpec to independently specify Rails Models, Views, Controllers and Helpers
+  # * Integrated fixture loading
+  # * Special generators for Resources, Models, Views and Controllers that generate Specs instead of Tests.
+  # 
+  # == Vision
+  # 
+  # For people for whom TDD is a brand new concept, the testing support built into Ruby on Rails
+  # is a huge leap forward. The fact that it is built right in is fantastic, and Ruby on Rails
+  # apps are generally much easier to maintain than they might have been without such support.
+  # 
+  # For those of us coming from a history with TDD, and now BDD, the existing support presents some problems related to dependencies across specs. To that end, RSpec on Rails supports 4 types of specs. We’ve also built in first class mocking and stubbing support in order to break dependencies across these different concerns.
+  # 
+  # == More Information
+  #
+  # See Spec::Rails::Runner for information about the different kinds of contexts
+  # you can use to spec the different Rails components
+  # 
+  # See Spec::Rails::Expectations for information about Rails-specific expectations
+  # you can set on responses and models, etc.
+  #
+  # == License
+  # 
+  # RSpec on Rails is licensed under the same license as RSpec itself,
+  # the MIT-LICENSE.
+  module Rails
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/autotest/mappings_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "autotest", "rails_rspec")
+
+describe Autotest::RailsRspec, "file mapping" do
+  before(:each) do
+    @autotest = Autotest::RailsRspec.new
+    @autotest.output = StringIO.new
+    @autotest.files.clear
+    @autotest.last_mtime = Time.at(0)
+  end
+  
+  def ensure_mapping(examples, impl)
+    @autotest.files[@impl] = Time.at(0)
+    examples.each do |example|
+      @autotest.files[example] = Time.at(0)
+    end
+    @autotest.tests_for_file(impl).should == examples
+  end
+  
+  it "should map model example to model" do
+    ensure_mapping(['spec/models/thing_spec.rb'], 'app/models/thing.rb')
+  end
+  
+  it "should map controller example to controller" do
+    ensure_mapping(['spec/controllers/things_controller_spec.rb'], 'app/controllers/things_controller.rb')
+  end
+  
+  it "should map view.rhtml" do
+    ensure_mapping(['spec/views/things/index.rhtml_spec.rb'], 'app/views/things/index.rhtml')
+  end
+  
+  it "should map view.rhtml with underscores in example filename" do
+    ensure_mapping(['spec/views/things/index_rhtml_spec.rb'], 'app/views/things/index.rhtml')
+  end
+  
+  it "should map view.html.erb" do
+    ensure_mapping(['spec/views/things/index.html.erb_spec.rb'], 'app/views/things/index.html.erb')
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/autotest/rails_rspec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "autotest", "rails_rspec")
+
+describe Autotest::RailsRspec do
+  it "should provide the correct spec_command" do
+    Autotest::RailsRspec.new.spec_command.should == "script/spec"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/assigns_hash_proxy_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/assigns_hash_proxy_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/assigns_hash_proxy_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/assigns_hash_proxy_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "An AssignsHashProxy" do
+  before(:each) do
+    @object = Object.new
+    @assigns = Hash.new
+    @object.stub!(:assigns).and_return(@assigns)
+    @proxy = Spec::Rails::Example::AssignsHashProxy.new(@object)
+  end
+
+  it "has [] accessor" do
+    @proxy['foo'] = 'bar'
+    @assigns['foo'].should == 'bar'
+    @proxy['foo'].should == 'bar'
+  end
+
+  it "works for symbol key" do
+    @assigns[:foo] = 2
+    @proxy[:foo].should == 2
+  end
+
+  it "checks for string key before symbol key" do
+    @assigns['foo'] = false
+    @assigns[:foo] = 2
+    @proxy[:foo].should == false
+  end
+
+  it "each method iterates through each element like a Hash" do
+    values = {
+      'foo' => 1,
+      'bar' => 2,
+      'baz' => 3
+    }
+    @proxy['foo'] = values['foo']
+    @proxy['bar'] = values['bar']
+    @proxy['baz'] = values['baz']
+
+    @proxy.each do |key, value|
+      key.should == key
+      value.should == values[key]
+    end
+  end
+
+  it "delete method deletes the element of passed in key" do
+    @proxy['foo'] = 'bar'
+    @proxy.delete('foo').should == 'bar'
+    @proxy['foo'].should be_nil
+  end
+
+  it "has_key? detects the presence of a key" do
+    @proxy['foo'] = 'bar'
+    @proxy.has_key?('foo').should == true
+    @proxy.has_key?('bar').should == false
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/configuration_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/configuration_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/configuration_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/configuration_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,73 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe Configuration, :shared => true do
+      before(:each) { @config = Configuration.new }
+    end
+
+    describe Configuration, "#use_transactional_fixtures" do
+      it_should_behave_like "Spec::Example::Configuration"
+      
+      it "should default to true" do
+        @config.use_transactional_fixtures.should be(true)
+      end
+
+      it "should set to false" do
+        @config.use_transactional_fixtures = false
+        @config.use_transactional_fixtures.should be(false)
+      end
+
+      it "should set to true" do
+        @config.use_transactional_fixtures = true
+        @config.use_transactional_fixtures.should be(true)
+      end
+    end
+
+    describe Configuration, "#use_instantiated_fixtures" do
+      it_should_behave_like "Spec::Example::Configuration"
+      
+      it "should to false" do
+        @config.use_instantiated_fixtures.should be(false)
+      end
+
+      it "should set to false" do
+        @config.use_instantiated_fixtures = false
+        @config.use_instantiated_fixtures.should be(false)
+      end
+
+      it "should set to true" do
+        @config.use_instantiated_fixtures = true
+        @config.use_instantiated_fixtures.should be(true)
+      end
+    end
+
+    describe Configuration, "#fixture_path" do
+      it_should_behave_like "Spec::Example::Configuration"
+      
+      it "should default to RAILS_ROOT + '/spec/fixtures'" do
+        @config.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+        Test::Unit::TestCase.fixture_path.should == RAILS_ROOT + '/spec/fixtures'
+      end
+
+      it "should set fixture_path" do
+        @config.fixture_path = "/new/path"
+        @config.fixture_path.should == "/new/path"
+        Test::Unit::TestCase.fixture_path.should == "/new/path"
+      end
+    end
+
+    describe Configuration, "#global_fixtures" do
+      it_should_behave_like "Spec::Example::Configuration"
+
+      it "should default to []" do
+        @config.global_fixtures.should == []
+      end
+
+      it "should set to false" do
+        @config.global_fixtures << :blah
+        @config.global_fixtures.should == [:blah]
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_isolation_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_isolation_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_isolation_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_isolation_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'controller_spec_controller'
+
+describe "a controller spec running in isolation mode", :behaviour_type => :controller do
+  controller_name :controller_spec
+
+  it "should not care if the template doesn't exist" do
+    get 'some_action'
+    response.should be_success
+    response.should render_template("template/that/does/not/actually/exist")
+  end
+
+  it "should not care if the template has errors" do
+    get 'action_with_errors_in_template'
+    response.should be_success
+    response.should render_template("action_with_errors_in_template")
+  end
+end
+
+describe "a controller spec running in integration mode", :behaviour_type => :controller do
+  controller_name :controller_spec
+  integrate_views
+  
+  before(:each) do
+    controller.class.send(:define_method, :rescue_action) { |e| raise e }
+  end
+
+  it "should render a template" do
+    get 'action_with_template'
+    response.should be_success
+    response.should have_tag('div', 'This is action_with_template.rhtml')
+  end
+
+  it "should choke if the template doesn't exist" do
+    lambda { get 'some_action' }.should raise_error(ActionController::MissingTemplate)
+    response.should_not be_success
+  end
+
+  it "should choke if the template has errors" do
+    lambda { get 'action_with_errors_in_template' }.should raise_error(ActionView::TemplateError)
+    response.should_not be_success
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_spec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_spec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_spec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/controller_spec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,157 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'controller_spec_controller'
+
+['integration', 'isolation'].each do |mode|
+  describe "A controller example running in #{mode} mode", :behaviour_type => :controller do
+    controller_name :controller_spec
+    integrate_views if mode == 'integration'
+  
+    it "should provide controller.session as session" do
+      get 'action_with_template'
+      session.should equal(controller.session)
+    end
+  
+    it "should provide the same session object before and after the action" do
+      session_before = session
+      get 'action_with_template'
+      session.should equal(session_before)
+    end
+  
+    it "should ensure controller.session is NOT nil before the action" do
+      controller.session.should_not be_nil
+      get 'action_with_template'
+    end
+    
+    it "should ensure controller.session is NOT nil after the action" do
+      get 'action_with_template'
+      controller.session.should_not be_nil
+    end
+    
+    it "should allow specifying a partial with partial name only" do
+      get 'action_with_partial'
+      response.should render_template("_partial")
+    end
+    
+    it "should allow specifying a partial with expect_render" do
+      controller.expect_render(:partial => "controller_spec/partial")
+      get 'action_with_partial'
+    end
+    
+    it "should allow specifying a partial with expect_render with object" do
+      controller.expect_render(:partial => "controller_spec/partial", :object => "something")
+      get 'action_with_partial_with_object', :thing => "something"
+    end
+    
+    it "should allow specifying a partial with expect_render with locals" do
+      controller.expect_render(:partial => "controller_spec/partial", :locals => {:thing => "something"})
+      get 'action_with_partial_with_locals', :thing => "something"
+    end
+    
+    it "should allow a path relative to RAILS_ROOT/app/views/ when specifying a partial" do
+      get 'action_with_partial'
+      response.should render_template("controller_spec/_partial")
+    end
+    
+    it "should provide access to flash" do
+      get 'action_with_template'
+      flash[:flash_key].should == "flash value"
+    end
+    
+    it "should provide access to flash values set after a session reset" do
+      get 'action_setting_flash_after_session_reset'
+      flash[:after_reset].should == "available"
+    end
+    
+    it "should not provide access to flash values set before a session reset" do
+      get 'action_setting_flash_before_session_reset'
+      flash[:before_reset].should_not == "available"
+    end
+
+    it "should provide access to session" do
+      get 'action_with_template'
+      session[:session_key].should == "session value"
+    end
+
+    it "should support custom routes" do
+      route_for(:controller => "custom_route_spec", :action => "custom_route").should == "/custom_route"
+    end
+
+    it "should support existing routes" do
+      route_for(:controller => "controller_spec", :action => "some_action").should == "/controller_spec/some_action"
+    end
+
+    it "should generate params for custom routes" do
+      params_from(:get, '/custom_route').should == {:controller => "custom_route_spec", :action => "custom_route"}
+    end
+    
+    it "should generate params for existing routes" do
+      params_from(:get, '/controller_spec/some_action').should == {:controller => "controller_spec", :action => "some_action"}
+    end
+    
+    it "should expose the assigns hash directly" do
+      get 'action_setting_the_assigns_hash'
+      assigns[:direct_assigns_key].should == :direct_assigns_key_value
+    end
+    
+    it "should complain when calling should_receive(:render) on the controller" do
+      lambda {
+        controller.should_receive(:render)
+      }.should raise_error(RuntimeError, /should_receive\(:render\) has been disabled/)
+    end
+
+    it "should complain when calling stub!(:render) on the controller" do
+      lambda {
+        controller.stub!(:render)
+      }.should raise_error(RuntimeError, /stub!\(:render\) has been disabled/)
+    end
+    
+    it "should NOT complain when calling should_receive with arguments other than :render" do
+      controller.should_receive(:anything_besides_render)
+      lambda {
+        controller.rspec_verify
+      }.should raise_error(Exception, /expected :anything_besides_render/)
+    end
+  end
+
+  describe "Given a controller spec for RedirectSpecController running in #{mode} mode", :behaviour_type => :controller do
+    controller_name :redirect_spec
+    integrate_views if mode == 'integration'
+
+    it "a redirect should ignore the absence of a template" do
+      get 'action_with_redirect_to_somewhere'
+      response.should be_redirect
+      response.redirect_url.should == "http://test.host/redirect_spec/somewhere"
+      response.should redirect_to("http://test.host/redirect_spec/somewhere")
+    end
+    
+    it "a call to response.should redirect_to should fail if no redirect" do
+      get 'action_with_no_redirect'
+      lambda {
+        response.redirect?.should be_true
+      }.should fail
+      lambda {
+        response.should redirect_to("http://test.host/redirect_spec/somewhere")
+      }.should fail_with("expected redirect to \"http://test.host/redirect_spec/somewhere\", got no redirect")
+    end
+  end
+  
+  describe "Given a controller spec running in #{mode} mode" do
+    example_group = describe "A controller spec"
+    # , :behaviour_type => :controller do
+    # integrate_views if mode == 'integration'
+    it "a spec in a context without controller_name set should fail with a useful warning" do
+      pending("need a new way to deal with examples that should_raise")
+    # ,
+    #   :should_raise => [
+    #     Spec::Expectations::ExpectationNotMetError,
+    #     /You have to declare the controller name in controller specs/
+    #   ] do
+    end
+  end
+  
+end
+
+describe ControllerSpecController, :behaviour_type => :controller do
+  it "should not require naming the controller if describe is passed a type" do
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/example_group_factory_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/example_group_factory_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/example_group_factory_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/example_group_factory_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,112 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Example
+    describe ExampleGroupFactory do
+      it "should return a ModelExample when given :behaviour_type => :model" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :behaviour_type => :model
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ModelExample
+      end
+
+      it "should return a ModelExample when given :spec_path => '/blah/spec/models/'" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/models/blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ModelExample
+      end
+
+      it "should return a ModelExample when given :spec_path => '\\blah\\spec\\models\\' (windows format)" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '\\blah\\spec\\models\\blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ModelExample
+      end
+
+      it "should return a RailsExample when given :spec_path => '/blah/spec/foo/' (anything other than controllers, views and helpers)" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/foo/blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::RailsExample
+      end
+
+      it "should return a RailsExample when given :spec_path => '\\blah\\spec\\foo\\' (windows format)  (anything other than controllers, views and helpers)" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '\\blah\\spec\\foo\\blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::RailsExample
+      end
+
+      it "should return a ViewExample when given :behaviour_type => :model" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :behaviour_type => :view
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ViewExample
+      end
+
+      it "should return a ViewExample when given :spec_path => '/blah/spec/views/'" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/views/blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ViewExample
+      end
+
+      it "should return a ModelExample when given :spec_path => '\\blah\\spec\\views\\' (windows format)" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '\\blah\\spec\\views\\blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ViewExample
+      end
+
+      it "should return a HelperExample when given :behaviour_type => :helper" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :behaviour_type => :helper
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::HelperExample
+      end
+
+      it "should return a HelperExample when given :spec_path => '/blah/spec/helpers/'" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/helpers/blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::HelperExample
+      end
+
+      it "should return a ModelExample when given :spec_path => '\\blah\\spec\\helpers\\' (windows format)" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '\\blah\\spec\\helpers\\blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::HelperExample
+      end
+
+      it "should return a ControllerExample when given :behaviour_type => :controller" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :behaviour_type => :controller
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ControllerExample
+      end
+
+      it "should return a ControllerExample when given :spec_path => '/blah/spec/controllers/'" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/controllers/blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ControllerExample
+      end
+
+      it "should return a ModelExample when given :spec_path => '\\blah\\spec\\controllers\\' (windows format)" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '\\blah\\spec\\controllers\\blah.rb'
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ControllerExample
+      end
+
+      it "should favor the :behaviour_type over the :spec_path" do
+        behaviour = Spec::Example::ExampleGroupFactory.create_example_group(
+          "name", :spec_path => '/blah/spec/models/blah.rb', :behaviour_type => :controller
+        ) {}
+        behaviour.superclass.should == Spec::Rails::Example::ControllerExample
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/helper_spec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/helper_spec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/helper_spec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/helper_spec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,101 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+Spec::Runner.configuration.global_fixtures = :people
+
+describe ExplicitHelper, :behaviour_type => :helper do
+  it "should not require naming the helper if describe is passed a type" do
+    method_in_explicit_helper.should match(/text from a method/)
+  end
+end
+
+module Spec
+  module Rails
+    module Example
+      describe HelperExample, :behaviour_type => :helper do
+        helper_name :explicit
+
+        it "should have direct access to methods defined in helpers" do
+          method_in_explicit_helper.should =~ /text from a method/
+        end
+
+        it "should have access to named routes" do
+          rspec_on_rails_specs_url.should == "http://test.host/rspec_on_rails_specs"
+          rspec_on_rails_specs_path.should == "/rspec_on_rails_specs"
+        end
+
+        it "should fail if the helper method deson't exist" do
+          lambda { non_existant_helper_method }.should raise_error(NameError)
+        end
+      end
+
+
+      describe HelperExample, "#eval_erb", :behaviour_type => :helper do
+        helper_name :explicit
+
+        it "should support methods that accept blocks" do
+          eval_erb("<% prepend 'foo' do %>bar<% end %>").should == "foobar"
+        end
+      end
+
+      describe HelperExample, ".fixtures", :behaviour_type => :helper do
+        helper_name :explicit
+        fixtures :animals
+
+        it "should load fixtures" do
+          pig = animals(:pig)
+          pig.class.should == Animal
+        end
+
+        it "should load global fixtures" do
+          lachie = people(:lachie)
+          lachie.class.should == Person
+        end
+      end
+
+      describe HelperExample, "included modules", :behaviour_type => :helper do
+        helpers = [
+          ActionView::Helpers::ActiveRecordHelper,
+          ActionView::Helpers::AssetTagHelper,
+          ActionView::Helpers::BenchmarkHelper,
+          ActionView::Helpers::CacheHelper,
+          ActionView::Helpers::CaptureHelper,
+          ActionView::Helpers::DateHelper,
+          ActionView::Helpers::DebugHelper,
+          ActionView::Helpers::FormHelper,
+          ActionView::Helpers::FormOptionsHelper,
+          ActionView::Helpers::FormTagHelper,
+          ActionView::Helpers::JavaScriptHelper,
+          ActionView::Helpers::NumberHelper,
+          ActionView::Helpers::PrototypeHelper,
+          ActionView::Helpers::ScriptaculousHelper,
+          ActionView::Helpers::TagHelper,
+          ActionView::Helpers::TextHelper,
+          ActionView::Helpers::UrlHelper
+        ]
+        helpers << ActionView::Helpers::PaginationHelper rescue nil       #removed for 2.0
+        helpers << ActionView::Helpers::JavaScriptMacrosHelper rescue nil #removed for 2.0
+        helpers.each do |helper_module|
+          it "should include #{helper_module}" do
+            self.class.ancestors.should include(helper_module)
+          end
+        end
+      end
+      
+      # TODO: BT - Helper Examples should proxy method_missing to a Rails View instance.
+      # When that is done, remove this method
+      describe HelperExample, "#protect_against_forgery?", :behaviour_type => :helper do
+        it "should return false" do
+          protect_against_forgery?.should be_false
+        end
+      end
+    end
+  end
+end
+
+module Bug11223
+  # see http://rubyforge.org/tracker/index.php?func=detail&aid=11223&group_id=797&atid=3149
+  describe 'Accessing flash from helper spec', :behaviour_type => :helper do
+    it 'should not raise an error' do
+      lambda { flash['test'] }.should_not raise_error
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/ivar_proxy_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/ivar_proxy_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/ivar_proxy_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/ivar_proxy_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "IvarProxy setup", :shared => true do
+  before do
+    @object = Object.new
+    @proxy = Spec::Rails::Example::IvarProxy.new(@object)
+  end  
+end
+
+describe "IvarProxy" do
+  it_should_behave_like "IvarProxy setup"
+  
+  it "has [] accessor" do
+    @proxy['foo'] = 'bar'
+    @object.instance_variable_get(:@foo).should == 'bar'
+    @proxy['foo'].should == 'bar'
+  end
+
+  it "iterates through each element like a Hash" do
+    values = {
+      'foo' => 1,
+      'bar' => 2,
+      'baz' => 3
+    }
+    @proxy['foo'] = values['foo']
+    @proxy['bar'] = values['bar']
+    @proxy['baz'] = values['baz']
+
+    @proxy.each do |key, value|
+      key.should == key
+      value.should == values[key]
+    end
+  end
+
+  it "detects the presence of a key" do
+    @proxy['foo'] = 'bar'
+    @proxy.has_key?('foo').should == true
+    @proxy.has_key?('bar').should == false
+  end
+end
+
+describe "IvarProxy", "#delete" do
+  it_should_behave_like "IvarProxy setup"
+  
+  it "deletes the element with key" do
+    @proxy['foo'] = 'bar'
+    @proxy.delete('foo').should == 'bar'
+    @proxy['foo'].should be_nil
+  end
+
+  it "deletes nil instance variables" do
+    @proxy['foo'] = nil
+    @object.instance_variables.should include("@foo")
+    @proxy.delete('foo').should == nil
+    @proxy['foo'].should be_nil
+    @object.instance_variables.should_not include("@foo")
+  end
+
+  it "returns nil when key does not exist" do
+    @proxy['foo'].should be_nil
+    @proxy.delete('foo').should == nil
+    @proxy['foo'].should be_nil
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/model_spec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/model_spec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/model_spec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/model_spec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/shared_behaviour_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/shared_behaviour_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/shared_behaviour_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/shared_behaviour_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "A shared view behaviour", :shared => true do
+  it "should have some tag with some text" do
+    response.should have_tag('div', 'This is text from a method in the ViewSpecHelper')
+  end
+end
+
+describe "A view behaviour", :behaviour_type => :view do
+  it_should_behave_like "A shared view behaviour"
+  
+  before(:each) do
+    render "view_spec/implicit_helper"
+  end
+end
+  
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/test_unit_assertion_accessibility_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/test_unit_assertion_accessibility_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/test_unit_assertion_accessibility_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/test_unit_assertion_accessibility_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "assert_equal", :shared => true do
+  it "like assert_equal" do
+    assert_equal 1, 1
+    lambda {
+      assert_equal 1, 2
+    }.should raise_error(Test::Unit::AssertionFailedError)
+  end
+end
+
+describe "A model spec should be able to access 'test/unit' assertions", :behaviour_type => :model do
+  it_should_behave_like "assert_equal"
+end
+
+describe "A view spec should be able to access 'test/unit' assertions", :behaviour_type => :view do
+  it_should_behave_like "assert_equal"
+end
+
+describe "A helper spec should be able to access 'test/unit' assertions", :behaviour_type => :helper do
+  it_should_behave_like "assert_equal"
+end
+
+describe "A controller spec with integrated views should be able to access 'test/unit' assertions", :behaviour_type => :controller do
+  controller_name :controller_spec
+  integrate_views
+  it_should_behave_like "assert_equal"
+end
+
+describe "A controller spec should be able to access 'test/unit' assertions", :behaviour_type => :controller do
+  controller_name :controller_spec
+  it_should_behave_like "assert_equal"
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/view_spec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/view_spec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/dsl/view_spec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/dsl/view_spec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,232 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "A template with an implicit helper", :behaviour_type => :view do
+  before(:each) do
+    render "view_spec/implicit_helper"
+  end
+
+  it "should include the helper" do
+    response.should have_tag('div', :content => "This is text from a method in the ViewSpecHelper")
+  end
+
+  it "should include the application helper" do
+    response.should have_tag('div', :content => "This is text from a method in the ApplicationHelper")
+  end
+
+  it "should have access to named routes" do
+    rspec_on_rails_specs_url.should == "http://test.host/rspec_on_rails_specs"
+    rspec_on_rails_specs_path.should == "/rspec_on_rails_specs"
+  end
+end
+
+describe "A template requiring an explicit helper", :behaviour_type => :view do
+  before(:each) do
+    render "view_spec/explicit_helper", :helper => 'explicit'
+  end
+
+  it "should include the helper if specified" do
+    response.should have_tag('div', :content => "This is text from a method in the ExplicitHelper")
+  end
+
+  it "should include the application helper" do
+    response.should have_tag('div', :content => "This is text from a method in the ApplicationHelper")
+  end
+end
+
+describe "A template requiring multiple explicit helpers", :behaviour_type => :view do
+  before(:each) do
+    render "view_spec/multiple_helpers", :helpers => ['explicit', 'more_explicit']
+  end
+
+  it "should include all specified helpers" do
+    response.should have_tag('div', :content => "This is text from a method in the ExplicitHelper")
+    response.should have_tag('div', :content => "This is text from a method in the MoreExplicitHelper")
+  end
+
+  it "should include the application helper" do
+    response.should have_tag('div', :content => "This is text from a method in the ApplicationHelper")
+  end
+end
+
+describe "Message Expectations on helper methods", :behaviour_type => :view do
+  it "should work" do
+    template.should_receive(:method_in_plugin_application_helper).and_return('alternate message 1')
+    render "view_spec/implicit_helper"
+    response.body.should =~ /alternate message 1/
+  end
+
+  it "should work twice" do
+    template.should_receive(:method_in_plugin_application_helper).and_return('alternate message 2')
+    render "view_spec/implicit_helper"
+    response.body.should =~ /alternate message 2/
+  end
+end
+
+describe "A template that includes a partial", :behaviour_type => :view do
+  def render!
+    render "view_spec/template_with_partial"
+  end
+
+  it "should render the enclosing template" do
+    render!
+    response.should have_tag('div', "method_in_partial in ViewSpecHelper")
+  end
+
+  it "should render the partial" do
+    render!
+    response.should have_tag('div', "method_in_template_with_partial in ViewSpecHelper")
+  end
+
+  it "should include the application helper" do
+    render!
+    response.should have_tag('div', "This is text from a method in the ApplicationHelper")
+  end
+  
+  it "should pass expect_render with the right partial" do
+    template.expect_render(:partial => 'partial')
+    render!
+    template.verify_rendered
+  end
+  
+  it "should fail expect_render with the wrong partial" do
+    template.expect_render(:partial => 'non_existent')
+    render!
+    begin
+      template.verify_rendered
+    rescue Spec::Mocks::MockExpectationError => e
+    ensure
+      e.backtrace.find{|line| line =~ /view_spec_spec\.rb\:92/}.should_not be_nil
+    end
+  end
+  
+  it "should pass expect_render when a partial is expected twice and happens twice" do
+    template.expect_render(:partial => 'partial_used_twice').twice
+    render!
+    template.verify_rendered
+  end
+  
+  it "should pass expect_render when a partial is expected once and happens twice" do
+    template.expect_render(:partial => 'partial_used_twice')
+    render!
+    begin
+      template.verify_rendered
+    rescue Spec::Mocks::MockExpectationError => e
+    ensure
+      e.backtrace.find{|line| line =~ /view_spec_spec\.rb\:109/}.should_not be_nil
+    end
+  end
+  
+  it "should fail expect_render with the right partial but wrong options" do
+    template.expect_render(:partial => 'partial', :locals => {:thing => Object.new})
+    render!
+    lambda {template.verify_rendered}.should raise_error(Spec::Mocks::MockExpectationError)
+  end
+end
+
+describe "A partial that includes a partial", :behaviour_type => :view do
+  it "should support expect_render with nested partial" do
+    obj = Object.new
+    template.expect_render(:partial => 'partial', :object => obj)
+    render :partial => "view_spec/partial_with_sub_partial", :locals => { :partial => obj }
+  end
+end
+
+describe "A view that includes a partial using :collection and :spacer_template", :behaviour_type => :view  do
+  it "should render the partial w/ spacer_tamplate" do
+    render "view_spec/template_with_partial_using_collection"
+    response.should have_tag('div',/method_in_partial/)
+    response.should have_tag('div',/ApplicationHelper/)
+    response.should have_tag('div',/ViewSpecHelper/)
+    response.should have_tag('hr#spacer')
+  end
+
+  it "should render the partial" do
+    template.expect_render(:partial => 'partial',
+               :collection => ['Alice', 'Bob'],
+               :spacer_template => 'spacer')
+    render "view_spec/template_with_partial_using_collection"
+  end
+
+end
+
+describe "A view that includes a partial using an array as partial_path", :behaviour_type => :view do
+  before(:each) do
+    module ActionView::Partials
+      def render_template_with_partial_with_array_support(partial_path, local_assigns = nil, deprecated_local_assigns = nil)
+        if partial_path.is_a?(Array)
+          "Array Partial"
+        else
+          render_partial_without_array_support(partial_path, local_assigns, deprecated_local_assigns)
+        end
+      end
+
+      alias :render_partial_without_array_support :render_partial
+      alias :render_partial :render_template_with_partial_with_array_support
+    end
+
+    @array = ['Alice', 'Bob']
+    assigns[:array] = @array
+  end
+
+  after(:each) do
+    module ActionView::Partials
+      alias :render_template_with_partial_with_array_support :render_partial
+      alias :render_partial :render_partial_without_array_support
+      undef render_template_with_partial_with_array_support
+    end
+  end
+
+  it "should render have the array passed through to render_partial without modification" do
+    render "view_spec/template_with_partial_with_array" 
+    response.body.should match(/^Array Partial$/)
+  end
+end
+
+describe "Different types of renders (not :template)", :behaviour_type => :view do
+  it "should render partial with local" do
+    render :partial => "view_spec/partial_with_local_variable", :locals => {:x => "Ender"}
+    response.should have_tag('div', :content => "Ender")
+  end
+end
+
+describe "A view", :behaviour_type => :view do
+  before(:each) do
+    session[:key] = "session"
+    params[:key] = "params"
+    flash[:key] = "flash"
+    render "view_spec/accessor"
+  end
+
+  it "should have access to session data" do
+    response.should have_tag("div#session", "session")
+  end
+
+  specify "should have access to params data" do
+    response.should have_tag("div#params", "params")
+  end
+
+  it "should have access to flash data" do
+    response.should have_tag("div#flash", "flash")
+  end
+end
+
+describe "A view with a form_tag", :behaviour_type => :view do
+  it "should render the right action" do
+    render "view_spec/entry_form"
+    response.should have_tag("form[action=?]","/view_spec/entry_form")
+  end
+end
+
+describe "An instantiated ViewExampleController", :behaviour_type => :view do
+  before do
+    render "view_spec/foo/show"
+  end
+  
+  it "should return the name of the real controller that it replaces" do
+    @controller.controller_name.should == 'foo'
+  end
+  
+  it "should return the path of the real controller that it replaces" do
+    @controller.controller_path.should == 'view_spec/foo'
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_controller_rescue_action_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_controller_rescue_action_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_controller_rescue_action_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_controller_rescue_action_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,54 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module ActionController
+  describe "Rescue", "#rescue_action in default mode" do
+    before(:each) do
+      @fixture = Object.new
+      @fixture.extend ActionController::Rescue
+      class << @fixture
+        public :rescue_action
+      end
+    end
+
+    it "should raise the passed in exception so examples fail fast" do
+      proc {@fixture.rescue_action(RuntimeError.new("Foobar"))}.should raise_error(RuntimeError, "Foobar")
+    end
+  end
+
+  class RescueOverriddenController < ActionController::Base
+    def rescue_action(error)
+      "successfully overridden"
+    end
+  end
+
+  describe "Rescue", "#rescue_action, when overridden" do
+    before(:each) do
+      @fixture = RescueOverriddenController.new
+    end
+
+    it "should do whatever the overridden method does" do
+      @fixture.rescue_action(RuntimeError.new("Foobar")).should == "successfully overridden"
+    end
+  end
+
+  class SearchController < ActionController::Base
+  end
+
+  describe "Rescue", "#rescue_action when told to use rails error handling" do
+    before(:each) do
+      @controller = SearchController.new
+      @controller.use_rails_error_handling!
+      class << @controller
+        public :rescue_action
+      end
+    end
+
+    it "should use Rails exception handling" do
+      exception = RuntimeError.new("The Error")
+      exception.stub!(:backtrace).and_return(caller)
+      @controller.should_receive(:rescue_action_locally).with(exception)
+
+      @controller.rescue_action(exception)
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/extensions/action_view_base_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec/mocks/errors'
+
+describe ActionView::Base, "with RSpec extensions", :behaviour_type => :view do  
+  it "should not raise when render has been received" do
+    template.expect_render(:partial => "name")
+    template.render :partial => "name"
+  end
+  
+  it "should raise when render has NOT been received" do
+    template.expect_render(:partial => "name")
+    lambda {
+      template.verify_rendered
+    }.should raise_error
+  end
+  
+  it "should not raise when stubbing and render has been received" do
+    template.stub_render(:partial => "name")
+    template.render :partial => "name"
+  end
+  
+  it "should not raise when stubbing and render has NOT been received" do
+    template.stub_render(:partial => "name")
+  end
+  
+  it "should not raise when stubbing and render has been received with different options" do
+    template.stub_render(:partial => "name")
+    template.render :partial => "view_spec/spacer"
+  end
+
+  it "should not raise when stubbing and expecting and render has been received" do
+    template.stub_render(:partial => "name")
+    template.expect_render(:partial => "name")
+    template.render(:partial => "name")
+  end
+  
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/extensions/active_record_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+class Thing < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+describe "A model" do
+  it "should tell you its required fields" do
+    Thing.new.should have(1).error_on(:name)
+  end
+  
+  it "should tell you how many records it has" do
+    Thing.should have(:no).records
+    Thing.create(:name => "THE THING")
+    Thing.should have(1).record
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/assert_select_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,783 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+# assert_select plugins for Rails
+#
+# Copyright (c) 2006 Assaf Arkin, under Creative Commons Attribution and/or MIT License
+# Developed for http://co.mments.com
+# Code and documention: http://labnotes.org
+
+class AssertSelectController < ActionController::Base
+
+  def response=(content)
+    @content = content
+  end
+
+  #NOTE - this is commented because response is implemented in lib/spec/rails/context/controller
+  # def response(&block)
+  #   @update = block
+  # end
+  # 
+  def html()
+    render :text=>@content, :layout=>false, :content_type=>Mime::HTML
+    @content = nil
+  end
+
+  def rjs()
+    update = @update
+    render :update do |page|
+      update.call page
+    end
+    @update = nil
+  end
+
+  def xml()
+    render :text=>@content, :layout=>false, :content_type=>Mime::XML
+    @content = nil
+  end
+
+  def rescue_action(e)
+    raise e
+  end
+
+end
+
+class AssertSelectMailer < ActionMailer::Base
+
+  def test(html)
+    recipients "test <test@test.host>"
+    from "test@test.host"
+    subject "Test e-mail"
+    part :content_type=>"text/html", :body=>html
+  end
+
+end
+
+module AssertSelectSpecHelpers
+  def render_html(html)
+    @controller.response = html
+    get :html
+  end
+
+  def render_rjs(&block)
+    clear_response
+    @controller.response &block
+    get :rjs
+  end
+
+  def render_xml(xml)
+    @controller.response = xml
+    get :xml
+  end
+  
+  def first_non_rspec_line_in_backtrace_of(error)
+    rspec_path = File.join('rspec', 'lib', 'spec')
+    error.backtrace.reject { |line|
+      line =~ /#{rspec_path}/
+    }.first
+  end
+
+  private
+    # necessary for 1.2.1
+    def clear_response
+      render_html("")
+    end
+end
+
+unless defined?(SpecFailed)
+  SpecFailed = Spec::Expectations::ExpectationNotMetError 
+end
+
+describe "should have_tag", :behaviour_type => :controller do
+  include AssertSelectSpecHelpers
+  controller_name :assert_select
+  integrate_views
+
+  it "should find specific numbers of elements" do
+    render_html %Q{<div id="1"></div><div id="2"></div>}
+    response.should have_tag( "div" )
+    response.should have_tag("div", 2)
+    lambda { response.should_not have_tag("div") }.should raise_error(SpecFailed, "should not have tag(\"div\"), but did")
+
+    lambda { response.should have_tag("div", 3) }.should raise_error(SpecFailed)
+    lambda { response.should have_tag("p") }.should raise_error(SpecFailed)
+  end
+
+  it "should expect to find elements when using true" do
+    render_html %Q{<div id="1"></div><div id="2"></div>}
+    response.should have_tag( "div", true )
+    lambda { response.should have_tag( "p", true )}.should raise_error(SpecFailed)
+  end
+
+  it "should expect to not find elements when using false" do
+    render_html %Q{<div id="1"></div><div id="2"></div>}
+    response.should have_tag( "p", false )
+    lambda { response.should have_tag( "div", false )}.should raise_error(SpecFailed)
+  end
+
+
+  it "should match submitted text using text or regexp" do
+    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
+    response.should have_tag("div", "foo")
+    response.should have_tag("div", /(foo|bar)/)
+    response.should have_tag("div", :text=>"foo")
+    response.should have_tag("div", :text=>/(foo|bar)/)
+
+    lambda { response.should have_tag("div", "bar") }.should raise_error(SpecFailed)
+    lambda { response.should have_tag("div", :text=>"bar") }.should raise_error(SpecFailed)
+    lambda { response.should have_tag("p", :text=>"foo") }.should raise_error(SpecFailed)
+
+    lambda { response.should have_tag("div", /foobar/) }.should raise_error(SpecFailed)
+    lambda { response.should have_tag("div", :text=>/foobar/) }.should raise_error(SpecFailed)
+    lambda { response.should have_tag("p", :text=>/foo/) }.should raise_error(SpecFailed)
+  end
+  
+  it "should use submitted message" do
+    render_html %Q{nothing here}
+    lambda {
+      response.should have_tag("div", {}, "custom message")
+    }.should raise_error(SpecFailed, /custom message/)
+  end
+
+  it "should match submitted html" do
+    render_html %Q{<p>\n<em>"This is <strong>not</strong> a big problem,"</em> he said.\n</p>}
+    text = "\"This is not a big problem,\" he said."
+    html = "<em>\"This is <strong>not</strong> a big problem,\"</em> he said."
+    response.should have_tag("p", text)
+    lambda { response.should have_tag("p", html) }.should raise_error(SpecFailed)
+    response.should have_tag("p", :html=>html)
+    lambda { response.should have_tag("p", :html=>text) }.should raise_error(SpecFailed)
+
+    # # No stripping for pre.
+    render_html %Q{<pre>\n<em>"This is <strong>not</strong> a big problem,"</em> he said.\n</pre>}
+    text = "\n\"This is not a big problem,\" he said.\n"
+    html = "\n<em>\"This is <strong>not</strong> a big problem,\"</em> he said.\n"
+    response.should have_tag("pre", text)
+    lambda { response.should have_tag("pre", html) }.should raise_error(SpecFailed)
+    response.should have_tag("pre", :html=>html)
+    lambda { response.should have_tag("pre", :html=>text) }.should raise_error(SpecFailed)
+  end
+
+  it "should match number of instances" do
+    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
+    response.should have_tag("div", 2)
+    lambda { response.should have_tag("div", 3) }.should raise_error(SpecFailed)
+    response.should have_tag("div", 1..2)
+    lambda { response.should have_tag("div", 3..4) }.should raise_error(SpecFailed)
+    response.should have_tag("div", :count=>2)
+    lambda { response.should have_tag("div", :count=>3) }.should raise_error(SpecFailed)
+    response.should have_tag("div", :minimum=>1)
+    response.should have_tag("div", :minimum=>2)
+    lambda { response.should have_tag("div", :minimum=>3) }.should raise_error(SpecFailed)
+    response.should have_tag("div", :maximum=>2)
+    response.should have_tag("div", :maximum=>3)
+    lambda { response.should have_tag("div", :maximum=>1) }.should raise_error(SpecFailed)
+    response.should have_tag("div", :minimum=>1, :maximum=>2)
+    lambda { response.should have_tag("div", :minimum=>3, :maximum=>4) }.should raise_error(SpecFailed)
+  end
+
+  it "substitution values" do
+    render_html %Q{<div id="1">foo</div><div id="2">foo</div><span id="3"></span>}
+    response.should have_tag("div#?", /\d+/) do |elements| #using do/end
+      elements.size.should == 2
+    end
+    response.should have_tag("div#?", /\d+/) { |elements| #using {}
+      elements.size.should == 2
+    }
+    lambda {
+      response.should have_tag("div#?", /\d+/) do |elements|
+        elements.size.should == 3
+      end
+    }.should raise_error(SpecFailed, "expected: 3,\n     got: 2 (using ==)")
+    
+    lambda {
+      response.should have_tag("div#?", /\d+/) { |elements|
+        elements.size.should == 3
+      }
+    }.should raise_error(SpecFailed, "expected: 3,\n     got: 2 (using ==)")
+
+    response.should have_tag("div#?", /\d+/) do |elements|
+      elements.size.should == 2
+      with_tag("#1")
+      with_tag("#2")
+      without_tag("#3")
+    end 
+  end
+  
+  #added for RSpec
+  it "nested tags in form" do
+    render_html %Q{
+      <form action="test">
+        <input type="text" name="email">
+      </form>
+      <form action="other">
+        <input type="text" name="other_input">
+      </form>
+    }
+    response.should have_tag("form[action=test]") { |form|
+      with_tag("input[type=text][name=email]")
+    }
+    response.should have_tag("form[action=test]") { |form|
+      with_tag("input[type=text][name=email]")
+    }
+    
+    lambda {
+      response.should have_tag("form[action=test]") { |form|
+        with_tag("input[type=text][name=other_input]")
+      }
+    }.should raise_error(SpecFailed)
+    
+    lambda {
+      response.should have_tag("form[action=test]") {
+        with_tag("input[type=text][name=other_input]")
+      }
+    }.should raise_error(SpecFailed)
+  end
+  
+  it "should report the correct line number for a nested failed expectation" do
+    render_html %Q{
+      <form action="test">
+        <input type="text" name="email">
+      </form>
+    }
+    begin
+      response.should have_tag("form[action=test]") {
+        @expected_error_line = __LINE__; should have_tag("input[type=text][name=other_input]")
+      }
+    rescue => e
+      first_non_rspec_line_in_backtrace_of(e).should =~ 
+        /#{File.basename(__FILE__)}:#{@expected_error_line}/
+    else
+      fail
+    end
+  end
+
+  it "should report the correct line number for a nested raised exception" do
+    render_html %Q{
+      <form action="test">
+        <input type="text" name="email">
+      </form>
+    }
+    begin
+      response.should have_tag("form[action=test]") {
+        @expected_error_line = __LINE__; raise "Failed!"
+      }
+    rescue => e
+      first_non_rspec_line_in_backtrace_of(e).should =~ 
+        /#{File.basename(__FILE__)}:#{@expected_error_line}/
+    else
+      fail
+    end
+  end
+
+  it "should report the correct line number for a nested failed test/unit assertion" do
+    pending "Doesn't work at the moment. Do we want to support this?" do
+      render_html %Q{
+        <form action="test">
+          <input type="text" name="email">
+        </form>
+      }
+      begin
+        response.should have_tag("form[action=test]") {
+          @expected_error_line = __LINE__; assert false
+        }
+      rescue => e
+        first_non_rspec_line_in_backtrace_of(e).should =~
+          /#{File.basename(__FILE__)}:#{@expected_error_line}/
+      else
+        fail
+      end
+    end
+  end
+
+  
+  it "beatles" do
+    unless defined?(BEATLES)
+      BEATLES = [
+        ["John", "Guitar"],
+        ["George", "Guitar"],
+        ["Paul", "Bass"],
+        ["Ringo", "Drums"]
+      ]
+    end
+
+    render_html %Q{
+      <div id="beatles">
+        <div class="beatle">
+          <h2>John</h2><p>Guitar</p>
+        </div>
+        <div class="beatle">
+          <h2>George</h2><p>Guitar</p>
+        </div>
+        <div class="beatle">
+          <h2>Paul</h2><p>Bass</p>
+        </div>
+        <div class="beatle">
+          <h2>Ringo</h2><p>Drums</p>
+        </div>
+      </div>          
+    }
+    response.should have_tag("div#beatles>div[class=\"beatle\"]", 4)
+
+    response.should have_tag("div#beatles>div.beatle") {
+      BEATLES.each { |name, instrument|
+        with_tag("div.beatle>h2", name)
+        with_tag("div.beatle>p", instrument)
+        without_tag("div.beatle>span")
+      }
+    }
+  end
+
+  it "assert_select_text_match" do
+    render_html %Q{<div id="1"><span>foo</span></div><div id="2"><span>bar</span></div>}
+    response.should have_tag("div") do |divs|
+      with_tag("div", "foo")
+      with_tag("div", "bar")
+      with_tag("div", /\w*/)
+      with_tag("div", /\w*/, :count=>2)
+      without_tag("div", :text=>"foo", :count=>2)
+      with_tag("div", :html=>"<span>bar</span>")
+      with_tag("div", :html=>"<span>bar</span>")
+      with_tag("div", :html=>/\w*/)
+      with_tag("div", :html=>/\w*/, :count=>2)
+      without_tag("div", :html=>"<span>foo</span>", :count=>2)
+    end
+  end
+
+
+  it "assert_select_from_rjs with one item" do
+    render_rjs do |page|
+      page.replace_html "test", "<div id=\"1\">foo</div>\n<div id=\"2\">foo</div>"
+    end
+    response.should have_tag("div") { |elements|
+      elements.size.should == 2
+      with_tag("#1")
+      with_tag("#2")
+    }
+    
+    lambda {
+      response.should have_tag("div") { |elements|
+        elements.size.should == 2
+        with_tag("#1")
+        with_tag("#3")
+      }
+    }.should raise_error(SpecFailed)
+
+    lambda {
+      response.should have_tag("div") { |elements|
+        elements.size.should == 2
+        with_tag("#1")
+        without_tag("#2")
+      }
+    }.should raise_error(SpecFailed, "should not have tag(\"#2\"), but did")
+
+    lambda {
+      response.should have_tag("div") { |elements|
+        elements.size.should == 3
+        with_tag("#1")
+        with_tag("#2")
+      }
+    }.should raise_error(SpecFailed)
+
+
+    response.should have_tag("div#?", /\d+/) { |elements|
+      with_tag("#1")
+      with_tag("#2")
+    }
+  end
+  
+  it "assert_select_from_rjs with multiple items" do
+    render_rjs do |page|
+      page.replace_html "test", "<div id=\"1\">foo</div>"
+      page.replace_html "test2", "<div id=\"2\">foo</div>"
+    end
+    response.should have_tag("div")
+    response.should have_tag("div") { |elements|
+      elements.size.should == 2
+      with_tag("#1")
+      with_tag("#2")
+    }
+
+    lambda {
+      response.should have_tag("div") { |elements|
+        with_tag("#3")
+      }
+    }.should raise_error(SpecFailed)
+  end
+end
+
+describe "css_select", :behaviour_type => :controller do
+  include AssertSelectSpecHelpers
+  controller_name :assert_select
+  integrate_views
+
+  it "can select tags from html" do
+    render_html %Q{<div id="1"></div><div id="2"></div>}
+    css_select("div").size.should == 2
+    css_select("p").size.should == 0
+  end
+
+
+  it "can select nested tags from html" do
+    render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
+    response.should have_tag("div#?", /\d+/) { |elements|
+      css_select(elements[0], "div").should have(1).element
+      css_select(elements[1], "div").should have(1).element
+    }
+    response.should have_tag("div") {
+      css_select("div").should have(2).elements
+      css_select("div").each { |element|
+        # Testing as a group is one thing
+        css_select("#1,#2").should have(2).elements
+        # Testing individually is another
+        css_select("#1").should have(1).element
+        css_select("#2").should have(1).element
+      }
+    }
+  end
+
+  it "can select nested tags from rjs (one result)" do
+    render_rjs do |page|
+      page.replace_html "test", "<div id=\"1\">foo</div>\n<div id=\"2\">foo</div>"
+    end
+    css_select("div").should have(2).elements
+    css_select("#1").should have(1).element
+    css_select("#2").should have(1).element
+  end
+
+  it "can select nested tags from rjs (two results)" do
+    render_rjs do |page|
+      page.replace_html "test", "<div id=\"1\">foo</div>"
+      page.replace_html "test2", "<div id=\"2\">foo</div>"
+    end
+    css_select("div").should have(2).elements
+    css_select("#1").should have(1).element
+    css_select("#2").should have(1).element
+  end
+  
+end
+
+describe "have_rjs behaviour", :behaviour_type => :controller do
+  include AssertSelectSpecHelpers
+  controller_name :assert_select
+  integrate_views
+
+  before(:each) do
+    render_rjs do |page|
+      page.replace "test1", "<div id=\"1\">foo</div>"
+      page.replace_html "test2", "<div id=\"2\">bar</div><div id=\"3\">none</div>"
+      page.insert_html :top, "test3", "<div id=\"4\">loopy</div>"
+      page.hide "test4"
+      page["test5"].hide
+    end
+  end
+  
+  it "should pass if any rjs exists" do
+    response.should have_rjs
+  end
+  
+  it "should fail if no rjs exists" do
+    render_rjs do |page|
+    end
+    lambda do
+      response.should have_rjs
+    end.should raise_error(SpecFailed)
+  end
+  
+  it "should find all rjs from multiple statements" do
+    response.should have_rjs do
+      with_tag("#1")
+      with_tag("#2")
+      with_tag("#3")
+      # with_tag("#4")
+      # with_tag("#5")
+    end
+  end
+
+  it "should find by id" do
+    response.should have_rjs("test1") { |rjs|
+      rjs.size.should == 1
+      with_tag("div", 1)
+      with_tag("div#1", "foo")
+    }
+    
+    lambda do
+      response.should have_rjs("test1") { |rjs|
+        rjs.size.should == 1
+        without_tag("div#1", "foo")
+      }
+    end.should raise_error(SpecFailed, "should not have tag(\"div#1\", \"foo\"), but did")
+
+    response.should have_rjs("test2") { |rjs|
+      rjs.size.should == 2
+      with_tag("div", 2)
+      with_tag("div#2", "bar")
+      with_tag("div#3", "none")
+    }
+    # response.should have_rjs("test4")
+    # response.should have_rjs("test5")
+  end
+  
+  # specify "should find rjs using :hide" do
+  #   response.should have_rjs(:hide)
+  #   response.should have_rjs(:hide, "test4")
+  #   response.should have_rjs(:hide, "test5")
+  #   lambda do
+  #     response.should have_rjs(:hide, "test3")
+  #   end.should raise_error(SpecFailed)
+  # end
+
+  it "should find rjs using :replace" do
+    response.should have_rjs(:replace) { |rjs|
+      with_tag("div", 1)
+      with_tag("div#1", "foo")
+    }
+    response.should have_rjs(:replace, "test1") { |rjs|
+      with_tag("div", 1)
+      with_tag("div#1", "foo")
+    }
+    lambda {
+      response.should have_rjs(:replace, "test2")
+    }.should raise_error(SpecFailed)
+
+    lambda {
+      response.should have_rjs(:replace, "test3")
+    }.should raise_error(SpecFailed)
+  end
+
+  it "should find rjs using :replace_html" do
+    response.should have_rjs(:replace_html) { |rjs|
+      with_tag("div", 2)
+      with_tag("div#2", "bar")
+      with_tag("div#3", "none")
+    }
+
+    response.should have_rjs(:replace_html, "test2") { |rjs|
+      with_tag("div", 2)
+      with_tag("div#2", "bar")
+      with_tag("div#3", "none")
+    }
+
+    lambda {
+      response.should have_rjs(:replace_html, "test1")
+    }.should raise_error(SpecFailed)
+
+    lambda {
+      response.should have_rjs(:replace_html, "test3")
+    }.should raise_error(SpecFailed)
+  end
+    
+  it "should find rjs using :insert_html (non-positioned)" do
+    response.should have_rjs(:insert_html) { |rjs|
+      with_tag("div", 1)
+      with_tag("div#4", "loopy")
+    }
+
+    response.should have_rjs(:insert_html, "test3") { |rjs|
+      with_tag("div", 1)
+      with_tag("div#4", "loopy")
+    }
+
+    lambda {
+      response.should have_rjs(:insert_html, "test1")
+    }.should raise_error(SpecFailed)
+
+    lambda {
+      response.should have_rjs(:insert_html, "test2")
+    }.should raise_error(SpecFailed)
+  end
+
+  it "should find rjs using :insert (positioned)" do
+    render_rjs do |page|
+      page.insert_html :top, "test1", "<div id=\"1\">foo</div>"
+      page.insert_html :bottom, "test2", "<div id=\"2\">bar</div>"
+      page.insert_html :before, "test3", "<div id=\"3\">none</div>"
+      page.insert_html :after, "test4", "<div id=\"4\">loopy</div>"
+    end
+    response.should have_rjs(:insert, :top) do
+      with_tag("div", 1)
+      with_tag("#1")
+    end
+    response.should have_rjs(:insert, :top, "test1") do
+      with_tag("div", 1)
+      with_tag("#1")
+    end
+    lambda {
+      response.should have_rjs(:insert, :top, "test2")
+    }.should raise_error(SpecFailed)
+    response.should have_rjs(:insert, :bottom) {|rjs|
+      with_tag("div", 1)
+      with_tag("#2")
+    }
+    response.should have_rjs(:insert, :bottom, "test2") {|rjs|
+      with_tag("div", 1)
+      with_tag("#2")
+    }
+    response.should have_rjs(:insert, :before) {|rjs|
+      with_tag("div", 1)
+      with_tag("#3")
+    }
+    response.should have_rjs(:insert, :before, "test3") {|rjs|
+      with_tag("div", 1)
+      with_tag("#3")
+    }
+    response.should have_rjs(:insert, :after) {|rjs|
+      with_tag("div", 1)
+      with_tag("#4")
+    }
+    response.should have_rjs(:insert, :after, "test4") {|rjs|
+      with_tag("div", 1)
+      with_tag("#4")
+    }
+  end
+end
+
+describe "send_email behaviour", :behaviour_type => :controller do
+  include AssertSelectSpecHelpers
+  controller_name :assert_select
+  integrate_views
+
+  before(:each) do
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.perform_deliveries = true
+    ActionMailer::Base.deliveries = []
+  end
+
+  after(:each) do
+    ActionMailer::Base.deliveries.clear
+  end
+
+  it "should fail with nothing sent" do
+    response.should_not send_email
+    lambda {
+      response.should send_email{}
+    }.should raise_error(SpecFailed, /No e-mail in delivery list./)
+  end
+  
+  it "should pass otherwise" do
+    AssertSelectMailer.deliver_test "<div><p>foo</p><p>bar</p></div>"
+    response.should send_email
+    lambda {
+      response.should_not send_email
+    }.should raise_error(SpecFailed)
+    response.should send_email{}
+    response.should send_email {
+      with_tag("div:root") {
+        with_tag("p:first-child", "foo")
+        with_tag("p:last-child", "bar")
+      }
+    }
+    
+    lambda {
+      response.should_not send_email
+    }.should raise_error(SpecFailed, "should not send email, but did")
+  end
+
+end
+
+# describe "An rjs call to :visual_effect, a 'should have_rjs' spec with",
+#   :behaviour_type => :view do
+#     
+#   before do
+#     render 'rjs_spec/visual_effect'
+#   end
+# 
+#   it "should pass with the correct element name" do
+#     response.should have_rjs(:effect, :fade, 'mydiv')
+#   end
+#   
+#   it "should fail the wrong element name" do
+#     lambda {
+#       response.should have_rjs(:effect, :fade, 'wrongname')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+#   it "should fail with the correct element but the wrong command" do
+#     lambda {
+#       response.should have_rjs(:effect, :puff, 'mydiv')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+# end
+#   
+# describe "An rjs call to :visual_effect for a toggle, a 'should have_rjs' spec with",
+#   :behaviour_type => :view do
+#     
+#   before do
+#     render 'rjs_spec/visual_toggle_effect'
+#   end
+#   
+#   it "should pass with the correct element name" do
+#     response.should have_rjs(:effect, :toggle_blind, 'mydiv')
+#   end
+#   
+#   it "should fail with the wrong element name" do
+#     lambda {
+#       response.should have_rjs(:effect, :toggle_blind, 'wrongname')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+#   it "should fail the correct element but the wrong command" do
+#     lambda {
+#       response.should have_rjs(:effect, :puff, 'mydiv')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+# end
+
+describe "string.should have_tag", :behaviour_type => :helper do
+  include AssertSelectSpecHelpers
+
+  it "should find root element" do
+    "<p>a paragraph</p>".should have_tag("p", "a paragraph")
+  end
+
+  it "should not find non-existent element" do
+    lambda do
+      "<p>a paragraph</p>".should have_tag("p", "wrong text")
+    end.should raise_error(SpecFailed)
+  end
+
+  it "should find child element" do
+    "<div><p>a paragraph</p></div>".should have_tag("p", "a paragraph")
+  end
+
+  it "should find nested element" do
+    "<div><p>a paragraph</p></div>".should have_tag("div") do
+      with_tag("p", "a paragraph")
+    end
+  end
+
+  it "should not find wrong nested element" do
+    lambda do
+      "<div><p>a paragraph</p></div>".should have_tag("div") do
+        with_tag("p", "wrong text")
+      end
+    end.should raise_error(SpecFailed)
+  end
+end
+
+describe "have_tag", :behaviour_type => :controller do
+  include AssertSelectSpecHelpers
+  controller_name :assert_select
+  integrate_views
+
+  it "should work exactly the same as assert_select" do
+    render_html %Q{
+      <div id="wrapper">foo
+        <div class="piece">
+          <h3>Text</h3>
+        </div>
+        <div class="piece">
+          <h3>Another</h3>
+        </div>      
+      </div>
+    }
+
+    assert_select "#wrapper .piece h3", :text => "Text"
+    assert_select "#wrapper .piece h3", :text => "Another"
+
+    response.should have_tag("#wrapper .piece h3", :text => "Text")
+    response.should have_tag("#wrapper .piece h3", :text => "Another")
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/description_generation_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+class DescriptionGenerationSpecController < ActionController::Base
+  def render_action
+  end
+
+  def redirect_action
+    redirect_to :action => :render_action
+  end
+end
+
+describe "Description generation", :behaviour_type => :controller do
+  controller_name :description_generation_spec
+  before(:each) do
+    Spec::Matchers.clear_generated_description
+  end
+
+  after(:each) do
+    Spec::Matchers.clear_generated_description
+  end
+
+  it "should generate description for render_template" do
+    get 'render_action'
+    response.should render_template("render_action")
+    Spec::Matchers.generated_description.should == "should render template \"render_action\""
+  end
+
+  it "should generate description for render_template with full path" do
+    get 'render_action'
+    response.should render_template("description_generation_spec/render_action")
+    Spec::Matchers.generated_description.should == "should render template \"description_generation_spec/render_action\""
+  end
+
+  it "should generate description for redirect_to" do
+    get 'redirect_action'
+    response.should redirect_to("http://test.host/description_generation_spec/render_action")
+    Spec::Matchers.generated_description.should == "should redirect to \"http://test.host/description_generation_spec/render_action\""
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/errors_on_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "error_on" do
+  it "should provide a message including the name of what the error is on" do
+    have(1).error_on(:whatever).description.should == "should have 1 error on :whatever"
+  end
+end
+
+describe "errors_on" do
+  it "should provide a message including the name of what the error is on" do
+    have(2).errors_on(:whatever).description.should == "should have 2 errors on :whatever"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/redirect_to_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,203 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+['isolation','integration'].each do |mode|
+  describe "redirect_to behaviour", :behaviour_type => :controller do
+    if mode == 'integration'
+      integrate_views
+    end
+    controller_name :redirect_spec
+  
+    it "redirected to another action" do
+      get 'action_with_redirect_to_somewhere'
+      response.should redirect_to(:action => 'somewhere')
+    end
+    
+    it "redirected to another controller and action" do
+      get 'action_with_redirect_to_other_somewhere'
+      response.should redirect_to(:controller => 'render_spec', :action => 'text_action')
+    end
+    
+    it "redirected to another action (with 'and return')" do
+      get 'action_with_redirect_to_somewhere_and_return'
+      response.should redirect_to(:action => 'somewhere')
+    end
+  
+    it "redirected to correct path with leading /" do
+      get 'action_with_redirect_to_somewhere'
+      response.should redirect_to('/redirect_spec/somewhere')
+    end
+    
+    it "redirected to correct path without leading /" do
+      get 'action_with_redirect_to_somewhere'
+      response.should redirect_to('redirect_spec/somewhere')
+    end
+    
+    it "redirected to correct internal URL" do
+      get 'action_with_redirect_to_somewhere'
+      response.should redirect_to("http://test.host/redirect_spec/somewhere")
+    end
+  
+    it "redirected to correct external URL" do
+      get 'action_with_redirect_to_rspec_site'
+      response.should redirect_to("http://rspec.rubyforge.org")
+    end
+  
+    it "redirected :back" do
+      request.env['HTTP_REFERER'] = "http://test.host/previous/page"
+      get 'action_with_redirect_back'
+      response.should redirect_to(:back)
+    end
+  
+    it "redirected :back and should redirect_to URL matches" do
+      request.env['HTTP_REFERER'] = "http://test.host/previous/page"
+      get 'action_with_redirect_back'
+      response.should redirect_to("http://test.host/previous/page")
+    end
+    
+    it "redirected from within a respond_to block" do
+      get 'action_with_redirect_in_respond_to'
+      response.should redirect_to('redirect_spec/somewhere')
+    end
+
+    params_as_hash = {:action => "somewhere", :id => 1111, :param1 => "value1", :param2 => "value2"}
+
+    it "redirected to an internal URL containing a query string" do
+      get "action_with_redirect_which_creates_query_string"
+      response.should redirect_to(params_as_hash)
+    end
+
+    it "redirected to an internal URL containing a query string, one way it might be generated" do
+      get "action_with_redirect_with_query_string_order1"
+      response.should redirect_to(params_as_hash)
+    end
+
+    it "redirected to an internal URL containing a query string, another way it might be generated" do
+      get "action_with_redirect_with_query_string_order2"
+      response.should redirect_to(params_as_hash)
+    end
+
+    it "redirected to an internal URL which is unroutable but matched via a string" do
+      get "action_with_redirect_to_unroutable_url_inside_app"
+      response.should redirect_to("http://test.host/nonexistant/none")
+    end
+
+  end
+
+  
+  describe "redirect_to with a controller spec in #{mode} mode and a custom request.host", :behaviour_type => :controller do
+    if mode == 'integration'
+      integrate_views
+    end
+    controller_name :redirect_spec
+    before do
+      request.host = "some.custom.host"
+    end
+  
+    it "should pass when redirected to another action" do
+      get 'action_with_redirect_to_somewhere'
+      response.should redirect_to(:action => 'somewhere')
+    end
+  end
+  
+  describe "Given a controller spec in #{mode} mode", :behaviour_type => :controller do
+    if mode == 'integration'
+      integrate_views
+    end
+    controller_name :redirect_spec
+  
+    it "an action that redirects should not result in an error if no should redirect_to expectation is called" do
+      get 'action_with_redirect_to_somewhere'
+    end
+    
+    it "an action that redirects should not result in an error if should_not redirect_to expectation was called, but not to that action" do
+      get 'action_with_redirect_to_somewhere'
+      response.should_not redirect_to(:action => 'another_destination')
+    end
+
+    it "an action that redirects should result in an error if should_not redirect_to expectation was called to that action" do
+      get 'action_with_redirect_to_somewhere'
+      lambda {
+        response.should_not redirect_to(:action => 'somewhere')
+      }.should fail_with("expected not to be redirected to {:action=>\"somewhere\"}, but was")
+    end
+
+    it "an action that does not redirects should not result in an error if should_not redirect_to expectation was called" do
+      get 'action_with_no_redirect'
+      response.should_not redirect_to(:action => 'any_destination')
+    end
+
+    
+  end
+  
+  describe "Given a controller spec in #{mode} mode, should redirect_to should fail when", :behaviour_type => :controller do
+    if mode == 'integration'
+      integrate_views
+    end
+    controller_name :redirect_spec
+    
+    it "redirected to wrong action" do
+      get 'action_with_redirect_to_somewhere'
+      lambda {
+        response.should redirect_to(:action => 'somewhere_else')
+      }.should fail_with("expected redirect to {:action=>\"somewhere_else\"}, got redirect to \"http://test.host/redirect_spec/somewhere\"")
+    end
+    
+    it "redirected to incorrect path with leading /" do
+      get 'action_with_redirect_to_somewhere'
+      lambda {
+        response.should redirect_to('/redirect_spec/somewhere_else')
+      }.should fail_with('expected redirect to "/redirect_spec/somewhere_else", got redirect to "http://test.host/redirect_spec/somewhere"')
+    end
+  
+    it "redirected to incorrect path without leading /" do
+      get 'action_with_redirect_to_somewhere'
+      lambda {
+        response.should redirect_to('redirect_spec/somewhere_else')
+      }.should fail_with('expected redirect to "redirect_spec/somewhere_else", got redirect to "http://test.host/redirect_spec/somewhere"')
+    end
+  
+    it "redirected to incorrect internal URL (based on the action)" do
+      get 'action_with_redirect_to_somewhere'
+      lambda {
+        response.should redirect_to("http://test.host/redirect_spec/somewhere_else")
+      }.should fail_with('expected redirect to "http://test.host/redirect_spec/somewhere_else", got redirect to "http://test.host/redirect_spec/somewhere"')
+    end
+    
+    it "redirected to wrong external URL" do
+      get 'action_with_redirect_to_rspec_site'
+      lambda {
+        response.should redirect_to("http://test.unit.rubyforge.org")
+      }.should fail_with('expected redirect to "http://test.unit.rubyforge.org", got redirect to "http://rspec.rubyforge.org"')
+    end
+  
+    it "redirected to incorrect internal URL (based on the directory path)" do
+      get 'action_with_redirect_to_somewhere'
+      lambda {
+        response.should redirect_to("http://test.host/non_existent_controller/somewhere")
+      }.should fail_with('expected redirect to "http://test.host/non_existent_controller/somewhere", got redirect to "http://test.host/redirect_spec/somewhere"')
+    end
+  
+    it "expected redirect :back, but redirected to a new URL" do
+      get 'action_with_no_redirect'
+      lambda {
+        response.should redirect_to(:back)
+      }.should fail_with('expected redirect to :back, got no redirect')
+    end
+  
+    it "no redirect at all" do
+      get 'action_with_no_redirect'
+      lambda {
+        response.should redirect_to(:action => 'nowhere')
+      }.should fail_with("expected redirect to {:action=>\"nowhere\"}, got no redirect")
+    end
+  
+    it "redirected to an internal URL which is unroutable and matched via a hash" do
+      get "action_with_redirect_to_unroutable_url_inside_app"
+      route = {:controller => "nonexistant", :action => "none"}
+      lambda {
+        response.should redirect_to(route)
+      }.should raise_error(ActionController::RoutingError, /(no route found to match|No route matches) \"\/nonexistant\/none\" with \{\}/)
+    end
+
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/matchers/render_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,131 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+['isolation','integration'].each do |mode|
+  describe "response.should render_template (in #{mode} mode)",
+    :behaviour_type => :controller do
+    controller_name :render_spec
+    if mode == 'integration'
+      integrate_views
+    end
+    
+    it "should match a simple path" do
+      post 'some_action'
+      response.should render_template('some_action')
+    end
+
+    it "should match a less simple path" do
+      post 'some_action'
+      response.should render_template('render_spec/some_action')
+    end
+  
+    it "should match a less simple path to another controller" do
+      post 'action_which_renders_template_from_other_controller'
+      response.should render_template('controller_spec/action_with_template')
+    end
+  
+    it "should match a symbol" do
+      post 'some_action'
+      response.should render_template(:some_action)
+    end
+
+    it "should match an rjs template" do
+      xhr :post, 'some_action'
+      if ActionView::Base.const_defined?('DEFAULT_TEMPLATE_HANDLER_PREFERENCE')
+        response.should render_template('render_spec/some_action')
+      else
+        response.should render_template('render_spec/some_action.rjs')
+      end
+    end
+
+    it "should match a partial template (simple path)" do
+      get 'action_with_partial'
+      response.should render_template("_a_partial")
+    end
+
+    it "should match a partial template (complex path)" do
+      get 'action_with_partial'
+      response.should render_template("render_spec/_a_partial")
+    end
+
+    it "should fail when the wrong template is rendered" do
+      post 'some_action'
+      lambda do
+        response.should render_template('non_existent_template')
+      end.should fail_with("expected \"non_existent_template\", got \"render_spec/some_action\"")
+    end
+
+    it "should fail without full path when template is associated with a different controller" do
+      post 'action_which_renders_template_from_other_controller'
+      lambda do
+        response.should render_template('action_with_template')
+      end.should fail_with(%Q|expected "action_with_template", got "controller_spec/action_with_template"|)
+    end
+
+    it "should fail with incorrect full path when template is associated with a different controller" do
+      post 'action_which_renders_template_from_other_controller'
+      lambda do
+        response.should render_template('render_spec/action_with_template')
+      end.should fail_with(%Q|expected "render_spec/action_with_template", got "controller_spec/action_with_template"|)
+    end
+
+    it "should fail on the wrong extension (given rhtml)" do
+      get 'some_action'
+      lambda {
+        response.should render_template('render_spec/some_action.rjs')
+      }.should fail_with("expected \"render_spec/some_action.rjs\", got \"render_spec/some_action\"")
+    end
+
+    it "should fail when TEXT is rendered" do
+      post 'text_action'
+      lambda do
+        response.should render_template('some_action')
+      end.should fail_with("expected \"some_action\", got nil")
+    end
+  end
+
+  describe "response.should have_text (in #{mode} mode)",
+    :behaviour_type => :controller do
+    controller_name :render_spec
+    if mode == 'integration'
+      integrate_views
+    end
+
+    it "should pass with exactly matching text" do
+      post 'text_action'
+      response.should have_text("this is the text for this action")
+    end
+
+    it "should pass with matching text (using Regexp)" do
+      post 'text_action'
+      response.should have_text(/is the text/)
+    end
+
+    it "should fail with matching text" do
+      post 'text_action'
+      lambda {
+        response.should have_text("this is NOT the text for this action")
+      }.should fail_with("expected \"this is NOT the text for this action\", got \"this is the text for this action\"")
+    end
+
+    it "should fail when a template is rendered" do
+      post 'some_action'
+      lambda {
+        response.should have_text("this is the text for this action")
+      }.should fail_with(/expected \"this is the text for this action\", got .*/)
+    end
+  end
+
+  describe "response.should_not have_text (in #{mode} mode)",
+    :behaviour_type => :controller do
+    controller_name :render_spec
+    if mode == 'integration'
+      integrate_views
+    end
+
+    it "should pass with exactly matching text" do
+      post 'text_action'
+      response.should_not have_text("the accordian guy")
+    end
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/mocks/mock_model_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,65 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+class MockableModel < ActiveRecord::Base
+  has_one :associated_model
+end
+
+class SubMockableModel < MockableModel
+end
+
+class AssociatedModel < ActiveRecord::Base
+  belongs_to :mockable_model
+end
+
+describe "mock_model", :behaviour_type => :view do
+  before(:each) do
+    @model = mock_model(SubMockableModel)
+  end
+  it "should say it is_a? if it is" do
+    @model.is_a?(SubMockableModel).should be(true)
+  end
+  it "should say it is_a? if it's ancestor is" do
+    @model.is_a?(MockableModel).should be(true)
+  end
+  it "should say it is kind_of? if it is" do
+    @model.kind_of?(SubMockableModel).should be(true)
+  end
+  it "should say it is kind_of? if it's ancestor is" do
+    @model.kind_of?(MockableModel).should be(true)
+  end
+  it "should say it is instance_of? if it is" do
+    @model.instance_of?(SubMockableModel).should be(true)
+  end
+  it "should not say it instance_of? if it isn't, even if it's ancestor is" do
+    @model.instance_of?(MockableModel).should be(false)
+  end
+end
+
+describe "mock_model with null_object", :behaviour_type => :view do
+  before(:each) do
+    @model = mock_model(MockableModel, :null_object => true, :mocked_method => "mocked")
+  end
+  
+  it "should be able to mock methods" do
+    @model.mocked_method.should == "mocked"
+  end
+  it "should return itself to unmocked methods" do
+    @model.unmocked_method.should equal(@model)
+  end
+end
+
+describe "mock_model as association", :behaviour_type => :view do
+  before(:each) do
+    @real = AssociatedModel.create!
+    @mock_model = mock_model(MockableModel)
+    @real.mockable_model = @mock_model
+  end
+  
+  it "should pass associated_model == mock" do
+      @mock_model.should == @real.mockable_model
+  end
+
+  it "should pass mock == associated_model" do
+      @real.mockable_model.should == @mock_model
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/sample_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "A sample spec" do
+  it "should pass" do
+    true.should === true
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/spec_server_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,89 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "script/spec_server file", :shared => true do
+  attr_accessor :tmbundle_install_directory
+
+  after do
+    system "kill -9 #{@pid}"
+  end
+
+  it "runs a spec" do
+    dir = File.dirname(__FILE__)
+    output = ""
+    Timeout.timeout(10) do
+      loop do
+        output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb --drb 2>&1`
+        break unless output.include?("No server is running")
+      end
+    end
+
+    unless $?.exitstatus == 0
+      flunk "command 'script/spec spec/sample_spec' failed\n#{output}"
+    end
+  end
+
+  def start_spec_server
+    create_spec_server_pid_file
+    start_spec_server_process
+  end
+
+  def create_spec_server_pid_file
+    current_dir = File.dirname(__FILE__)
+    pid_dir = "#{Dir.tmpdir}/#{Time.now.to_i}"
+    @spec_server_pid_file = "#{pid_dir}/spec_server.pid"
+    FileUtils.mkdir_p pid_dir
+    system "touch #{@spec_server_pid_file}"
+    @rspec_path = File.expand_path("#{current_dir}/../../../rspec/lib")
+  end
+
+  def start_spec_server_process
+    dir = File.dirname(__FILE__)
+    spec_server_cmd =  %Q|export HOME=#{Dir.tmpdir}; |
+    spec_server_cmd << %Q|ruby -e 'system("echo " + Process.pid.to_s + " > #{@spec_server_pid_file}"); |
+    spec_server_cmd << %Q|$LOAD_PATH.unshift("#{@rspec_path}"); require "spec"; |
+    spec_server_cmd << %Q|load "#{RAILS_ROOT}/script/spec_server"' &|
+    system spec_server_cmd
+
+    file_content = ""
+    Timeout.timeout(5) do
+      loop do
+        file_content = File.read(@spec_server_pid_file)
+        break unless file_content.blank?
+      end
+    end
+    @pid = Integer(File.read(@spec_server_pid_file))
+  end
+end
+
+describe "script/spec_server file without TextMate bundle" do
+  it_should_behave_like "script/spec_server file"
+  before do
+    start_spec_server
+  end
+end
+
+describe "script/spec_server file with TextMate bundle" do
+  it_should_behave_like "script/spec_server file"
+  before do
+    dir = File.dirname(__FILE__)
+    @tmbundle_install_directory = File.expand_path("#{Dir.tmpdir}/Library/Application Support/TextMate/Bundles")
+    @bundle_name = "RSpec.tmbundle"
+    FileUtils.mkdir_p(tmbundle_install_directory)
+    bundle_dir = File.expand_path("#{dir}/../../../../../../#{@bundle_name}")
+    File.directory?(bundle_dir).should be_true
+    unless system(%Q|ln -s #{bundle_dir} "#{tmbundle_install_directory}"|)
+      raise "Creating link to Textmate Bundle"
+    end
+    start_spec_server
+  end
+
+  after do
+    bundle_file_to_remove = "#{tmbundle_install_directory}/#{@bundle_name}"
+    if bundle_file_to_remove == "/"
+      raise "bundle file path resolved to '/' - could not call rm"
+    end
+    unless system(%Q|rm "#{bundle_file_to_remove}"|)
+      raise "Removing Textmate bundle link failed"
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/spec_spec.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/spec_spec.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails/spec_spec.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails/spec_spec.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "script/spec file" do
+  it "should run a spec" do
+    dir = File.dirname(__FILE__)
+    output = `#{RAILS_ROOT}/script/spec #{dir}/sample_spec.rb`
+    unless $?.exitstatus == 0
+      flunk "command 'script/spec spec/sample_spec' failed\n#{output}"
+    end
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails_suite.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails_suite.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/rails_suite.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/rails_suite.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+dir = File.dirname(__FILE__)
+Dir["#{dir}/**/*_example.rb"].each do |file|
+  require file
+end
+Dir["#{dir}/**/*_spec.rb"].each do |file|
+  require file
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/spec_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec/spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec/spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.expand_path("#{dir}/../../../../../rspec/lib"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/controllers"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/../spec_resources/helpers"))
+require File.expand_path("#{dir}/../../../../spec/spec_helper")
+require File.expand_path("#{dir}/../spec_resources/controllers/render_spec_controller")
+require File.expand_path("#{dir}/../spec_resources/controllers/rjs_spec_controller")
+require File.expand_path("#{dir}/../spec_resources/controllers/redirect_spec_controller")
+require File.expand_path("#{dir}/../spec_resources/controllers/action_view_base_spec_controller")
+require File.expand_path("#{dir}/../spec_resources/helpers/explicit_helper")
+require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper")
+require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper")
+require File.expand_path("#{dir}/../spec_resources/helpers/plugin_application_helper")
+
+if Rails::VERSION::MINOR >= 2
+  ActionController::Routing.controller_paths << "#{dir}/../spec_resources/controllers"
+end
+
+module Spec
+  module Rails
+    module Example
+      class ViewExampleController
+        set_view_path File.join(File.dirname(__FILE__), "..", "spec_resources", "views")
+      end
+    end
+  end
+end
+
+def fail()
+  raise_error(Spec::Expectations::ExpectationNotMetError)
+end
+  
+def fail_with(message)
+  raise_error(Spec::Expectations::ExpectationNotMetError,message)
+end
+
+class Proc
+  def should_pass
+    lambda { self.call }.should_not raise_error
+  end
+end
+
+ActionController::Routing::Routes.draw do |map|
+  map.resources :rspec_on_rails_specs
+  map.connect 'custom_route', :controller => 'custom_route_spec', :action => 'custom_route'
+  map.connect ":controller/:action/:id"
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/action_view_base_spec_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/action_view_base_spec_controller.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/action_view_base_spec_controller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/action_view_base_spec_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+class ActionViewBaseSpecController < ActionController::Base
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/controller_spec_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,48 @@
+class ControllerSpecController < ActionController::Base
+  if ['edge','2.0.0'].include?(ENV['RSPEC_RAILS_VERSION'])
+    set_view_path [File.join(File.dirname(__FILE__), "..", "views")]
+  else
+    set_view_path File.join(File.dirname(__FILE__), "..", "views")
+  end
+  
+  def some_action
+    render :template => "template/that/does/not/actually/exist"
+  end
+  
+  def action_with_template
+    session[:session_key] = "session value"
+    flash[:flash_key] = "flash value"
+    render :template => "controller_spec/action_with_template"
+  end
+  
+  def action_with_partial
+    render :partial => "controller_spec/partial"
+  end
+  
+  def action_with_partial_with_object
+    render :partial => "controller_spec/partial", :object => params[:thing]
+  end
+  
+  def action_with_partial_with_locals
+    render :partial => "controller_spec/partial", :locals => {:thing => params[:thing]}
+  end
+  
+  def action_with_errors_in_template
+    render :template => "controller_spec/action_with_errors_in_template"
+  end
+
+  def action_setting_the_assigns_hash
+    assigns['direct_assigns_key'] = :direct_assigns_key_value
+  end
+
+  def action_setting_flash_after_session_reset
+    reset_session
+    flash[:after_reset] = "available"
+  end
+  
+  def action_setting_flash_before_session_reset
+    flash[:before_reset] = 'available'
+    reset_session
+  end
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/redirect_spec_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,59 @@
+class RedirectSpecController < ApplicationController
+
+  def action_with_no_redirect
+    render :text => "this is just here to keep this from causing a MissingTemplate error"
+  end
+  
+  def action_with_redirect_to_somewhere
+    redirect_to :action => 'somewhere'
+  end
+  
+  def action_with_redirect_to_other_somewhere
+    redirect_to :controller => 'render_spec', :action => 'text_action'
+  end
+  
+  def action_with_redirect_to_somewhere_and_return
+    redirect_to :action => 'somewhere' and return
+    render :text => "this is after the return"
+  end
+  
+  def somewhere
+    render :text => "this is just here to keep this from causing a MissingTemplate error"
+  end
+  
+  def action_with_redirect_to_rspec_site
+    redirect_to "http://rspec.rubyforge.org"
+  end
+  
+  def action_with_redirect_back
+    redirect_to :back
+  end
+  
+  def action_with_redirect_in_respond_to
+    respond_to do |wants|
+      wants.html { redirect_to :action => 'somewhere' }
+    end
+  end
+
+  def action_with_redirect_which_creates_query_string
+    redirect_to :action => "somewhere", :id => 1111, :param1 => "value1", :param2 => "value2"
+  end
+
+  # note: sometimes this is the URL which rails will generate from the hash in
+  # action_with_redirect_which_creates_query_string
+  def action_with_redirect_with_query_string_order1
+    redirect_to "http://test.host/redirect_spec/somewhere/1111?param1=value1&param2=value2"
+  end
+
+  # note: sometimes this is the URL which rails will generate from the hash in
+  # action_with_redirect_which_creates_query_string
+  def action_with_redirect_with_query_string_order2
+    redirect_to "http://test.host/redirect_spec/somewhere/1111?param2=value2&param1=value1"
+  end
+
+  def action_with_redirect_to_unroutable_url_inside_app
+    redirect_to :controller => "nonexistant", :action => "none"
+  end
+
+end
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/render_spec_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+class RenderSpecController < ApplicationController
+  set_view_path File.join(File.dirname(__FILE__), "..", "views")
+  
+  def some_action
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+  
+  def action_which_renders_template_from_other_controller
+    render :template => 'controller_spec/action_with_template'
+  end
+  
+  def text_action
+    render :text => "this is the text for this action"
+  end
+  
+  def action_with_partial
+    render :partial => "a_partial"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/controllers/rjs_spec_controller.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,58 @@
+class RjsSpecController < ApplicationController
+  set_view_path File.join(File.dirname(__FILE__), "..", "views")
+  
+  def replace_html
+  end
+  
+  def insert_html
+  end
+  
+  def replace
+  end
+  
+  def hide_div
+  end
+  
+  def hide_page_element
+  end
+
+  def replace_html_with_partial
+  end
+
+  def render_replace_html
+    render :update do |page|
+      page.replace_html 'mydiv', 'replacement text'
+      page.replace_html 'myotherdiv', 'other replacement text'
+    end
+  end
+  
+  def render_replace_html_with_partial
+    render :update do |page|
+      page.replace_html 'mydiv', :partial => 'rjs_spec/replacement_partial'
+    end
+  end
+  
+  def render_insert_html
+    render :update do |page|
+      page.insert_html 'mydiv', 'replacement text'
+    end
+  end
+  
+  def render_replace
+    render :update do |page|
+      page.replace 'mydiv', 'replacement text'
+    end
+  end
+  
+  def render_hide_div
+    render :update do |page|
+      page.hide 'mydiv'
+    end
+  end
+  
+  def render_hide_page_element
+    render :update do |page|
+      page['mydiv'].hide
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/explicit_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,10 @@
+module ExplicitHelper
+  def method_in_explicit_helper
+    "<div>This is text from a method in the ExplicitHelper</div>"
+  end
+  
+  # this is an example of a method spec'able with eval_erb in helper specs
+  def prepend(arg, &block)
+    concat(arg, block.binding) + block.call
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/more_explicit_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/more_explicit_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/more_explicit_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/more_explicit_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+module MoreExplicitHelper
+  def method_in_more_explicit_helper
+    "<div>This is text from a method in the MoreExplicitHelper</div>"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/plugin_application_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/plugin_application_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/plugin_application_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/plugin_application_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,6 @@
+# Methods added to this helper will be available to all templates in the application.
+module ApplicationHelper
+  def method_in_plugin_application_helper
+    "<div>This is text from a method in the ApplicationHelper</div>"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/view_spec_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/view_spec_helper.rb
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/helpers/view_spec_helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/helpers/view_spec_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+module ViewSpecHelper
+  def method_in_helper
+    "<div>This is text from a method in the ViewSpecHelper</div>"
+  end
+
+  def method_in_template_with_partial
+    "<div>method_in_template_with_partial in ViewSpecHelper</div>"
+  end
+
+  def method_in_partial
+    "<div>method_in_partial in ViewSpecHelper</div>"
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<% raise %>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_template.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_template.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_template.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_template.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<div>This is action_with_template.rhtml</div>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.js.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.js.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.js.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.js.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+# This is used for rails > 1.2.3
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+# This is used for rails <= 1.2.3
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+This is the text in the replacement partial.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_div.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_div.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_div.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_div.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.hide 'mydiv'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_page_element.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_page_element.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_page_element.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_page_element.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page['mydiv'].hide
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/insert_html.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/insert_html.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/insert_html.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/insert_html.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.insert_html 'mydiv', 'replacement text'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.replace 'mydiv', 'replacement text'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.replace_html 'mydiv', 'replacement text'
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.replace_html 'mydiv', :partial => 'rjs_spec/replacement_partial'
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_effect.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_effect.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_effect.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_effect.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.visual_effect :fade, 'mydiv'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+page.visual_effect :toggle_blind, 'mydiv'
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/no_tags.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/no_tags.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/no_tags.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/no_tags.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<!-THIS FILE HAS NO TAGS->
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<div></div>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<div key="value"></div>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_partial %>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<div><%= x %></div>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<%= render :partial => 'partial', :object => partial %>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_spacer.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_spacer.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_spacer.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_spacer.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<hr id="spacer" />
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+<div id="session"><%= session[:key] %></div>
+<div id="params"><%= params[:key] %></div>
+<div id="flash"><%= flash[:key] %></div>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/entry_form.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/entry_form.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/entry_form.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/entry_form.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+<% form_tag do %>
+<% end %>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/explicit_helper.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/explicit_helper.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/explicit_helper.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/explicit_helper.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_explicit_helper %>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/foo/show.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/foo/show.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/foo/show.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/foo/show.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<%= method_in_plugin_application_helper %>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/implicit_helper.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/implicit_helper.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/implicit_helper.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/implicit_helper.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_helper %>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/multiple_helpers.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/multiple_helpers.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/multiple_helpers.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/multiple_helpers.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_explicit_helper %>
+<%= method_in_more_explicit_helper %>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+<%= method_in_template_with_partial %>
+<%= render :partial => 'partial' %>
+
+<%= render :partial => 'partial_used_twice' %>
+<%= render :partial => 'partial_used_twice' %>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+<%= render :partial => 'partial',
+           :collection => ['Alice', 'Bob'],
+           :spacer_template => 'spacer' %>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1 @@
+<%= render :partial => @array %>
diff -Nur mephisto-0.7.3/vendor/plugins/rspec_on_rails/tasks/rspec.rake technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/tasks/rspec.rake
--- mephisto-0.7.3/vendor/plugins/rspec_on_rails/tasks/rspec.rake	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/rspec_on_rails/tasks/rspec.rake	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,135 @@
+# In rails 1.2, plugins aren't available in the path until they're loaded.
+# Check to see if the rspec plugin is installed first and require
+# it if it is.  If not, use the gem version.
+rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../rspec/lib')
+$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+require 'spec/rake/spectask'
+require 'spec/translator'
+
+spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
+
+task :default => :spec
+task :stats => "spec:statsetup"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
+  end
+  
+  desc "Print Specdoc for all specs (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+
+  desc "Print Specdoc for all plugin specs"
+  Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  end
+
+  [:models, :controllers, :views, :helpers, :lib].each do |sub|
+    desc "Run the specs under spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+    end
+  end
+  
+  desc "Run the specs under vendor/plugins (except RSpec's own)"
+  Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec_on_rails/*")
+  end
+  
+  namespace :plugins do
+    desc "Runs the examples for rspec_on_rails"
+    Spec::Rake::SpecTask.new(:rspec_on_rails => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList['vendor/plugins/rspec_on_rails/spec/**/*_spec.rb']
+    end
+  end
+
+  desc "Translate/upgrade specs using the built-in translator"
+  task :translate do
+    translator = ::Spec::Translator.new
+    dir = RAILS_ROOT + '/spec'
+    translator.translate(dir, dir)
+  end
+
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers)
+    ::CodeStatistics::TEST_TYPES << "Model specs"
+    ::CodeStatistics::TEST_TYPES << "View specs"
+    ::CodeStatistics::TEST_TYPES << "Controller specs"
+    ::CodeStatistics::TEST_TYPES << "Helper specs"
+    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+  end
+
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+
+  namespace :server do
+    daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
+
+    desc "start spec_server."
+    task :start do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts "spec_server is already running."
+      else
+        $stderr.puts "Starting up spec server."
+        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
+      end
+    end
+
+    desc "stop spec_server."
+    task :stop do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Shutting down spec_server."
+        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+        File.delete(daemonized_server_pid)
+      end
+    end
+
+    desc "reload spec_server."
+    task :restart do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Reloading down spec_server."
+        system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/simply_bdd/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_bdd/README
--- mephisto-0.7.3/vendor/plugins/simply_bdd/README	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_bdd/README	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-SimplyBdd
-=========
-
-Allows you to use context and specify macros for creating TestCase classes
-
-context "New User" do
-  def setup
-    @user = User.new
-  end
-
-  specify "should be invalid without a username" do
-    assert !@user.valid?
-    @user.username = 'someusername'
-    assert_valid @user
-  end
-end
-
-This (dynamically) generates a class like:
-
-class NewUserTest < Test::Unit::TestCase
-  def setup
-    @user = User.new
-  end
-  
-  def test_should_be_invalid_without_a_username
-    assert !@user.valid?
-    @user.username = 'someusername'
-    assert_valid @user
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_bdd/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_bdd/Rakefile
--- mephisto-0.7.3/vendor/plugins/simply_bdd/Rakefile	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_bdd/Rakefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the simply_bdd plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the simply_bdd plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SimplyBdd'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
diff -Nur mephisto-0.7.3/vendor/plugins/simply_bdd/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_bdd/init.rb
--- mephisto-0.7.3/vendor/plugins/simply_bdd/init.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_bdd/init.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-if RAILS_ENV == 'test'
-  Object.class_eval do
-    def context(name, &block)
-      # create class first so it has a name before evaling the block.  this is so fixtures work correctly.
-      returning self.class.const_set(self.class.convert_bdd_name(name).camelize + 'Test', Class.new(Test::Unit::TestCase)) do |klass|
-        klass.class_eval &block
-      end
-    end
-    
-    def self.convert_bdd_name(name)
-      name.to_s.gsub(/[^\w ]+/, '').gsub(/ +/, '_')
-    end
-  end
-
-  class << Test::Unit::TestCase
-    def specify(name, &block)
-      define_method 'test_' + convert_bdd_name(name), &block
-    end
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/CHANGELOG technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/CHANGELOG
--- mephisto-0.7.3/vendor/plugins/simply_helpful/CHANGELOG	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/CHANGELOG	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+* Added formatted_polymorphic_url, formatted_polymorphic_path
+
+* Added support for route options. Example:
+
+    polymorphic_url(:id => @subject, :anchor => "photo")
+
+* Added polymorphic routes for new and edit actions (new_polymorphic_url, edit_polymorphic_url)
+
+* Moved polymorphic routes from SimplyHelpful::RecordIdentifier to SimplyHelpful::PolymorphicRoutes
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/init.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/init.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,2 +1,4 @@
 require 'simply_helpful'
-ActionController::Base.helper(SimplyHelpful::RecordIdentificationHelper, SimplyHelpful::RecordTagHelper)
\ No newline at end of file
+ActionController::Base.send :include, SimplyHelpful::RecordIdentificationHelper
+ActionController::Base.helper SimplyHelpful::RecordIdentificationHelper,
+                              SimplyHelpful::RecordTagHelper
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/controller_extensions.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/controller_extensions.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/controller_extensions.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/controller_extensions.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+module SimplyHelpful
+  module ActionControllerExtensions
+    POLYMORPHIC_ROUTES = %w(
+      polymorphic_url polymorphic_path
+      edit_polymorphic_url edit_polymorphic_path
+      new_polymorphic_url new_polymorphic_path
+      formatted_polymorphic_url formatted_polymorphic_path
+     )
+    
+    def self.included(base)
+      POLYMORPHIC_ROUTES.each { |route| base.helper_method(route) }
+    end
+
+    POLYMORPHIC_ROUTES.each do |route|
+      module_eval <<-EOT
+        def #{route}(record)
+          SimplyHelpful::PolymorphicRoutes.#{route}(record, self)
+        end
+      EOT
+    end
+    
+    def redirect_to_with_record_identification(*args)
+      return redirect_to_without_record_identification *args unless args.size == 1
+      
+      potential_object = args.first
+
+      case potential_object
+      when String, Symbol, Hash
+        redirect_to_without_record_identification *args
+      else
+        redirect_to_without_record_identification SimplyHelpful::PolymorphicRoutes.polymorphic_url(potential_object, self)
+      end
+    end
+  end
+end
+
+module ActionController
+  class Base
+    include SimplyHelpful::ActionControllerExtensions
+    alias_method_chain :redirect_to, :record_identification
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/form_helper_extensions.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/form_helper_extensions.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/form_helper_extensions.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/form_helper_extensions.rb	2008-03-31 02:18:56.000000000 -0400
@@ -18,7 +18,7 @@
           
               object_name = SimplyHelpful::RecordIdentifier.singular_class_name(name_or_object)
               object      = name_or_object
-              url         = SimplyHelpful::RecordIdentifier.named_route(object, self)
+              url         = SimplyHelpful::PolymorphicRoutes.polymorphic_url(object, self)
           
               html_options = if object.new_record?
                 { :class  => dom_class(object, :new),  :id => dom_id(object), :method => :post }
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/polymorphic_routes.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/polymorphic_routes.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/polymorphic_routes.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/polymorphic_routes.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+module SimplyHelpful
+  module PolymorphicRoutes
+    extend self
+
+    def polymorphic_url(record_or_hash, url_writer, options = {})
+      record = extract_record(record_or_hash)
+
+      case
+      when options[:action] == "new"
+        url_writer.send(action_prefix(options) + RecordIdentifier.singular_class_name(record) + routing_type(options))
+
+      when record.new_record?
+        url_writer.send(RecordIdentifier.plural_class_name(record) + routing_type(options))
+
+      else
+        url_writer.send(
+          action_prefix(options) + RecordIdentifier.singular_class_name(record) + routing_type(options), record_or_hash
+        )
+      end
+    end
+
+    def polymorphic_path(record_or_hash, url_writer)
+      polymorphic_url(record_or_hash, url_writer, :routing_type => :path)
+    end
+
+    %w( edit new formatted ).each do |action|
+      module_eval <<-EOT
+        def #{action}_polymorphic_url(record_or_hash, url_writer)
+          polymorphic_url(record_or_hash, url_writer, :action => "#{action}")
+        end
+
+        def #{action}_polymorphic_path(record_or_hash, url_writer)
+          polymorphic_url(record_or_hash, url_writer, :action => "#{action}", :routing_type => :path)
+        end
+      EOT
+    end
+
+
+    private
+      def action_prefix(options)
+        options[:action] ? "#{options[:action]}_" : ""
+      end
+      
+      def routing_type(options)
+        "_#{options[:routing_type] || "url"}"
+      end
+      
+      def extract_record(record_or_hash)
+        record_or_hash.is_a?(Hash) ? record_or_hash[:id] : record_or_hash
+      end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/record_identification_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/record_identification_helper.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/record_identification_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/record_identification_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,15 +1,16 @@
 module SimplyHelpful
   module RecordIdentificationHelper
-    def partial_path(*args, &block)
-      RecordIdentifier.partial_path(*args, &block)
-    end
-    
-    def dom_class(*args, &block)
-      RecordIdentifier.dom_class(*args, &block)
-    end
+    protected
+      def partial_path(*args, &block)
+        RecordIdentifier.partial_path(*args, &block)
+      end
 
-    def dom_id(*args, &block)
-      RecordIdentifier.dom_id(*args, &block)
-    end
+      def dom_class(*args, &block)
+        RecordIdentifier.dom_class(*args, &block)
+      end
+
+      def dom_id(*args, &block)
+        RecordIdentifier.dom_id(*args, &block)
+      end
   end
-end
\ No newline at end of file
+end
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/record_identifier.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/record_identifier.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/record_identifier.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/record_identifier.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,12 +2,6 @@
   module RecordIdentifier
     extend self
 
-    def named_route(record, url_writer)
-      record.new_record? ? 
-        url_writer.send(plural_class_name(record)   + "_url") : 
-        url_writer.send(singular_class_name(record) + "_url", record)
-    end
-
     def partial_path(record_or_class)
       klass = class_from_record_or_class(record_or_class)
       "#{klass.name.tableize}/#{klass.name.demodulize.underscore}"
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/record_tag_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/record_tag_helper.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful/record_tag_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful/record_tag_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,9 +1,55 @@
 module SimplyHelpful
   module RecordTagHelper
+    # Produces a wrapper DIV element with id and class parameters that
+    # relate to the specified ActiveRecord object. Usage example:
+    #
+    #    <% div_for(@person, :class => "foo") do %>
+    #       <%=h @person.name %>
+    #    <% end %>
+    #
+    # produces:
+    #
+    #    <div id="person_123" class="person foo"> Joe Bloggs </div>
+    #
     def div_for(record, *args, &block)
+      content_tag_for(:div, record, *args, &block)
+    end
+    
+    # content_tag_for creates an HTML element with id and class parameters
+    # that relate to the specified ActiveRecord object. For example:
+    #
+    #    <% content_tag_for(:tr, @person) do %>
+    #      <td><%=h @person.first_name %></td>
+    #      <td><%=h @person.last_name %></td>
+    #    <% end %>
+    #
+    # would produce hthe following HTML (assuming @person is an instance of
+    # a Person object, with an id value of 123):
+    #
+    #    <tr id="person_123" class="person">....</tr>
+    #
+    # If you require the HTML id attribute to have a prefix, you can specify it:
+    #
+    #    <% content_tag_for(:tr, @person, :foo) do %> ...
+    #
+    # produces:
+    #    
+    #    <tr id="foo_person_123" class="person">...
+    #
+    # content_tag_for also accepts a hash of options, which will be converted to
+    # additional HTML attributes. If you specify a +:class+ value, it will be combined
+    # with the default class name for your object. For example:
+    #
+    #    <% content_tag_for(:li, @person, :class => "bar") %>...
+    #
+    # produces:
+    #
+    #    <li id="person_123" class="person bar">...
+    #
+    def content_tag_for(tag_name, record, *args, &block)
       prefix  = args.first.is_a?(Hash) ? nil : args.shift
       options = args.first.is_a?(Hash) ? args.shift : {}
-      concat content_tag(:div, capture(&block), 
+      concat content_tag(tag_name, capture(&block), 
         options.merge({ :class => "#{dom_class(record)} #{options[:class]}".strip, :id => dom_id(record, prefix) })), 
         block.binding
     end
@@ -18,8 +64,9 @@
           when Hash, String, Symbol, NilClass
             link_to_without_record_identification(attr_name, record, html_options, *parameters_for_method_reference)
           else
-            url = SimplyHelpful::RecordIdentifier.named_route(record, self)
-            link_to_without_record_identification(record.send(attr_name), url, html_options, *parameters_for_method_reference)
+            url = SimplyHelpful::PolymorphicRoutes.polymorphic_url(record, self)
+            link_text = record.respond_to?(attr_name) ? record.send(attr_name) : attr_name
+            link_to_without_record_identification(link_text, url, html_options, *parameters_for_method_reference)
         end
       end
       
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/lib/simply_helpful.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/lib/simply_helpful.rb	2008-03-31 02:18:56.000000000 -0400
@@ -2,6 +2,9 @@
 require 'simply_helpful/record_identifier'
 require 'simply_helpful/record_tag_helper'
 
+require 'simply_helpful/polymorphic_routes'
+
 require 'simply_helpful/jsg_extensions'
 require 'simply_helpful/av_extensions'
-require 'simply_helpful/form_helper_extensions'
\ No newline at end of file
+require 'simply_helpful/form_helper_extensions'
+require 'simply_helpful/controller_extensions'
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/test/controller_extensions_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/controller_extensions_test.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/test/controller_extensions_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/controller_extensions_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'ostruct'
+
+class RedirectionTestingController < ActionController::Base
+  class MockResponse
+    attr_accessor :redirected_to
+    
+    def redirect(_)
+    end
+    
+  end
+  
+  def initialize
+    super
+    @response = MockResponse.new
+    @request = OpenStruct.new
+    @request.protocol= "http://"
+    @request.host_with_port= "www.example.com"
+  end
+
+  def response
+    @response
+  end
+  
+  def request
+    @request
+  end
+  
+  def post_url(p)
+    "/posts/#{p.id}"
+  end
+  
+
+end
+
+class ControllerExtensionsTest < Test::Unit::TestCase
+  def setup
+    @record = Post.new
+    @record.save
+    @controller = RedirectionTestingController.new
+  end
+  
+  def test_redirect_to_record
+    @controller.send :redirect_to, @record
+    assert_equal "http://www.example.com/posts/1", @controller.response.redirected_to
+  end
+  
+  def test_redirect_to_string
+    @controller.send :redirect_to, "http://www.yahoo.com"
+    assert_equal "http://www.yahoo.com", @controller.response.redirected_to
+  end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/test/form_helper_extensions_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/form_helper_extensions_test.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/test/form_helper_extensions_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/form_helper_extensions_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -65,7 +65,7 @@
     _erbout = ''
     form_for(@record) {}
     
-    expected = "<form action='#{post_url(@record)}' class='edit_post' id='edit_post_1' method='post'><input type='hidden' name='_method' value='put' /></form>"
+    expected = "<form action='#{post_url(@record)}' class='edit_post' id='edit_post_1' method='post'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>"
     assert_dom_equal expected, _erbout
   end
 
@@ -90,7 +90,7 @@
     _erbout = ''
     remote_form_for(@record) {}
     
-    expected = %(<form action='#{post_url(@record)}' onsubmit="new Ajax.Request('#{post_url(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_post' id='edit_post_1' method='post'><input type='hidden' name='_method' value='put' /></form>)
+    expected = %(<form action='#{post_url(@record)}' id='edit_post_1' method='post' onsubmit="new Ajax.Request('#{post_url(@record)}', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;" class='edit_post'><div style='margin:0;padding:0'><input name='_method' type='hidden' value='put' /></div></form>)
     assert_dom_equal expected, _erbout
   end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/test/record_identifier_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/record_identifier_test.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/test/record_identifier_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/record_identifier_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -77,4 +77,4 @@
     assert_equal expected, partial_path(@record)
     assert_equal expected, partial_path(Post::Nested)
   end
-end
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/simply_helpful/test/record_tag_helper_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/record_tag_helper_test.rb
--- mephisto-0.7.3/vendor/plugins/simply_helpful/test/record_tag_helper_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/simply_helpful/test/record_tag_helper_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -12,6 +12,54 @@
     @record = Post.new
   end
   
+  def test_content_tag_for_with_new_record
+    _erbout = ''
+    content_tag_for(:li, @record) {}
+    
+    expected = "<li class='post' id='new_post'></li>"
+    assert_dom_equal expected, _erbout
+  end
+  
+  def test_content_tag_for_with_existing_record
+    @record.save
+    _erbout = ''
+    content_tag_for(:li, @record) {}
+    
+    expected = "<li class='post' id='post_1'></li>"
+    assert_dom_equal expected, _erbout
+  end
+  
+  def test_content_tag_for_merges_given_class_names
+    _erbout = ''
+    content_tag_for(:li, @record, :class => 'foo') {}
+    
+    expected = "<li class='post foo' id='new_post'></li>"
+    assert_dom_equal expected, _erbout
+
+    _erbout = ''
+    content_tag_for(:li, @record, :class => 'foo bar') {}
+    
+    expected = "<li class='post foo bar' id='new_post'></li>"
+    assert_dom_equal expected, _erbout
+  end
+  
+  def test_content_tag_for_with_dom_id_prefix_on_new_record
+    _erbout = ''
+    content_tag_for(:li, @record, :foo, :class => 'foo') {}
+    
+    expected = "<li class='post foo' id='foo_post'></li>"
+    assert_dom_equal expected, _erbout
+  end
+  
+  def test_content_tag_for_with_dom_id_prefix_on_existing_record
+    @record.save
+    _erbout = ''
+    content_tag_for(:li, @record, :foo, :class => 'foo') {}
+    
+    expected = "<li class='post foo' id='foo_post_1'></li>"
+    assert_dom_equal expected, _erbout
+  end
+  
   def test_div_for_with_new_record
     _erbout = ''
     div_for(@record) {}
@@ -74,4 +122,12 @@
     expected = "<a href='http://www.example.com/posts/1'>post #1</a>"
     assert_dom_equal expected, actual
   end
+  
+  def test_link_to_with_an_existing_method_and_constant_text
+    @record.save
+    actual = link_to "Cancel Editing", @record
+    
+    expected = "<a href='http://www.example.com/posts/1'>Cancel Editing</a>"
+    assert_dom_equal expected, actual
+  end
 end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/white_list/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/white_list/README
--- mephisto-0.7.3/vendor/plugins/white_list/README	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/white_list/README	2008-03-31 02:18:56.000000000 -0400
@@ -10,26 +10,20 @@
 
 You can add or remove tags/attributes if you want to customize it a bit.
 
-add table tags
+Add table tags
   
-  WhiteListHelper.tags += %w(table td th)
+  WhiteListHelper.tags.merge %w(table td th)
 
-remove tags
+Remove tags
   
-  WhiteListHelper.tags -= %w(div span)
+  WhiteListHelper.tags.delete 'div'
 
-clear any attributes that are allowed for <a> tags
+Change allowed attributes
 
-  WhiteListHelper.attributes['a'] = []
+  WhiteListHelper.attributes.merge %w(id class style)
 
-allow a new attribute for the <img> tag
+white_list accepts a block for custom tag escaping.  Shown below is the default block that white_list uses if none is given.
+The block is called for all bad tags, and every text node.  node is an instance of HTML::Node (either HTML::Tag or HTML::Text).  
+bad is nil for text nodes inside good tags, or is the tag name of the bad tag.  
 
-  WhiteListHelper.attributes['img'] += %w(style)
-
-add new tag with attributes
-
-  WhiteListHelper.attributes['table'] = %w(cellpadding cellspacing)
-
-change allowed attributes for all tags
-
-  WhiteListHelper.attributes[nil] = %w(id class style)
\ No newline at end of file
+  <%= white_list(@article.body) { |node, bad| white_listed_bad_tags.include?(bad) ? nil : node.to_s.gsub(/</, '&lt;') } %>
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/white_list/lib/white_list_helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/white_list/lib/white_list_helper.rb
--- mephisto-0.7.3/vendor/plugins/white_list/lib/white_list_helper.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/white_list/lib/white_list_helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -1,61 +1,97 @@
 module WhiteListHelper
-  PROTOCOL_ATTRIBUTES = %w(src href)
-  PROTOCOL_SEPARATOR  = /:|(&#0*58)|(&#x70)|(%|&#37;)3A/
-  mattr_reader :tags, :attributes, :protocols
-  @@tags         = %w(strong em b i p code pre tt output samp kbd var sub sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr acronym)
-  @@attributes   = { 
-    'a'          => %w(href),
-    'img'        => %w(src width height alt), 
-    'blockquote' => %w(cite),
-    'del'        => %w(cite datetime),
-    'ins'        => %w(cite datetime),
-    nil          => %w(title class) }
-  @@protocols    = %w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto feed)
-  tags.push(*attributes.keys).uniq!
+  @@protocol_attributes = Set.new %w(src href)
+  @@protocol_separator  = /:|(&#0*58)|(&#x70)|(%|&#37;)3A/
+  mattr_reader :protocol_attributes, :protocol_separator
 
-  def white_listed_tags
-    ::WhiteListHelper.tags
-  end
-  
-  def white_listed_attributes
-    ::WhiteListHelper.attributes
+  def self.contains_bad_protocols?(white_listed_protocols, value)
+    value =~ protocol_separator && !white_listed_protocols.include?(value.split(protocol_separator).first)
   end
 
-  def white_listed_protocols
-    ::WhiteListHelper.protocols
+  klass = class << self; self; end
+  klass_methods = []
+  inst_methods  = []
+  [:bad_tags, :tags, :attributes, :protocols].each do |attr|
+    # Add class methods to the module itself
+    klass_methods << <<-EOS
+      def #{attr}=(value) @@#{attr} = Set.new(value) end
+      def #{attr}() @@#{attr} end
+    EOS
+    
+    # prefix the instance methods with white_listed_*
+    inst_methods << "def white_listed_#{attr}() ::WhiteListHelper.#{attr} end"
   end
+  
+  klass.class_eval klass_methods.join("\n"), __FILE__, __LINE__
+  class_eval       inst_methods.join("\n"),  __FILE__, __LINE__
 
-  def white_list(html, options = {})
+  # This White Listing helper will html encode all tags and strip all attributes that aren't specifically allowed.  
+  # It also strips href/src tags with invalid protocols, like javascript: especially.  It does its best to counter any
+  # tricks that hackers may use, like throwing in unicode/ascii/hex values to get past the javascript: filters.  Check out
+  # the extensive test suite.
+  #
+  #   <%= white_list @article.body %>
+  # 
+  # You can add or remove tags/attributes if you want to customize it a bit.
+  # 
+  # Add table tags
+  #   
+  #   WhiteListHelper.tags.merge %w(table td th)
+  # 
+  # Remove tags
+  #   
+  #   WhiteListHelper.tags.delete 'div'
+  # 
+  # Change allowed attributes
+  # 
+  #   WhiteListHelper.attributes.merge %w(id class style)
+  # 
+  # white_list accepts a block for custom tag escaping.  Shown below is the default block that white_list uses if none is given.
+  # The block is called for all bad tags, and every text node.  node is an instance of HTML::Node (either HTML::Tag or HTML::Text).  
+  # bad is nil for text nodes inside good tags, or is the tag name of the bad tag.  
+  # 
+  #   <%= white_list(@article.body) { |node, bad| white_listed_bad_tags.include?(bad) ? nil : node.to_s.gsub(/</, '&lt;') } %>
+  #
+  def white_list(html, options = {}, &block)
     return html if html.blank? || !html.include?('<')
-    (options[:attributes] ||= {}).update(white_listed_attributes)
-    (options[:tags]       ||= []).push(*options[:attributes].keys).push(*white_listed_tags).uniq!
+    attrs   = Set.new(options[:attributes]).merge(white_listed_attributes)
+    tags    = Set.new(options[:tags]      ).merge(white_listed_tags)
+    block ||= lambda { |node, bad| white_listed_bad_tags.include?(bad) ? nil : node.to_s.gsub(/</, '&lt;') }
     returning [] do |new_text|
       tokenizer = HTML::Tokenizer.new(html)
-      
+      bad       = nil
       while token = tokenizer.next
         node = HTML::Node.parse(nil, 0, 0, token, false)
         new_text << case node
           when HTML::Tag
-            unless (options[:tags]).include?(node.name)
-              node.to_s.gsub(/</, "&lt;")
-            else
-              if node.closing != :close
-                attributes = (options[:attributes][nil] || []).push(*(options[:attributes][node.name] || []))
-                node.attributes.delete_if do |attr_name, value|
-                  !attributes.include?(attr_name) || (PROTOCOL_ATTRIBUTES.include?(attr_name) && contains_bad_protocols?(value))
-                end if attributes.any?
+            node.attributes.keys.each do |attr_name|
+              value = node.attributes[attr_name].to_s
+              if !attrs.include?(attr_name) || (protocol_attributes.include?(attr_name) && contains_bad_protocols?(value))
+                node.attributes.delete(attr_name)
+              else
+                node.attributes[attr_name] = CGI::escapeHTML(value)
               end
-              node.to_s
+            end if node.attributes
+            if tags.include?(node.name)
+              bad = nil
+              node
+            else
+              bad = node.name
+              block.call node, bad
             end
           else
-            node.to_s.gsub(/</, "&lt;")
+            block.call node, bad
         end
       end
     end.join
   end
   
-  private
+  protected
     def contains_bad_protocols?(value)
-      value =~ PROTOCOL_SEPARATOR && !white_listed_protocols.include?(value.split(PROTOCOL_SEPARATOR).first)
+      WhiteListHelper.contains_bad_protocols?(white_listed_protocols, value)
     end
-end
\ No newline at end of file
+end
+
+WhiteListHelper.bad_tags   = %w(script)
+WhiteListHelper.tags       = %w(strong em b i p code pre tt output samp kbd var sub sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dt dd abbr acronym a img blockquote del ins fieldset legend)
+WhiteListHelper.attributes = %w(href src width height alt cite datetime title class)
+WhiteListHelper.protocols  = %w(ed2k ftp http https irc mailto news gopher nntp telnet webcal xmpp callto feed)
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/white_list/test/white_list_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/white_list/test/white_list_test.rb
--- mephisto-0.7.3/vendor/plugins/white_list/test/white_list_test.rb	2006-11-23 13:57:06.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/white_list/test/white_list_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -5,19 +5,19 @@
   include WhiteListHelper
   public :contains_bad_protocols?
 
-  (WhiteListHelper.tags + WhiteListHelper.attributes.keys).compact.each do |tag_name|
+  WhiteListHelper.tags.each do |tag_name|
     define_method "test_should_allow_#{tag_name}_tag" do
-      assert_white_listed "start <#{tag_name} title=\"1\" name=\"foo\">foo <bad>bar</bad> baz</#{tag_name}> end", "start <#{tag_name} title='1'>foo &lt;bad>bar&lt;/bad> baz</#{tag_name}> end"
+      assert_white_listed "start <#{tag_name} title=\"1\" name=\"foo\">foo <bad>bar</bad> baz</#{tag_name}> end", %(start <#{tag_name} title="1">foo &lt;bad>bar&lt;/bad> baz</#{tag_name}> end)
     end
   end
 
   def test_should_allow_anchors
-    assert_white_listed %(<a href="foo" onclick="bar"><script>baz</script></a>), "<a href='foo'>&lt;script>baz&lt;/script></a>"
+    assert_white_listed %(<a href="foo" onclick="bar"><script>baz</script></a>), %(<a href="foo"></a>)
   end
 
-  WhiteListHelper.attributes['img'].each do |img_attr|
+  %w(src width height alt).each do |img_attr|
     define_method "test_should_allow_image_#{img_attr}_attribute" do
-      assert_white_listed %(<img #{img_attr}="foo" onclick="bar" />), "<img #{img_attr}='foo' />"
+      assert_white_listed %(<img #{img_attr}="foo" onclick="bar" />), %(<img #{img_attr}="foo" />)
     end
   end
 
@@ -36,13 +36,13 @@
   end
 
   def test_should_allow_custom_tags_with_attributes
-    text = "<fieldset foo='bar'>foo</fieldset>"
-    assert_equal(text, white_list(text, :attributes => {'fieldset' => %w(foo)}))
+    text = %(<fieldset foo="bar">foo</fieldset>)
+    assert_equal(text, white_list(text, :attributes => ['foo']))
   end
 
   [%w(img src), %w(a href)].each do |(tag, attr)|
     define_method "test_should_strip_#{attr}_attribute_in_#{tag}_with_bad_protocols" do
-      assert_white_listed %(<#{tag} #{attr}="javascript:bang" title="1">boo</#{tag}>), %(<#{tag} title='1'>boo</#{tag}>)
+      assert_white_listed %(<#{tag} #{attr}="javascript:bang" title="1">boo</#{tag}>), %(<#{tag} title="1">boo</#{tag}>)
     end
   end
 
@@ -64,7 +64,7 @@
   end
 
   def test_should_block_script_tag
-    assert_white_listed %(<SCRIPT\nSRC=http://ha.ckers.org/xss.js></SCRIPT>), "&lt;script src='http:' />&lt;/script>"
+    assert_white_listed %(<SCRIPT\nSRC=http://ha.ckers.org/xss.js></SCRIPT>), ""
   end
 
   [%(<IMG SRC="javascript:alert('XSS');">), 
@@ -92,16 +92,16 @@
   end
   
   def test_should_sanitize_invalid_script_tag
-    assert_white_listed %(<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>), "&lt;script />&lt;/script>"
+    assert_white_listed %(<SCRIPT/XSS SRC="http://ha.ckers.org/xss.js"></SCRIPT>), ""
   end
   
   def test_should_sanitize_script_tag_with_multiple_open_brackets
-    assert_white_listed %(<<SCRIPT>alert("XSS");//<</SCRIPT>), "&lt;&lt;script>alert(\"XSS\");//&lt;&lt;/script>"
-    assert_white_listed %(<iframe src=http://ha.ckers.org/scriptlet.html\n<), "&lt;iframe src='http:' />&lt;"
+    assert_white_listed %(<<SCRIPT>alert("XSS");//<</SCRIPT>), "&lt;"
+    assert_white_listed %(<iframe src=http://ha.ckers.org/scriptlet.html\n<), %(&lt;iframe src="http:" />&lt;)
   end
   
   def test_should_sanitize_unclosed_script
-    assert_white_listed %(<SCRIPT SRC=http://ha.ckers.org/xss.js?<B>), "&lt;script src='http:' /><b>"
+    assert_white_listed %(<SCRIPT SRC=http://ha.ckers.org/xss.js?<B>), "<b>"
   end
   
   def test_should_sanitize_half_open_scripts
@@ -112,7 +112,19 @@
     img_hack = %(<IMG\nSRC\n=\n"\nj\na\nv\na\ns\nc\nr\ni\np\nt\n:\na\nl\ne\nr\nt\n(\n'\nX\nS\nS\n'\n)\n"\n>)
     assert_white_listed img_hack, "<img>"
   end
-  
+
+  def test_should_allow_custom_block
+    html = %(<SCRIPT type="javascript">foo</SCRIPT><img>blah</img><blink>blah</blink>)
+    safe = white_list html do |node, bad|
+      bad == 'script' ? nil : node
+    end
+    assert_equal "<img>blah</img><blink>blah</blink>", safe
+  end
+
+  def test_should_sanitize_attributes
+    assert_white_listed %(<SPAN title="'><script>alert()</script>">blah</SPAN>), %(<span title="'&gt;&lt;script&gt;alert()&lt;/script&gt;">blah</span>)
+  end
+
   protected
     def assert_white_listed(text, expected = nil)
       assert_equal((expected || text), white_list(text))
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/README
--- mephisto-0.7.3/vendor/plugins/will_paginate/README	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/README	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,136 @@
+WillPaginate
+===========
+
+Quick quiz: Where does pagination logic belong?
+
+  a) in the model;
+  b) in the controller;
+  c) in views;
+  d) all of the above.
+
+We think you know the answer (if you think hard enough).
+
+This plugin makes magic happen. You *will* paginate!
+
+
+## Example usage:
+
+Use a paginate finder in the controller:
+
+    @posts = Post.paginate_by_board_id @board.id, :page => params[:page]
+
+Yeah, `paginate` works just like `find` -- it just doesn't fetch all the records.
+Just don't forget to tell it which page you want!
+
+Render the posts in your view like you would normally do. When you need to render
+pagination, just stick this in:
+
+    <%= will_paginate @posts %>
+
+You're done. (Copy and paste the example fancy CSS styles from the bottom.)
+
+How does it know how much items to fetch per page? It asks your model by calling
+`Post.per_page`. You can define it like this:
+
+    class Post < ActiveRecord::Base
+      cattr_reader :per_page
+      @@per_page = 50
+    end
+
+... or like this:
+
+    class Post < ActiveRecord::Base
+      def self.per_page
+        50
+      end
+    end
+
+... or don't worry about it at all. (WillPaginate defines it to be 30 if missing.)
+You can also specify the count explicitly when calling `paginate`:
+
+    @posts = Post.paginate :page => params[:page], :per_page => 50
+
+Find more options in sections below.
+
+
+## Details
+
+The `paginate` finder wraps the original finder and returns a PaginatedCollection
+instance that's in fact a proxy to the original collection. You can use the collection
+as you would any ActiveRecord resultset, but WillPaginate view helpers also need the
+object to know how to make pagination:
+
+    <ol>
+      <% for post in @posts -%>
+        <li>Render `post` in some nice way.</li>
+      <% end -%>
+    </ol>
+
+    <p>Now let's render us some pagination!</p>
+    <%= will_paginate @posts %>
+
+
+In model finders, "all" is implicit. No sense in paginating a single record, right?
+
+  * Post.paginate                  => Post.find :all
+  * Post.paginate_all_by_something => Post.find_all_by_something
+  * Post.paginate_by_something     => Post.find_all_by_something
+
+Options for `paginate` finders are:
+
+  * page           (default 1)
+  * per_page       (default is read from the model, which is 30 if not overriden)
+  * total entries: ActiveRecord knows how to count, but you can still override it
+  * count:         takes place of "select" for count() statement
+  * distinct:      also just for count() statement
+
+Options for `will_paginate` view helper:
+
+  * class:        CSS class name for the generated DIV (default "pagination")
+  * prev_label:   default '&laquo; Previous',
+  * next_label:   default 'Next &raquo;',
+  * inner_window: how many links are shown around the current page, defaults to 4
+  * outer_window: how many links are around the first and the last page, defaults to 1
+
+
+## Authors, credits
+
+Ruby port by:           PJ Hyett, Mislav Marohnić (Sulien)
+Contributors:           K. Adam Christensen, Chris Wanstrath, Dr. Nic Williams
+Original announcement:  http://errtheblog.com/post/929 
+Original PHP source:    http://www.strangerstudios.com/sandbox/pagination/diggstyle.php
+
+
+## Want Digg style?
+
+Copy the following css into your stylesheet for a good start:
+
+.pagination {
+	padding: 3px;
+	margin: 3px;
+}
+.pagination a {
+	padding: 2px 5px 2px 5px;
+	margin: 2px;
+	border: 1px solid #aaaadd;
+	text-decoration: none;
+	color: #000099;
+}
+.pagination a:hover, .pagination a:active {
+	border: 1px solid #000099;
+	color: #000;
+}
+.pagination span.current {
+	padding: 2px 5px 2px 5px;
+	margin: 2px;
+	border: 1px solid #000099;
+	font-weight: bold;
+	background-color: #000099;
+	color: #FFF;
+}
+.pagination span.disabled {
+	padding: 2px 5px 2px 5px;
+	margin: 2px;
+	border: 1px solid #eee;
+	color: #ddd;
+}
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/Rakefile
--- mephisto-0.7.3/vendor/plugins/will_paginate/Rakefile	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/Rakefile	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the dummy plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the dummy plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'WillPaginate'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/init.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/init.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/init.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/init.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,17 @@
+ActiveRecord::Base.send :include, WillPaginate::Finder
+ActionView::Base.send   :include, WillPaginate::ViewHelpers
+
+unless Hash.instance_methods.include? 'slice'
+  Hash.class_eval do
+    # Returns a new hash with only the given keys.
+    def slice(*keys)
+      allowed = Set.new(respond_to?(:convert_key) ? keys.map { |key| convert_key(key) } : keys)
+      reject { |key,| !allowed.include?(key) }
+    end
+
+    # Replaces the hash with only the given keys.
+    def slice!(*keys)
+      replace(slice(*keys))
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/lib/will_paginate/collection.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/lib/will_paginate/collection.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/lib/will_paginate/collection.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/lib/will_paginate/collection.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,31 @@
+module WillPaginate
+  # Arrays returned from paginating finds are, in fact, instances of this.
+  #
+  class Collection < Array
+    attr_reader :current_page, :per_page
+    attr_accessor :total_entries
+
+    def initialize(page, per_page, total)
+      @current_page  = page.to_i
+      @per_page      = per_page.to_i
+      @total_entries = total.to_i
+      @total_pages   = (@total_entries / @per_page.to_f).ceil
+    end
+
+    def page_count
+      @total_pages
+    end
+
+    def offset
+      (current_page - 1) * per_page
+    end
+
+    def previous_page
+      current_page > 1 ? (current_page - 1) : nil
+    end
+
+    def next_page
+      current_page < page_count ? (current_page + 1) : nil
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/lib/will_paginate/finder.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/lib/will_paginate/finder.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/lib/will_paginate/finder.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/lib/will_paginate/finder.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,71 @@
+module WillPaginate
+  # A mixin for ActiveRecord::Base. Provides `per_page` class method
+  # and makes `paginate` finders possible with some method_missing magic.
+  #
+  module Finder
+    def self.included(base)
+      base.extend ClassMethods
+      class << base
+        alias_method_chain :method_missing, :paginate
+        define_method(:per_page) { 30 } unless respond_to? :per_page
+      end
+    end
+
+    module ClassMethods
+      def method_missing_with_paginate(method, *args, &block)
+        # did somebody tried to paginate? if not, let them be
+        unless method.to_s.index('paginate') == 0
+          return method_missing_without_paginate(method, *args, &block) 
+        end
+        options = args.last.is_a?(Hash) ? args.pop.symbolize_keys : {}
+        
+        # :total_entries and :count are mutually exclusive
+        total_entries = unless options[:total_entries]
+          count_options = options.slice :conditions, :joins, :include, :group, :distinct
+          # merge the hash found in :count
+          # this allows you to specify :select, :order, or anything else just for the count query
+          count_options.update(options.delete(:count)) if options[:count]
+          count = count(count_options)
+
+          count.respond_to?(:length) ? count.length : count
+        else
+          options.delete(:total_entries)
+        end
+
+        finder = method.to_s.sub /^paginate/, 'find'
+        # :all is implicit
+        if finder == 'find'
+          args.unshift(:all) if args.length < 2
+        elsif finder.index('find_all') != 0
+          finder.sub! /^find/, 'find_all'
+        end
+
+        returning WillPaginate::Collection.new(
+            (options.delete(:page) || 1),
+            (options.delete(:per_page) || per_page),
+            total_entries
+        ) do |pager|
+          args << options.merge(:offset => pager.offset, :limit => pager.per_page)
+          pager.replace(send(finder, *args))
+        end
+      end
+
+      def respond_to? method
+        case method.to_sym
+        when :paginate, :paginate_by_sql
+          true
+        else
+          super method.to_s.sub(/^paginate/, 'find')
+        end
+      end
+    end
+  end
+
+  # TODO: Controllers need love, too!
+  # 
+  # module ControllerHelpers
+  #   def totally_awesome_helper
+  #     patience
+  #   end
+  # end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,64 @@
+module WillPaginate
+  module ViewHelpers
+    # single space is friendly to spiders and non-graphic browsers
+    PAGE_SEPARATOR = ' '
+
+    # Renders Digg-style pagination. (We know you wanna!)
+    # Returns nil if there is only one page in total (can't paginate that).
+    #
+    def will_paginate entries = @entries, options = {}
+      total_pages = entries.page_count
+
+      if total_pages > 1
+        page = entries.current_page
+        options = options.symbolize_keys.reverse_merge :class => 'pagination',
+          :prev_label   => '&laquo; Previous',
+          :next_label   => 'Next &raquo;',
+          :inner_window => 4, # links around the current page
+          :outer_window => 1 # links around beginning and end
+        
+        inner_window, outer_window = options.delete(:inner_window).to_i, options.delete(:outer_window).to_i
+        min = page - inner_window
+        max = page + inner_window
+        
+        # adjust lower or upper limit if other is out of bounds
+        if max > total_pages then min -= max - total_pages
+        elsif min < 1  then max += 1 - min
+        end
+        
+        current   = min..max
+        beginning = 1..(1 + outer_window)
+        tail      = (total_pages - outer_window)..total_pages
+        visible   = [current, beginning, tail].map(&:to_a).sum
+        
+        # build the list of the links
+        links = (1..total_pages).inject([]) do |list, n|
+          if visible.include? n
+            list << page_link_or_span((n != page ? n : nil), 'current', n)
+          elsif n == beginning.last + 1 || n == tail.first - 1
+            # ellipsis represents the gap between windows
+            list << '...'
+          end
+          list
+        end
+        
+        # next and previous buttons
+        links.unshift page_link_or_span(entries.previous_page, 'disabled', options.delete(:prev_label))
+        links.push    page_link_or_span(entries.next_page,     'disabled', options.delete(:next_label))
+        
+        content_tag :div, links.join(options.delete(:separator) || PAGE_SEPARATOR), options
+      end
+    end
+    
+  protected
+
+    def page_link_or_span(page, span_class = nil, text = page.to_s)
+      unless page
+        content_tag :span, text, :class => span_class
+      else
+        # page links should preserve GET parameters, so we merge params
+        link_to text, params.merge(:page => (page !=1 ? page : nil))
+      end
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/finder_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/finder_test.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/finder_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/finder_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,107 @@
+require File.dirname(__FILE__) + '/helper'
+require File.dirname(__FILE__) + '/../init'
+
+class PaginationTest < ActiveRecordTestCase
+  fixtures :topics, :replies, :developers, :projects, :developers_projects
+
+  def test_new_methods_presence
+    assert_respond_to_all Topic, %w(per_page paginate paginate_by_sql)
+  end
+
+  def test_paginated_collection
+    entries = %w(a b c)
+    collection = WillPaginate::Collection.new 2, 3, 10
+    collection.replace entries
+
+    assert_equal entries, collection
+    assert_respond_to_all collection, %w(page_count each offset size current_page per_page total_entries)
+    assert_equal Array, collection.entries.class
+    assert_equal 3, collection.offset
+  end
+  
+  def test_simple_paginate
+    entries = Topic.paginate
+    assert_equal 1, entries.current_page
+    assert_nil entries.previous_page
+    assert_nil entries.next_page
+    assert_equal 1, entries.page_count
+    assert_equal 3, entries.size
+
+    entries = Topic.paginate :page => 2
+    assert_equal 2, entries.current_page
+    assert_equal 1, entries.previous_page
+    assert_equal 1, entries.page_count
+    assert entries.empty?
+
+    entries = Reply.paginate_all_by_topic_id(1)
+    expected = [replies(:witty_retort), replies(:spam)]
+    assert_equal expected, entries.to_a
+    entries = Reply.paginate_by_topic_id(1)
+    assert_equal expected, entries.to_a
+  end
+  
+  def test_paginate_with_per_page
+    entries = Topic.paginate :per_page => 1
+    assert_equal 1, entries.size
+    assert_equal 3, entries.page_count
+
+    # Developer class has explicit per_page at 10
+    entries = Developer.paginate
+    assert_equal 10, entries.size
+    assert_equal 2, entries.page_count
+
+    entries = Developer.paginate :per_page => 5
+    assert_equal 11, entries.total_entries
+    assert_equal 5, entries.size
+    assert_equal 3, entries.page_count
+  end
+  
+  def test_paginate_with_order
+    entries = Topic.paginate :order => 'created_at asc'
+    expected = [topics(:futurama), topics(:harvey_birdman), topics(:rails)]
+    assert_equal expected, entries.to_a
+    assert_equal 1, entries.page_count
+  end
+  
+  def test_paginate_with_conditions
+    entries = Topic.paginate :conditions => ["created_at > ?", 30.minutes.ago]
+    expected = [topics(:rails)]
+    assert_equal expected, entries.to_a
+    assert_equal 1, entries.page_count
+  end
+  
+  def test_paginate_with_joins
+    entries = Developer.paginate :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
+                                  :conditions => 'project_id=1'        
+    assert_equal 2, entries.size
+    developer_names = entries.map { |d| d.name }
+    assert developer_names.include?('David')
+    assert developer_names.include?('Jamis')
+
+    expected = entries.to_a
+    entries = Developer.paginate :joins => 'd LEFT JOIN developers_projects ON d.id = developers_projects.developer_id',
+                                  :conditions => 'project_id=1',
+                                  :count => { :select => "d.id" }
+    assert_equal expected, entries.to_a
+  end
+  
+  def test_paginate_with_include_and_order
+    entries = Topic.paginate   :include => :replies,  :order => 'replies.created_at asc, topics.created_at asc', :per_page => 10
+    expected = Topic.find :all, :include => 'replies', :order => 'replies.created_at asc, topics.created_at asc', :limit => 10
+    assert_equal expected, entries.to_a
+  end
+
+  def test_paginate_with_group
+    entries = Developer.paginate :per_page => 10, :group => 'salary'
+    expected = [ developers(:david), developers(:jamis), developers(:dev_10), developers(:poor_jamis) ].sort_by(&:salary)
+    assert_equal expected, entries.to_a.sort_by(&:salary)
+  end
+
+protected
+
+  def assert_respond_to_all object, methods
+    methods.each do |method|
+      [method.to_s, method.to_sym].each {|m| assert_respond_to object, m }
+    end
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/companies.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/companies.yml
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/companies.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/companies.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,24 @@
+thirty_seven_signals:
+  id: 1
+  name: 37Signals
+  rating: 4
+
+TextDrive:
+  id: 2
+  name: TextDrive
+  rating: 4
+
+PlanetArgon:
+  id: 3
+  name: Planet Argon
+  rating: 4
+
+Google:
+  id: 4
+  name: Google
+  rating: 4
+  
+Ionist:
+  id: 5
+  name: Ioni.st
+  rating: 4
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/company.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/company.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/company.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/company.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,9 @@
+class Company < ActiveRecord::Base
+  attr_protected :rating
+  set_sequence_name :companies_nonstd_seq
+
+  validates_presence_of :name
+  def validate
+    errors.add('rating', 'rating should not be 2') if rating == 2
+  end  
+end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/developer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/developer.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/developer.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/developer.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,15 @@
+class Developer < ActiveRecord::Base
+  has_and_belongs_to_many :projects
+
+  def self.per_page
+    10
+  end
+end
+
+class DeVeLoPeR < ActiveRecord::Base
+  set_table_name "developers"
+
+  def self.per_page
+    10
+  end
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/developers.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/developers.yml
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/developers.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/developers.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,21 @@
+david:
+  id: 1
+  name: David
+  salary: 80000
+
+jamis:
+  id: 2
+  name: Jamis
+  salary: 150000
+
+<% for digit in 3..10 %>
+dev_<%= digit %>:
+  id: <%= digit %>
+  name: fixture_<%= digit %>
+  salary: 100000
+<% end %>
+
+poor_jamis:
+  id: 11
+  name: Jamis
+  salary: 9000
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,13 @@
+david_action_controller:
+  developer_id: 1
+  project_id: 2
+  joined_on: 2004-10-10
+
+david_active_record:
+  developer_id: 1
+  project_id: 1
+  joined_on: 2004-10-10
+
+jamis_active_record:
+  developer_id: 2
+  project_id: 1
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/project.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/project.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/project.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/project.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+class Project < ActiveRecord::Base
+  has_and_belongs_to_many :developers, :uniq => true
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/projects.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/projects.yml
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/projects.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/projects.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,7 @@
+action_controller:
+  id: 2
+  name: Active Controller
+
+active_record:
+  id: 1
+  name: Active Record
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/replies.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/replies.yml
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/replies.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/replies.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,20 @@
+witty_retort:
+  id: 1
+  topic_id: 1
+  content: Birdman is better!
+  created_at: <%= 6.hours.ago.to_s(:db) %>
+  updated_at: nil
+  
+another:
+  id: 2
+  topic_id: 2
+  content: Nuh uh!
+  created_at: <%= 1.hour.ago.to_s(:db) %>
+  updated_at: nil
+  
+spam:
+  id: 3
+  topic_id: 1
+  content: Nice site!
+  created_at: <%= 1.hour.ago.to_s(:db) %>
+  updated_at: nil
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/reply.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/reply.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/reply.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/reply.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,5 @@
+class Reply < ActiveRecord::Base
+  belongs_to :topic, :include => [:replies]
+  
+  validates_presence_of :content
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/schema.sql technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/schema.sql
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/schema.sql	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/schema.sql	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,42 @@
+CREATE TABLE 'companies' (
+  'id' INTEGER PRIMARY KEY NOT NULL,
+  'name' TEXT DEFAULT NULL,
+  'rating' INTEGER DEFAULT 1
+);
+
+CREATE TABLE 'replies' (
+  'id' INTEGER PRIMARY KEY NOT NULL, 
+  'content' text, 
+  'created_at' datetime, 
+  'updated_at' datetime, 
+  'topic_id' integer
+);
+
+CREATE TABLE 'topics' (
+  'id' INTEGER PRIMARY KEY NOT NULL, 
+  'title' varchar(255), 
+  'subtitle' varchar(255), 
+  'content' text, 
+  'created_at' datetime, 
+  'updated_at' datetime
+);
+
+CREATE TABLE 'developers' (
+  'id' INTEGER PRIMARY KEY NOT NULL,
+  'name' TEXT DEFAULT NULL,
+  'salary' INTEGER DEFAULT 70000,
+  'created_at' DATETIME DEFAULT NULL,
+  'updated_at' DATETIME DEFAULT NULL
+);
+
+CREATE TABLE 'projects' (
+  'id' INTEGER PRIMARY KEY NOT NULL,
+  'name' TEXT DEFAULT NULL
+);
+
+CREATE TABLE 'developers_projects' (
+  'developer_id' INTEGER NOT NULL,
+  'project_id' INTEGER NOT NULL,
+  'joined_on' DATE DEFAULT NULL,
+  'access_level' INTEGER DEFAULT 1
+);
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/topic.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/topic.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/topic.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/topic.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,3 @@
+class Topic < ActiveRecord::Base
+  has_many :replies, :include => [:user], :dependent => :destroy
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/topics.yml technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/topics.yml
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/fixtures/topics.yml	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/fixtures/topics.yml	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,22 @@
+futurama:
+  id: 1
+  title: Isnt futurama awesome?
+  subtitle: It really is, isnt it.
+  content: I like futurama
+  created_at: <%= 1.day.ago.to_s(:db) %>
+  updated_at:
+  
+harvey_birdman:
+  id: 2
+  title: Harvey Birdman is the king of all men
+  subtitle: yup
+  content: It really is
+  created_at: <%= 2.hours.ago.to_s(:db) %>
+  updated_at:
+
+rails:
+  id: 3
+  title: Rails is nice
+  subtitle: It makes me happy
+  content: except when I have to hack internals to fix pagination. even then really.
+  created_at: <%= 20.minutes.ago.to_s(:db) %>
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/helper.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/helper.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/helper.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/helper.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,117 @@
+require 'test/unit'
+
+unless defined?(ActiveRecord)
+  plugin_root = File.join(File.dirname(__FILE__), '..')
+
+  # first look for a symlink to a copy of the framework
+  if framework_root = ["#{plugin_root}/rails", "#{plugin_root}/../../rails"].find { |p| File.directory? p }
+    puts "found framework root: #{framework_root}"
+    # this allows for a plugin to be tested outside an app
+    $:.unshift "#{framework_root}/activesupport/lib", "#{framework_root}/activerecord/lib", "#{framework_root}/actionpack/lib"
+  else
+    # is the plugin installed in an application?
+    app_root = plugin_root + '/../../..'
+
+    if File.directory? app_root + '/config'
+      puts 'using config/boot.rb'
+      ENV['RAILS_ENV'] = 'test'
+      require File.expand_path(app_root + '/config/boot')
+    else
+      # simply use installed gems if available
+      puts 'using rubygems'
+      require 'rubygems'
+      gem 'actionpack'; gem 'activerecord'
+    end
+  end
+
+  %w(action_pack active_record action_controller active_record/fixtures action_controller/test_process).each {|f| require f}
+
+  Dependencies.load_paths.unshift "#{plugin_root}/lib"
+end
+
+# Define the connector
+class ActiveRecordTestConnector
+  cattr_accessor :able_to_connect
+  cattr_accessor :connected
+
+  # Set our defaults
+  self.connected = false
+  self.able_to_connect = true
+
+  class << self
+    def setup
+      unless self.connected || !self.able_to_connect
+        setup_connection
+        load_schema
+        require_fixture_models
+        self.connected = true
+      end
+    rescue Exception => e  # errors from ActiveRecord setup
+      $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
+      #$stderr.puts "  #{e.backtrace.join("\n  ")}\n"
+      self.able_to_connect = false
+    end
+
+    private
+
+    def setup_connection
+      if Object.const_defined?(:ActiveRecord)
+        defaults = { :database => ':memory:' }
+        begin
+          options = defaults.merge :adapter => 'sqlite3', :timeout => 500
+          ActiveRecord::Base.establish_connection(options)
+          ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
+          ActiveRecord::Base.connection
+        rescue Exception  # errors from establishing a connection
+          $stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
+          options = defaults.merge :adapter => 'sqlite'
+          ActiveRecord::Base.establish_connection(options)
+          ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => options }
+          ActiveRecord::Base.connection
+        end
+
+        Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
+      else
+        raise "Can't setup connection since ActiveRecord isn't loaded."
+      end
+    end
+
+    # Load actionpack sqlite tables
+    def load_schema
+      File.read(File.dirname(__FILE__) + "/fixtures/schema.sql").split(';').each do |sql|
+        ActiveRecord::Base.connection.execute(sql) unless sql.blank?
+      end
+    end
+
+    def require_fixture_models
+      Dir.glob(File.dirname(__FILE__) + "/fixtures/*.rb").each {|f| require f}
+    end
+  end
+end
+
+# Test case for inheritance
+class ActiveRecordTestCase < Test::Unit::TestCase
+  # Set our fixture path
+  if ActiveRecordTestConnector.able_to_connect
+    self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+    self.use_transactional_fixtures = false
+  end
+
+  def self.fixtures(*args)
+    super if ActiveRecordTestConnector.connected
+  end
+
+  def run(*args)
+    super if ActiveRecordTestConnector.connected
+  end
+
+  # Default so Test::Unit::TestCase doesn't complain
+  def test_truth
+  end
+end
+
+ActiveRecordTestConnector.setup
+ActionController::Routing::Routes.reload rescue nil
+ActionController::Routing::Routes.draw do |map|
+  map.connect ':controller/:action/:id'
+end
diff -Nur mephisto-0.7.3/vendor/plugins/will_paginate/test/pagination_test.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/pagination_test.rb
--- mephisto-0.7.3/vendor/plugins/will_paginate/test/pagination_test.rb	1969-12-31 19:00:00.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/plugins/will_paginate/test/pagination_test.rb	2008-03-31 02:18:56.000000000 -0400
@@ -0,0 +1,111 @@
+require File.dirname(__FILE__) + '/helper'
+require File.dirname(__FILE__) + '/../init'
+
+class PaginationTest < ActiveRecordTestCase
+  fixtures :developers
+  
+  class PaginationController < ActionController::Base
+    
+    def list_developers
+      @developers = Developer.paginate :page => params[:page], :per_page => (params[:per_page] || 4).to_i
+
+      options = [:class, :prev_label, :next_label, :inner_window, :outer_window]
+      @options = params.slice(*options)
+      options.each { |key| params.delete key }
+
+      render :inline => '<%= will_paginate @developers, @options %>'
+    end
+
+    def no_pagination
+      @developers = Developer.paginate :page => params[:page], :per_page => 15
+
+      render :inline => '<%= will_paginate @developers %>'
+    end
+
+  protected
+
+    def rescue_errors(e) raise e end
+    def rescue_action(e) raise e end
+  end
+  
+  def setup
+    @controller = PaginationController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    super
+  end
+
+  def test_will_paginate
+    get :list_developers
+
+    entries = assigns :developers
+    assert entries
+    assert_equal 4, entries.size
+
+    assert_select 'div.pagination', 1, 'no main DIV' do |el|
+      assert_select 'a[href]', 3 do |elements|
+        validate_page_numbers [2,3,2], elements
+        assert_select elements.last, ':last-child', "Next &raquo;"
+      end
+      assert_select 'span', 2
+      assert_select 'span.disabled:first-child', "&laquo; Previous"
+      assert_select 'span.current', entries.current_page.to_s
+    end
+  end
+
+  def test_will_paginate_with_options
+    get :list_developers, :page => 2, :class => 'will_paginate', :prev_label => 'Prev', :next_label => 'Next'
+    assert_response :success
+    
+    entries = assigns :developers
+    assert entries
+    assert_equal 4, entries.size
+
+    assert_select 'div.will_paginate', 1, 'no main DIV' do
+      assert_select 'a[href]', 4 do |elements|
+        validate_page_numbers [nil,nil,3,3], elements
+        assert_select elements.first, 'a', "Prev"
+        assert_select elements.last, 'a', "Next"
+      end
+      assert_select 'span.current', entries.current_page.to_s
+    end
+  end
+
+  def test_will_paginate_windows
+    get :list_developers, :page => 6, :per_page => 1, :inner_window => 2
+    assert_response :success
+    
+    entries = assigns :developers
+    assert entries
+    assert_equal 1, entries.size
+
+    assert_select 'div.pagination', 1, 'no main DIV' do
+      assert_select 'a[href]', 10 do |elements|
+        validate_page_numbers [5,nil,2,4,5,7,8,10,11,7], elements
+        assert_select elements.first, 'a', "&laquo; Previous"
+        assert_select elements.last, 'a', "Next &raquo;"
+      end
+      assert_select 'span.current', entries.current_page.to_s
+    end
+  end
+
+  def test_no_pagination
+    get :no_pagination
+    entries = assigns :developers
+    assert_equal 1, entries.page_count
+    assert_equal Developer.count, entries.size
+
+    assert_select 'div', false
+    assert_equal '', @response.body
+  end
+
+protected
+
+  def validate_page_numbers expected, links
+    assert_equal(expected, links.map { |e|
+      e['href'] =~ /\Wpage=([^&]*)/
+      $1 ? $1.to_i : $1
+    })
+  end
+
+end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/CHANGES technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/CHANGES
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/CHANGES	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/CHANGES	1969-12-31 19:00:00.000000000 -0500
@@ -1,238 +0,0 @@
-== Version 0.3.2 (tzdata v2006n) - 11-Oct-2006
-
-* Updated to tzdata version 2006n
-  (http://article.gmane.org/gmane.comp.time.tz/1288). Note that this release of
-  tzdata removes the country Serbia and Montenegro (CS) and replaces it with
-  separate Serbia (RS) and Montenegro (ME) entries.
-
-
-== Version 0.3.1 (tzdata v2006j) - 21-Aug-2006
-
-* Remove colon from case statements to avoid warning in Ruby 1.8.5. #5198.
-* Use temporary variable to avoid dynamic string warning from rdoc.
-* Updated to tzdata version 2006j
-  (http://article.gmane.org/gmane.comp.time.tz/1175).
-
-
-== Version 0.3.0 (tzdata v2006g) - 17-Jul-2006
-
-* New timezone data format. Timezone data now occupies less space on disk and
-  takes less memory once loaded. #4142, #4144.
-* Timezone data is defined in modules rather than classes. Timezone instances 
-  returned by Timezone.get are no longer instances of data classes, but are
-  instead instances of new DataTimezone and LinkedTimezone classes.
-* Timezone instances can now be used with Marshal.dump and Marshal.load. #4240.
-* Added a Timezone.get_proxy method that returns a TimezoneProxy object for a 
-  given identifier.
-* Country index data is now defined in a single module that is independent
-  of the Country class implementation.
-* Country instances can now be used with Marshal.dump and Marshal.load. #4240.
-* Country has a new zone_info method that returns CountryTimezone objects
-  containing additional information (latitude, longitude and a description) 
-  relating to each Timezone. #4140.
-* Timezones within a Country are now returned in an order that makes 
-  geographic sense.
-* The zdumptest utility now checks local to utc conversions in addition to
-  utc to local conversions.
-* eql? method defined on Country and Timezone that is equivalent to ==.
-* == method of Timezone no longer raises an exception when passed an object
-  with no identifier method.
-* == method of Country no longer raises an exception when passed an object
-  with no code method.
-* hash method defined on Country that returns the hash of the code.
-* hash method defined on Timezone that returns the hash of the identifier.
-* Miscellaneous API documentation corrections and improvements.
-* Timezone definition and indexes are now excluded from rdoc (the contents were
-  previously ignored with #:nodoc: anyway).
-* Removed no longer needed #:nodoc: directives from timezone data files (which
-  are now excluded from the rdoc build).
-* Installation of the gem now causes rdoc API documentation to be generated. 
-  #4905.
-* When optimizing transitions to generate zone definitions, check the
-  UTC and standard offsets separately rather than just the total offset to UTC.
-  Fixes an incorrect abbreviation issue with Europe/London, Europe/Dublin and 
-  Pacific/Auckland.
-* Eliminated unnecessary .nil? calls to give a minor performance gain.
-* Timezone.all and Timezone.all_identifiers now return all the 
-  Timezones/identifiers rather than just those associated with countries. #4146.
-* Added all_data_zones, all_data_zone_identifiers, all_linked_zones and
-  all_linked_zone_identifiers class methods to Timezone.
-* Added a strftime method to Timezone that converts a time in UTC to local
-  time and then returns it formatted. %Z is replaced with the Timezone 
-  abbreviation for the given time (for example, EST or EDT). #4143.
-* Fix escaping of quotes in TZDataParser. This affected country names and
-  descriptions of timezones within countries.
-
-
-== Version 0.2.2 (tzdata v2006g) - 17-May-2006
-
-* Use class-scoped instance variables to store the Timezone identifier and 
-  singleton instance. Loading a linked zone no longer causes the parent
-  zone's identifier to be changed. The instance method of a linked zone class
-  also now returns an instance of the linked zone class rather than the parent
-  class. #4502.
-* The zdumptest utility now compares the TZInfo zone identifier with the zdump
-  zone identifier.
-* The zdumptestall utility now exits if not supplied with enough parameters.
-* Updated to tzdata version 2006g
-  (http://article.gmane.org/gmane.comp.time.tz/1008).
-
-
-== Version 0.2.1 (tzdata v2006d) - 17-Apr-2006
-
-* Fix a performance issue caused in 0.2.0 with Timezone.local_to_utc. 
-  Conversions performed on TimeOrDateTime instances passed to <=> are now
-  cached as originally intended. Thanks to Michael Smedberg for spotting this.
-* Fix a performance issue with the local_to_utc period search algorithm 
-  originally implemented in 0.1.0. The condition that was supposed to cause
-  the search to terminate when enough periods had been found was only being
-  evaluated in a small subset of cases. Thanks to Michael Smedberg and 
-  Jamis Buck for reporting this.
-* Added abbreviation as an alias for TimezonePeriod.zone_identifier.
-* Updated to tzdata version 2006d
-  (http://article.gmane.org/gmane.comp.time.tz/936).
-* Ignore any offset in DateTimes passed in (as is already done for Times).
-  All of the following now refer to the same UTC time (15:40 on 17 April 2006). 
-  Previously, the DateTime in the second line would have been interpreted 
-  as 20:40.
-  
-    tz.utc_to_local(DateTime.new(2006, 4, 17, 15, 40, 0))
-    tz.utc_to_local(DateTime.new(2006, 4, 17, 15, 40, 0).new_offset(Rational(5, 24)))
-    tz.utc_to_local(Time.utc(2006, 4, 17, 15, 40, 0))
-    tz.utc_to_local(Time.local(2006, 4, 17, 15, 40, 0))
-
-
-== Version 0.2.0 (tzdata v2006c) - 3-Apr-2006
-
-* Use timestamps rather than DateTime objects in zone files for times between
-  1970 and 2037 (the range of Time).
-* Don't convert passed in Time objects to DateTime in most cases (provides 
-  a substantial performance improvement).
-* Allow integer timestamps (time in seconds since 1970-1-1) to be used as well 
-  as Time and DateTime objects in all public methods that take times as 
-  parameters.
-* Tool to compare TZInfo conversions with output from zdump.
-* TZDataParser zone generation algorithm rewritten. Now based on the zic code.
-  TZInfo is now 100% compatible with zic/zdump output.
-* Riyadh Solar Time zones now included again (generation time has been reduced
-  with TZDataParser changes).
-* Use binary mode when writing zone and country files to get Unix (\n) new
-  lines.
-* Omit unnecessary quotes in zone identifier symbols.
-* Omit the final transition to DST if there is a prior transition in the last
-  year processed to standard time.
-* Updated to tzdata version 2006c
-  (http://article.gmane.org/gmane.comp.time.tz/920).
-
-
-== Version 0.1.2 (tzdata v2006a) - 5-Feb-2006
-
-* Add lib directory to the load path when tzinfo is required. Makes it easier
-  to use tzinfo gem when unpacked to vendor directory in rails. 
-* Updated to tzdata version 2006a 
-  (http://article.gmane.org/gmane.comp.time.tz/738).
-* build_tz_classes rake task now handles running svn add and svn delete as new 
-  timezones and countries are added and old ones are removed.
-* Return a better error when attempting to use a Timezone instance that was
-  constructed with Timezone.new(nil). This will occur when using Rails'
-  composed_of. When the timezone identifier in the database is null, attempting
-  to use the Timezone will now result in an UnknownTimezone exception rather 
-  than a NameError.
-
-
-== Version 0.1.1 (tzdata v2005q) - 18-Dec-2005
-
-* Timezones that are defined by a single unbounded period (e.g. UTC) now 
-  work again.
-* Updated to tzdata version 2005q.
-
-
-== Version 0.1.0 (tzdata v2005n) - 27-Nov-2005
-
-* period_for_local and local_to_utc now allow resolution of ambiguous
-  times (e.g. when switching from daylight savings to standard time). 
-  The behaviour of these methods when faced with an ambiguous local time
-  has now changed. If you are using these methods you should check
-  the documentation. Thanks to Cliff Matthews for suggesting this change.
-* Added require 'date' to timezone.rb (date isn't loaded by default in all
-  environments).
-* Use rake to build packages and documentation.
-* License file is now included in gem distribution.
-* Dates in definitions stored as Astronomical Julian Day numbers rather than
-  as civil dates (improves performance creating DateTime instances).
-* Added options to TZDataParser to allow generation of specific zones and
-  countries.
-* Moved TimezonePeriod class to timezone_period.rb.
-* New TimezonePeriodList class to store TimezonePeriods for a timezone and
-  perform searches for periods.
-* Timezones now defined using blocks. TimezonePeriods are only instantiated
-  when they are needed. Thanks to Jamis Buck for the suggestion.
-* Add options to TZDataParser to allow exclusion of specific zones and 
-  countries.
-* Exclude the Riyadh Solar Time zones. The rules are only for 1987 to 1989 and
-  take a long time to generate and process. Riyadh Solar Time is no longer
-  observed.
-* The last TimezonePeriod for each Timezone is now written out with an
-  unbounded rather than arbitrary end time.
-* Construct the Rational offset in TimezonePeriod once when the TimezonePeriod
-  is constructed rather than each time it is needed.
-* Timezone and Country now keep a cache of loaded instances to avoid running
-  require which can be slow on some platforms.
-* Updated to tzdata version 2005n.
-
-
-== Version 0.0.4 (tzdata v2005m) - 18-Sep-2005
-
-* Removed debug output accidentally included in the previous release.
-* Fixed a bug in the generation of friendly zone identifiers (was inserting
-  apostrophes into UTC, GMT, etc).
-* Fixed Country <=> operator (was comparing non-existent attribute)
-* Fixed Timezone.period_for_local error when period not found.
-* Added testcases for Timezone, TimezoneProxy, TimezonePeriod, Country and
-  some selected timezones.
-
-  
-== Version 0.0.3 (tzdata v2005m) - 17-Sep-2005
-
-* Reduced visibility of some methods added in Timezone#setup and Country#setup.
-* Added name method to Timezone (returns the identifier).
-* Added friendly_identifier method to Timezone. Returns a more friendly version
-  of the identifier.
-* Added to_s method to Timezone. Returns the friendly identifier.
-* Added == and <=> operators to Timezone (compares identifiers).
-* Timezone now includes Comparable.
-* Added to_s method to Country.
-* Added == and <=> operators to Country (compares ISO 3166 country codes).
-* Country now includes Comparable.
-* New TimezoneProxy class that behaves the same as a Timezone but doesn't
-  actually load in its definition until it is actually required.
-* Modified Timezone and Country methods that return Timezones to return
-  TimezoneProxy instances instead. This makes these methods much quicker.
-  
-  In Ruby on Rails, you can now show a drop-down list of all timezones using the
-  Rails time_zone_select helper method:
-  
-  <%= time_zone_select 'user', 'time_zone', TZInfo::Timezone.all.sort, :model => TZInfo::Timezone %>
-
-
-== Version 0.0.2 (tzdata v2005m) - 13-Sep-2005 
-
-* Country and Timezone data is now loaded into class rather than instance 
-  variables. This makes Timezone links more efficient and saves memory if
-  creating specific Timezone and Country classes directly.
-* TimezonePeriod zone_identifier is now defined as a symbol to save memory
-  (was previously a string).
-* TimezonePeriod zone_identifiers that were previously '' are now :Unknown.
-* Timezones and Countries can now be returned using Timezone.new(identifier)
-  and Country.new(identifier). When passed an identifier, the new method
-  calls get to return an instance of the specified timezone or country.
-* Added new class methods to Timezone to return sets of zones and identifiers.
-
-Thanks to Scott Barron of Lunchbox Software for the suggestions in his
-article about using TZInfo with Rails 
-(http://lunchroom.lunchboxsoftware.com/pages/tzinfo_rails)
-
-
-== Version 0.0.1 (tzdata v2005m) - 29-Aug-2005 
-
-* First release.
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/LICENSE technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/LICENSE
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/LICENSE	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/LICENSE	1969-12-31 19:00:00.000000000 -0500
@@ -1,19 +0,0 @@
-Copyright (c) 2005-2006 Philip Ross
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/README technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/README
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/README	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/README	1969-12-31 19:00:00.000000000 -0500
@@ -1,102 +0,0 @@
-= TZInfo -- Daylight-savings aware timezone support for Ruby
-
-TZInfo[http://tzinfo.rubyforge.org] uses the tz database 
-(http://www.twinsun.com/tz/tz-link.htm) to provide
-daylight-savings aware transformations between times in different timezones.
-This is the same database as used for zoneinfo on Unix machines.
-
-The tz database has been imported (using TZDataParser) and turned into a set of
-Ruby modules (which are packaged with this release).
-
-
-== Example usage
-
-To convert a time in UTC to a local time in the America/New_York timezone, you
-can do the following:
-
-  require_gem 'tzinfo'
-  include TZInfo
-  
-  tz = Timezone.get('America/New_York')
-  local = tz.utc_to_local(Time.utc(2005,8,29,15,35,0))
-
-Note that the Time returned will look like it is UTC (Time.zone will return 
-"UTC"). This is because it is not currently possible to change the offset of 
-an individual Time instance.
-  
-To convert from a local time to UTC, the local_to_utc method can be used. 
-
-  utc = tz.local_to_utc(local)
-
-Note that the timezone information of the time you pass in is ignored. The
-following two lines will return the same result regardless of the local 
-timezone:
-
-  tz.local_to_utc(Time.local(2006,6,26,1,0,0))
-  tz.local_to_utc(Time.utc(2006,6,26,1,0,0))
-  
-To get information about the rules in force at a particular UTC or local time,
-the Timezone.period_for_utc and Timezone.period_for_local methods can be used.
-Both of these methods return TimezonePeriod objects. The following gets the 
-identifier for the period (in this case EDT).
-
-  period = tz.period_for_utc(DateTime.new(2005,8,29,15,35,0))
-  id = period.zone_identifier
-  
-In all the above examples, instances of Time can be used instead of DateTime.
-Timezone.utc_to_local and Timezone.local_to_utc both return the type they are 
-passed.
-
-You can get the current local time in a Timezone with the Timezone.now method:
-
-  now = tz.now
-
-All methods in TZInfo that take a time can be used with either Time, DateTime
-or Integers (Time#to_i). The return type will be the same as the type passed in.
-  
-You can also access Timezones by Country (ISO 3166 country code). The following 
-gets all the Timezone identifiers for the US:
-
-  us = Country.get('US')
-  timezones = us.zone_identifiers
-  
-The zone_info method of Country provides an additional description and
-location for each Timezone in the Country.
-  
-The above covers the most common uses of Timezone and Country. For more detail,
-see the API documentation for the individual classes.
-
-
-== Download
-
-The latest version of TZInfo can be found at
-
-* http://rubyforge.org/frs/?group_id=894
-
-API documentation can be found at 
-
-* http://tzinfo.rubyforge.org/doc/
-
-
-== Installation
-
-The preferred method of installing TZInfo is through the GEM file (RubyGems[http://docs.rubygems.org/] required):
-
-  % gem install tzinfo-x.y.z.gem
-  
-or to automatically download and install:
-
-  % gem install tzinfo --remote
-  
-
-== License
-
-TZInfo is released under the MIT[http://opensource.org/licenses/mit-license.html] license.
-
-
-== Support
-
-Please post to the TZInfo Users mailing list (http://rubyforge.org/mailman/listinfo/tzinfo-users)
-if you require assistance or have any suggestions.
-
-Alternatively, you can contact the author Philip Ross directly at phil.ross@gmail.com.
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/Rakefile technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/Rakefile
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/Rakefile	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/Rakefile	1969-12-31 19:00:00.000000000 -0500
@@ -1,178 +0,0 @@
-# Available options:
-#
-# rake test - Runs all test cases.
-# rake package - Runs test cases and builds packages for distribution.
-# rake rdoc - Builds API documentation in doc dir.
-# rake build_tz_modules - Builds Timezone modules and the Country index. 
-#   Expects to find source data in ../data.
-# rake build_tz_module zone=Zone/Name - Builds a single Timezone module. 
-#   Expects to find source data in ../data.
-# rake build_countries - Builds the Country index.
-#   Expects to find source data in ../data.
-
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'fileutils'
-
-PKG_VERSION = "0.3.2"
-PKG_FILES = FileList[
-  'CHANGES',
-  'LICENSE',
-  'Rakefile',
-  'README',
-  'bin/**/*',
-  'lib/**/*',
-  'test/**/*'
-]
-
-RDOC_OPTIONS = %w[--exclude definitions --exclude indexes]
-RDOC_EXTRA_FILES = %w[README CHANGES]
-
-BUILD_TZ_CLASSES_DIR = 'lib/tzinfo.build_tz_classes'
-
-SPEC = Gem::Specification.new do |s|
-  s.name = "tzinfo"
-  s.version = PKG_VERSION
-  s.author = "Philip Ross"
-  s.email = "phil.ross@gmail.com"
-  s.homepage = "http://tzinfo.rubyforge.org/"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "Daylight-savings aware timezone library"  
-  s.files = PKG_FILES.delete_if do |item|
-    item.include?(".svn")
-  end
-  s.require_path = "lib"
-  s.autorequire = "tzinfo"  
-  s.has_rdoc = true
-  s.extra_rdoc_files = RDOC_EXTRA_FILES
-  s.rdoc_options = RDOC_OPTIONS
-  s.rubyforge_project = "tzinfo"
-end
-
-Rake::GemPackageTask.new(SPEC) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar_gz = true
-end
-
-
-Rake::TestTask.new('test') do |t|
-  # Force a particular timezone to be local (helps find issues when local
-  # timezone isn't GMT). This won't work on Windows.
-  ENV['TZ'] = 'America/Los_Angeles'
-
-  t.libs << 'test'
-  t.pattern = 'test/tc_*.rb'
-  t.verbose = true
-end
-
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title = "TZInfo"
-  rdoc.options << '--inline-source'
-  rdoc.options.concat RDOC_OPTIONS
-  rdoc.rdoc_files.include(*RDOC_EXTRA_FILES) 
-  rdoc.rdoc_files.include('lib')  
-end
-
-task :build_tz_modules do
-  require 'lib/tzinfo/tzdataparser'
-  
-  FileUtils.mkdir_p(BUILD_TZ_CLASSES_DIR)
-  begin  
-    p = TZInfo::TZDataParser.new('../data', BUILD_TZ_CLASSES_DIR)
-    p.execute
-    
-    ['indexes', 'definitions'].each {|dir|
-      sync_svn("#{BUILD_TZ_CLASSES_DIR}/#{dir}", "lib/tzinfo/#{dir}")
-    }        
-  ensure
-    FileUtils.rm_rf(BUILD_TZ_CLASSES_DIR)
-  end
-end
-
-def sync_svn(source_dir, target_dir)
-  puts "SVN Sync from #{source_dir} to #{target_dir}"
-
-  # Assumes a directory will never turn into a file and vice-versa
-  # (files will all end in .rb, directories won't).
-  # SVN wouldn't allow the change in a single commit anyway.
-
-  source_entries, target_entries = [source_dir, target_dir].collect {|dir|
-    Dir.entries(dir).delete_if {|entry| entry =~ /^\.(\.?|svn)$/}.sort
-  }
-  
-  until source_entries.empty? || target_entries.empty?          
-    if source_entries.last == target_entries.last      
-      source_file = "#{source_dir}/#{source_entries.last}"
-      target_file = "#{target_dir}/#{target_entries.last}"
-    
-      if File.directory?(source_file)
-        sync_svn(source_file, target_file)
-      else
-        FileUtils.cp(source_file, target_file)
-      end     
-    
-      source_entries.pop
-      target_entries.pop
-    elsif source_entries.last < target_entries.last
-      sync_svn_only_in_target(target_dir, target_entries)
-    else      
-      sync_svn_only_in_source(source_dir, target_dir, source_entries)
-    end    
-  end
-  
-  until target_entries.empty?
-    sync_svn_only_in_target(target_dir, target_entries)
-  end
-  
-  until source_entries.empty?
-    sync_svn_only_in_source(source_dir, target_dir, source_entries)
-  end
-end
-
-def sync_svn_only_in_target(target_dir, target_entries)
-  target_file = "#{target_dir}/#{target_entries.last}"  
-  exec_svn "delete \"#{target_file}\""
-  target_entries.pop
-end
-
-def sync_svn_only_in_source(source_dir, target_dir, source_entries)
-  source_file = "#{source_dir}/#{source_entries.last}"
-  target_file = "#{target_dir}/#{source_entries.last}"
-      
-  if File.directory?(source_file)
-    Dir.mkdir(target_file)
-    exec_svn "add \"#{target_file}\""    
-    sync_svn(source_file, target_file)
-  else
-    FileUtils.cp(source_file, target_file)
-    exec_svn "add \"#{target_file}\""
-  end
-  
-  source_entries.pop
-end
-
-def exec_svn(params)
-  puts "svn #{params}"
-  `svn #{params}`
-  raise "SVN exited with status #$?" if $? != 0  
-end
-
-task :build_tz_module do
-  require 'lib/tzinfo/tzdataparser'
-  p = TZInfo::TZDataParser.new('../data', 'lib/tzinfo')
-  p.generate_countries = false
-  p.only_zones = [ENV['zone']]
-  p.execute
-end
-
-task :build_countries do
-  require 'lib/tzinfo/tzdataparser'
-  p = TZInfo::TZDataParser.new('../data', 'lib/tzinfo')
-  p.generate_countries = true
-  p.generate_zones = false
-  p.execute
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,179 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/country_info'
-require 'tzinfo/timezone'
-
-module TZInfo
-  # Thrown by Country#get if the code given is not valid.
-  class InvalidCountryCode < StandardError
-  end
-  
-  # An ISO 3166 country. Can be used to get a list of Timezones for a country.
-  # For example:
-  #
-  #  us = Country.get('US')
-  #  us.zone_identifiers
-  #  us.zones
-  #  us.zone_info
-  class Country
-    include Comparable
-    
-    # Defined countries.
-    @@countries = {}
-    
-    # Whether the countries index has been loaded yet.
-    @@index_loaded = false
-    
-    # Gets a Country by its ISO 3166 code. Raises an InvalidCountryCode 
-    # exception if it couldn't be found.
-    def self.get(identifier)
-      instance = @@countries[identifier]
-      
-      unless instance
-        load_index
-        info = Indexes::Countries.countries[identifier]        
-        raise InvalidCountryCode.new, 'Invalid identifier' unless info
-        instance = Country.new(info)
-        @@countries[identifier] = instance
-      end      
-      
-      instance        
-    end
-    
-    # If identifier is a CountryInfo object, initializes the Country instance, 
-    # otherwise calls get(identifier).
-    def self.new(identifier)      
-      if identifier.kind_of?(CountryInfo)
-        instance = super()
-        instance.send :setup, identifier
-        instance
-      else
-        get(identifier)
-      end
-    end
-    
-    # Returns an Array of all the valid country codes.
-    def self.all_codes
-      load_index
-      Indexes::Countries.countries.keys
-    end
-    
-    # Returns an Array of all the defined Countries.
-    def self.all
-      load_index
-      Indexes::Countries.countries.keys.collect {|code| get(code)}
-    end       
-    
-    # The ISO 3166 country code.
-    def code
-      @info.code
-    end
-    
-    # The name of the country.
-    def name
-      @info.name
-    end
-    
-    # Alias for name.
-    def to_s
-      name
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #{@info.code}>"
-    end
-    
-    # Returns a frozen array of all the zone identifiers for the country. These
-    # are in an order that
-    #   (1) makes some geographical sense, and
-    #   (2) puts the most populous zones first, where that does not contradict (1).
-    def zone_identifiers
-      @info.zone_identifiers
-    end
-    alias zone_names zone_identifiers
-    
-    # An array of all the Timezones for this country. Returns TimezoneProxy
-    # objects to avoid the overhead of loading Timezone definitions until
-    # a conversion is actually required. The Timezones are returned in an order
-    # that
-    #   (1) makes some geographical sense, and
-    #   (2) puts the most populous zones first, where that does not contradict (1).
-    def zones
-      zone_identifiers.collect {|id|
-        Timezone.get_proxy(id)        
-      }
-    end
-    
-    # Returns a frozen array of all the timezones for the for the country as
-    # CountryTimezone instances (containing extra information about each zone). 
-    # These are in an order that
-    #   (1) makes some geographical sense, and
-    #   (2) puts the most populous zones first, where that does not contradict (1).
-    def zone_info
-      @info.zones
-    end
-        
-    # Compare two Countries based on their code. Returns -1 if c is less
-    # than self, 0 if c is equal to self and +1 if c is greater than self.
-    def <=>(c)
-      code <=> c.code
-    end
-    
-    # Returns true if and only if the code of c is equal to the code of this
-    # Country.
-    def eql?(c)
-      self == c
-    end
-    
-    # Returns a hash value for this Country.
-    def hash
-      code.hash
-    end
-    
-    # Dumps this Country for marshalling.
-    def _dump(limit)
-      code
-    end
-    
-    # Loads a marshalled Country.
-    def self._load(data)
-      Country.get(data)
-    end
-    
-    private
-      # Loads in the index of countries if it hasn't already been loaded.
-      def self.load_index
-        unless @@index_loaded
-          require 'tzinfo/indexes/countries'
-          @@index_loaded = true
-        end        
-      end     
-      
-      # Called by Country.new to initialize a new Country instance. The info
-      # parameter is a CountryInfo that defines the country.
-      def setup(info)
-        @info = info        
-      end
-  end 
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country_index_definition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country_index_definition.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country_index_definition.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country_index_definition.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,50 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/country_info'
-
-module TZInfo
-  # The country index file includes CountryIndexDefinition which provides
-  # a country method used to define each country in the index.
-  module CountryIndexDefinition #:nodoc:
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-    end
-    
-    module ClassMethods #:nodoc:
-      # Defines a country with an ISO 3166 country code, name and block. The
-      # block will be evaluated to obtain all the timezones for the country.
-      # Calls Country.country_defined with the definition of each country.
-      def country(code, name, &block)
-        @countries = {} unless @countries
-        @countries[code] = CountryInfo.new(code, name, &block)      
-      end
-      
-      # Returns a frozen hash of all the countries that have been defined in
-      # the index.
-      def countries
-        @countries.freeze
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,82 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/country_timezone'
-
-module TZInfo  
-  # Class to store the data loaded from the country index. Instances of this
-  # class are passed to the blocks in the index that define timezones.
-  class CountryInfo #:nodoc:
-    attr_reader :code
-    attr_reader :name
-    
-    # Constructs a new CountryInfo with an ISO 3166 country code, name and 
-    # block. The block will be evaluated to obtain the timezones for the country
-    # (when they are first needed).
-    def initialize(code, name, &block)
-      @code = code
-      @name = name
-      @block = block
-      @zones = nil
-      @zone_identifiers = nil
-    end
-    
-    # Called by the index data to define a timezone for the country.
-    def timezone(identifier, latitude_numerator, latitude_denominator, 
-                 longitude_numerator, longitude_denominator, description = nil)
-      # Currently only store the identifiers.
-      @zones << CountryTimezone.new(identifier, latitude_numerator, 
-        latitude_denominator, longitude_numerator, longitude_denominator,
-        description)     
-    end
-    
-    # Returns a frozen array of all the zone identifiers for the country. These
-    # are in the order they were added using the timezone method.
-    def zone_identifiers
-      unless @zone_identifiers
-        @zone_identifiers = zones.collect {|zone| zone.identifier}
-        @zone_identifiers.freeze
-      end
-      
-      @zone_identifiers
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@code>"
-    end
-    
-    # Returns a frozen array of all the timezones for the for the country as
-    # CountryTimezone instances. These are in the order they were added using 
-    # the timezone method.
-    def zones
-      unless @zones
-        @zones = []
-        @block.call(self) if @block
-        @block = nil
-        @zones.freeze
-      end
-      
-      @zones
-    end    
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/country_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/country_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,103 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/timezone'
-
-module TZInfo
-  # A Timezone within a Country. This contains extra information about the
-  # Timezone that is specific to the Country (a Timezone could be used by
-  # multiple countries).
-  class CountryTimezone
-    # The zone identifier.
-    attr_reader :identifier      
-    
-    # A description of this timezone in relation to the country, e.g. 
-    # "Eastern Time". This is usually nil for countries having only a single
-    # Timezone.
-    attr_reader :description
-    
-    # Creates a new CountryTimezone with a timezone identifier, latitude,
-    # longitude and description. The latitude and longitude are specified as
-    # rationals - a numerator and denominator. For performance reasons, the 
-    # numerators and denominators must be specified in their lowest form.
-    #
-    # CountryTimezone instances should not normally be constructed manually.
-    def initialize(identifier, latitude_numerator, latitude_denominator, 
-                   longitude_numerator, longitude_denominator, description = nil) #:nodoc:
-      @identifier = identifier
-      @latitude_numerator = latitude_numerator
-      @latitude_denominator = latitude_denominator
-      @longitude_numerator = longitude_numerator
-      @longitude_denominator = longitude_denominator      
-      @description = description
-    end
-    
-    # The Timezone (actually a TimezoneProxy for performance reasons).
-    def timezone
-      Timezone.get_proxy(@identifier)
-    end
-    
-    # if description is not nil, this method returns description; otherwise it
-    # returns timezone.friendly_identifier(true).
-    def description_or_friendly_identifier
-      description || timezone.friendly_identifier(true)
-    end
-    
-    # The latitude of this timezone in degrees as a Rational.
-    def latitude
-      @latitude ||= Rational.new!(@latitude_numerator, @latitude_denominator)
-    end
-    
-    # The longitude of this timezone in degrees as a Rational.
-    def longitude
-      @longitude ||= Rational.new!(@longitude_numerator, @longitude_denominator)
-    end
-    
-    # Returns true if and only if the given CountryTimezone is equal to the
-    # current CountryTimezone (has the same identifer, latitude, longitude
-    # and description).
-    def ==(ct)
-      ct.respond_to?(:identifier) && ct.respond_to?(:latitude) &&
-      ct.respond_to?(:longitude)  && ct.respond_to?(:description) &&
-      identifier == ct.identifier  && latitude == ct.latitude &&
-      longitude == ct.longitude   && description == ct.description         
-    end
-            
-    # Returns true if and only if the given CountryTimezone is equal to the
-    # current CountryTimezone (has the same identifer, latitude, longitude
-    # and description).
-    def eql?(ct)
-      self == ct
-    end
-    
-    # Returns a hash of this CountryTimezone. 
-    def hash
-      @identifier.hash ^ @latitude_numerator.hash ^ @latitude_denominator.hash ^ 
-        @longitude_numerator.hash ^ @longitude_denominator.hash ^ @description.hash
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@identifier>"
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/info_timezone'
-
-module TZInfo
-
-  # A Timezone based on a DataTimezoneInfo.
-  class DataTimezone < InfoTimezone #:nodoc:
-    
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in utc is ignored (it is treated as a UTC time).        
-    #
-    # If no TimezonePeriod could be found, PeriodNotFound is raised.
-    def period_for_utc(utc)
-      info.period_for_utc(utc)
-    end
-    
-    # Returns the set of TimezonePeriod instances that are valid for the given
-    # local time as an array. If you just want a single period, use 
-    # period_for_local instead and specify how abiguities should be resolved.
-    # Raises PeriodNotFound if no periods are found for the given time.
-    def periods_for_local(local)
-      info.periods_for_local(local)
-    end    
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/data_timezone_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,226 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/time_or_datetime'
-require 'tzinfo/timezone_info'
-require 'tzinfo/timezone_offset_info'
-require 'tzinfo/timezone_period'
-require 'tzinfo/timezone_transition_info'
-
-module TZInfo
-  # Thrown if no offsets have been defined when calling period_for_utc or
-  # periods_for_local. Indicates an error in the timezone data.
-  class NoOffsetsDefined < StandardError
-  end
-    
-  # Represents a (non-linked) timezone defined in a data module.
-  class DataTimezoneInfo < TimezoneInfo #:nodoc:
-            
-    # Constructs a new TimezoneInfo with its identifier.
-    def initialize(identifier)   
-      super(identifier)
-      @offsets = {}
-      @transitions = []
-    end
- 
-    # Defines a offset. The id uniquely identifies this offset within the
-    # timezone. utc_offset and std_offset define the offset in seconds of 
-    # standard time from UTC and daylight savings from standard time 
-    # respectively. abbreviation describes the timezone offset (e.g. GMT, BST,
-    # EST or EDT).
-    #
-    # The first offset to be defined is treated as the offset that applies
-    # until the first transition. This will usually be in Local Mean Time (LMT).
-    #
-    # ArgumentError will be raised if the id is already defined.
-    def offset(id, utc_offset, std_offset, abbreviation)
-      raise ArgumentError, 'Offset already defined' if @offsets.has_key?(id)
-      
-      offset = TimezoneOffsetInfo.new(utc_offset, std_offset, abbreviation)
-      @offsets[id] = offset
-      @previous_offset = offset unless @previous_offset
-    end
-    
-    # Defines a transition. Transitions must be defined in chronological order.
-    # ArgumentError will be raised if a transition is added out of order.
-    # offset_id refers to an id defined with offset. ArgumentError will be 
-    # raised if the offset_id cannot be found. numerator_or_time and
-    # denomiator specify the time the transition occurs as. See 
-    # TimezoneTransitionInfo for more detail about specifying times.
-    def transition(year, month, offset_id, numerator_or_time, denominator = nil)
-      offset = @offsets[offset_id]      
-      raise ArgumentError, 'Offset not found' unless offset
-            
-      if @transitions_index
-        if year < @last_year || (year == @last_year && month < @last_month)
-          raise ArgumentError, 'Transitions must be increasing date order'
-        end
-        
-        # Record the position of the first transition with this index.
-        index = transition_index(year, month)
-        @transitions_index[index] ||= @transitions.length
-                
-        # Fill in any gaps       
-        (index - 1).downto(0) do |i|
-          break if @transitions_index[i]
-          @transitions_index[i] = @transitions.length
-        end
-      else
-        @transitions_index = [@transitions.length]
-        @start_year = year
-        @start_month = month        
-      end
-      
-      @transitions << TimezoneTransitionInfo.new(offset, @previous_offset, 
-        numerator_or_time, denominator)
-      @last_year = year
-      @last_month = month             
-      @previous_offset = offset
-    end           
-    
-    # Returns the TimezonePeriod for the given UTC time.
-    # Raises NoOffsetsDefined if no offsets have been defined.
-    def period_for_utc(utc)
-      unless @transitions.empty?
-        utc = TimeOrDateTime.wrap(utc)               
-        index = transition_index(utc.year, utc.mon)
-        
-        start_transition = nil
-        start = transition_before_end(index)
-        if start
-          start.downto(0) do |i|
-            if @transitions[i].at <= utc
-              start_transition = @transitions[i]
-              break
-            end
-          end
-        end
-        
-        end_transition = nil
-        start = transition_after_start(index)      
-        if start
-          start.upto(@transitions.length - 1) do |i|
-            if @transitions[i].at > utc
-              end_transition = @transitions[i]
-              break
-            end
-          end
-        end
-               
-        if start_transition || end_transition
-          TimezonePeriod.new(start_transition, end_transition)
-        else
-          # Won't happen since there are transitions. Must always find one
-          # transition that is either >= or < the specified time.
-          raise 'No transitions found in search'
-        end        
-      else
-        raise NoOffsetsDefined, 'No offsets have been defined' unless @previous_offset        
-        TimezonePeriod.new(nil, nil, @previous_offset)
-      end
-    end
-    
-    # Returns the set of TimezonePeriods for the given local time as an array.    
-    # Results returned are ordered by increasing UTC start date.
-    # Returns an empty array if no periods are found for the given time.
-    # Raises NoOffsetsDefined if no offsets have been defined.    
-    def periods_for_local(local)
-      unless @transitions.empty?
-        local = TimeOrDateTime.wrap(local)
-        index = transition_index(local.year, local.mon)
-        
-        result = []
-       
-        start_index = transition_after_start(index - 1)       
-        if start_index && @transitions[start_index].local_end > local           
-          if start_index > 0
-            if @transitions[start_index - 1].local_start <= local 
-              result << TimezonePeriod.new(@transitions[start_index - 1], @transitions[start_index])
-            end
-          else
-            result << TimezonePeriod.new(nil, @transitions[start_index])
-          end
-        end
-        
-        end_index = transition_before_end(index + 1)
-        
-        if end_index        
-          start_index = end_index unless start_index
-          
-          start_index.upto(transition_before_end(index + 1)) do |i|
-            if @transitions[i].local_start <= local
-              if i + 1 < @transitions.length
-                if @transitions[i + 1].local_end > local
-                  result << TimezonePeriod.new(@transitions[i], @transitions[i + 1])
-                end
-              else
-                result << TimezonePeriod.new(@transitions[i], nil)
-              end
-            end
-          end
-        end
-        
-        result
-      else
-        raise NoOffsetsDefined, 'No offsets have been defined' unless @previous_offset
-        [TimezonePeriod.new(nil, nil, @previous_offset)]
-      end
-    end
-    
-    private
-      # Returns the index into the @transitions_index array for a given year 
-      # and month.
-      def transition_index(year, month)
-        index = (year - @start_year) * 2
-        index += 1 if month > 6
-        index -= 1 if @start_month > 6
-        index
-      end
-      
-      # Returns the index into @transitions of the first transition that occurs
-      # on or after the start of the given index into @transitions_index.
-      # Returns nil if there are no such transitions.
-      def transition_after_start(index)
-        if index >= @transitions_index.length
-          nil
-        else
-          index = 0 if index < 0
-          @transitions_index[index]
-        end
-      end
-      
-      # Returns the index into @transitions of the first transition that occurs
-      # before the end of the given index into @transitions_index.
-      # Returns nil if there are no such transitions.
-      def transition_before_end(index)
-        index = index + 1
-        
-        if index <= 0
-          nil
-        elsif index >= @transitions_index.length          
-          @transitions.length - 1
-        else      
-          @transitions_index[index] - 1          
-        end
-      end            
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Abidjan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Abidjan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Abidjan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Abidjan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Abidjan
-        include TimezoneDefinition
-        
-        timezone 'Africa/Abidjan' do |tz|
-          tz.offset :o0, -968, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          
-          tz.transition 1912, 1, :o1, 26129547121, 10800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Accra.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Accra.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Accra.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Accra.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Accra
-        include TimezoneDefinition
-        
-        timezone 'Africa/Accra' do |tz|
-          tz.offset :o0, -52, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, 0, 1200, :GHST
-          
-          tz.transition 1918, 1, :o1, 52306441213, 21600
-          tz.transition 1936, 9, :o2, 4856825, 2
-          tz.transition 1936, 12, :o1, 174854411, 72
-          tz.transition 1937, 9, :o2, 4857555, 2
-          tz.transition 1937, 12, :o1, 174880691, 72
-          tz.transition 1938, 9, :o2, 4858285, 2
-          tz.transition 1938, 12, :o1, 174906971, 72
-          tz.transition 1939, 9, :o2, 4859015, 2
-          tz.transition 1939, 12, :o1, 174933251, 72
-          tz.transition 1940, 9, :o2, 4859747, 2
-          tz.transition 1940, 12, :o1, 174959603, 72
-          tz.transition 1941, 9, :o2, 4860477, 2
-          tz.transition 1941, 12, :o1, 174985883, 72
-          tz.transition 1942, 9, :o2, 4861207, 2
-          tz.transition 1942, 12, :o1, 175012163, 72
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Addis_Ababa.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Addis_Ababa.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Addis_Ababa.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Addis_Ababa.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Addis_Ababa
-        include TimezoneDefinition
-        
-        timezone 'Africa/Addis_Ababa' do |tz|
-          tz.offset :o0, 9288, 0, :LMT
-          tz.offset :o1, 9320, 0, :ADMT
-          tz.offset :o2, 10800, 0, :EAT
-          
-          tz.transition 1869, 12, :o1, 961625357, 400
-          tz.transition 1936, 5, :o2, 5245113727, 2160
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Algiers.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Algiers.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Algiers.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Algiers.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,55 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Algiers
-        include TimezoneDefinition
-        
-        timezone 'Africa/Algiers' do |tz|
-          tz.offset :o0, 732, 0, :LMT
-          tz.offset :o1, 561, 0, :PMT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 0, 3600, :WEST
-          tz.offset :o4, 3600, 0, :CET
-          tz.offset :o5, 3600, 3600, :CEST
-          
-          tz.transition 1891, 3, :o1, 2170625843, 900
-          tz.transition 1911, 3, :o2, 69670267013, 28800
-          tz.transition 1916, 6, :o3, 58104707, 24
-          tz.transition 1916, 10, :o2, 58107323, 24
-          tz.transition 1917, 3, :o3, 58111499, 24
-          tz.transition 1917, 10, :o2, 58116227, 24
-          tz.transition 1918, 3, :o3, 58119899, 24
-          tz.transition 1918, 10, :o2, 58124963, 24
-          tz.transition 1919, 3, :o3, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133699, 24
-          tz.transition 1920, 2, :o3, 58136867, 24
-          tz.transition 1920, 10, :o2, 58142915, 24
-          tz.transition 1921, 3, :o3, 58146323, 24
-          tz.transition 1921, 6, :o2, 58148699, 24
-          tz.transition 1939, 9, :o3, 58308443, 24
-          tz.transition 1939, 11, :o2, 4859173, 2
-          tz.transition 1940, 2, :o4, 29156215, 12
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 10, :o4, 4862743, 2
-          tz.transition 1945, 4, :o5, 58357141, 24
-          tz.transition 1945, 9, :o4, 58361147, 24
-          tz.transition 1946, 10, :o2, 58370411, 24
-          tz.transition 1956, 1, :o4, 4871003, 2
-          tz.transition 1963, 4, :o2, 58515203, 24
-          tz.transition 1971, 4, :o3, 41468400
-          tz.transition 1971, 9, :o2, 54774000
-          tz.transition 1977, 5, :o3, 231724800
-          tz.transition 1977, 10, :o4, 246236400
-          tz.transition 1978, 3, :o5, 259545600
-          tz.transition 1978, 9, :o4, 275274000
-          tz.transition 1979, 10, :o2, 309740400
-          tz.transition 1980, 4, :o3, 325468800
-          tz.transition 1980, 10, :o2, 341802000
-          tz.transition 1981, 5, :o4, 357523200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Asmera.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Asmera.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Asmera.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Asmera.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Asmera
-        include TimezoneDefinition
-        
-        timezone 'Africa/Asmera' do |tz|
-          tz.offset :o0, 9332, 0, :LMT
-          tz.offset :o1, 9332, 0, :AMT
-          tz.offset :o2, 9320, 0, :ADMT
-          tz.offset :o3, 10800, 0, :EAT
-          
-          tz.transition 1869, 12, :o1, 51927769267, 21600
-          tz.transition 1889, 12, :o2, 52085557267, 21600
-          tz.transition 1936, 5, :o3, 5245113727, 2160
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bamako.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bamako.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bamako.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bamako.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Bamako
-        include TimezoneDefinition
-        
-        timezone 'Africa/Bamako' do |tz|
-          tz.offset :o0, -1920, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, -3600, 0, :WAT
-          
-          tz.transition 1912, 1, :o1, 217746227, 90
-          tz.transition 1934, 2, :o2, 4854989, 2
-          tz.transition 1960, 6, :o1, 58490533, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bangui.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bangui.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bangui.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bangui.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Bangui
-        include TimezoneDefinition
-        
-        timezone 'Africa/Bangui' do |tz|
-          tz.offset :o0, 4460, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
-          
-          tz.transition 1911, 12, :o1, 10451818577, 4320
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Banjul.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Banjul.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Banjul.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Banjul.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Banjul
-        include TimezoneDefinition
-        
-        timezone 'Africa/Banjul' do |tz|
-          tz.offset :o0, -3996, 0, :LMT
-          tz.offset :o1, -3996, 0, :BMT
-          tz.offset :o2, -3600, 0, :WAT
-          tz.offset :o3, 0, 0, :GMT
-          
-          tz.transition 1912, 1, :o1, 1935522037, 800
-          tz.transition 1935, 1, :o2, 1942242837, 800
-          tz.transition 1964, 1, :o3, 58521493, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bissau.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bissau.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bissau.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bissau.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Bissau
-        include TimezoneDefinition
-        
-        timezone 'Africa/Bissau' do |tz|
-          tz.offset :o0, -3740, 0, :LMT
-          tz.offset :o1, -3600, 0, :WAT
-          tz.offset :o2, 0, 0, :GMT
-          
-          tz.transition 1911, 5, :o1, 10450868587, 4320
-          tz.transition 1975, 1, :o2, 157770000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Blantyre.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Blantyre.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Blantyre.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Blantyre.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Blantyre
-        include TimezoneDefinition
-        
-        timezone 'Africa/Blantyre' do |tz|
-          tz.offset :o0, 8400, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1903, 2, :o1, 173964557, 72
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Brazzaville.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Brazzaville.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Brazzaville.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Brazzaville.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Brazzaville
-        include TimezoneDefinition
-        
-        timezone 'Africa/Brazzaville' do |tz|
-          tz.offset :o0, 3668, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
-          
-          tz.transition 1911, 12, :o1, 52259093083, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bujumbura.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bujumbura.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bujumbura.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Bujumbura.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Bujumbura
-        include TimezoneDefinition
-        
-        timezone 'Africa/Bujumbura' do |tz|
-          tz.offset :o0, 7048, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1889, 12, :o1, 26042778919, 10800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Cairo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Cairo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Cairo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Cairo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,219 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Cairo
-        include TimezoneDefinition
-        
-        timezone 'Africa/Cairo' do |tz|
-          tz.offset :o0, 7500, 0, :LMT
-          tz.offset :o1, 7200, 0, :EET
-          tz.offset :o2, 7200, 3600, :EEST
-          
-          tz.transition 1900, 9, :o1, 695604503, 288
-          tz.transition 1940, 7, :o2, 29157905, 12
-          tz.transition 1940, 9, :o1, 19439227, 8
-          tz.transition 1941, 4, :o2, 29161193, 12
-          tz.transition 1941, 9, :o1, 19442027, 8
-          tz.transition 1942, 3, :o2, 29165405, 12
-          tz.transition 1942, 10, :o1, 19445275, 8
-          tz.transition 1943, 3, :o2, 29169785, 12
-          tz.transition 1943, 10, :o1, 19448235, 8
-          tz.transition 1944, 3, :o2, 29174177, 12
-          tz.transition 1944, 10, :o1, 19451163, 8
-          tz.transition 1945, 4, :o2, 29178737, 12
-          tz.transition 1945, 10, :o1, 19454083, 8
-          tz.transition 1957, 5, :o2, 29231621, 12
-          tz.transition 1957, 9, :o1, 19488899, 8
-          tz.transition 1958, 4, :o2, 29235893, 12
-          tz.transition 1958, 9, :o1, 19491819, 8
-          tz.transition 1959, 4, :o2, 58480547, 24
-          tz.transition 1959, 9, :o1, 4873683, 2
-          tz.transition 1960, 4, :o2, 58489331, 24
-          tz.transition 1960, 9, :o1, 4874415, 2
-          tz.transition 1961, 4, :o2, 58498091, 24
-          tz.transition 1961, 9, :o1, 4875145, 2
-          tz.transition 1962, 4, :o2, 58506851, 24
-          tz.transition 1962, 9, :o1, 4875875, 2
-          tz.transition 1963, 4, :o2, 58515611, 24
-          tz.transition 1963, 9, :o1, 4876605, 2
-          tz.transition 1964, 4, :o2, 58524395, 24
-          tz.transition 1964, 9, :o1, 4877337, 2
-          tz.transition 1965, 4, :o2, 58533155, 24
-          tz.transition 1965, 9, :o1, 4878067, 2
-          tz.transition 1966, 4, :o2, 58541915, 24
-          tz.transition 1966, 10, :o1, 4878799, 2
-          tz.transition 1967, 4, :o2, 58550675, 24
-          tz.transition 1967, 10, :o1, 4879529, 2
-          tz.transition 1968, 4, :o2, 58559459, 24
-          tz.transition 1968, 10, :o1, 4880261, 2
-          tz.transition 1969, 4, :o2, 58568219, 24
-          tz.transition 1969, 10, :o1, 4880991, 2
-          tz.transition 1970, 4, :o2, 10364400
-          tz.transition 1970, 10, :o1, 23587200
-          tz.transition 1971, 4, :o2, 41900400
-          tz.transition 1971, 10, :o1, 55123200
-          tz.transition 1972, 4, :o2, 73522800
-          tz.transition 1972, 10, :o1, 86745600
-          tz.transition 1973, 4, :o2, 105058800
-          tz.transition 1973, 10, :o1, 118281600
-          tz.transition 1974, 4, :o2, 136594800
-          tz.transition 1974, 10, :o1, 149817600
-          tz.transition 1975, 4, :o2, 168130800
-          tz.transition 1975, 10, :o1, 181353600
-          tz.transition 1976, 4, :o2, 199753200
-          tz.transition 1976, 10, :o1, 212976000
-          tz.transition 1977, 4, :o2, 231289200
-          tz.transition 1977, 10, :o1, 244512000
-          tz.transition 1978, 4, :o2, 262825200
-          tz.transition 1978, 10, :o1, 276048000
-          tz.transition 1979, 4, :o2, 294361200
-          tz.transition 1979, 10, :o1, 307584000
-          tz.transition 1980, 4, :o2, 325983600
-          tz.transition 1980, 10, :o1, 339206400
-          tz.transition 1981, 4, :o2, 357519600
-          tz.transition 1981, 10, :o1, 370742400
-          tz.transition 1982, 7, :o2, 396399600
-          tz.transition 1982, 10, :o1, 402278400
-          tz.transition 1983, 7, :o2, 426812400
-          tz.transition 1983, 10, :o1, 433814400
-          tz.transition 1984, 4, :o2, 452214000
-          tz.transition 1984, 10, :o1, 465436800
-          tz.transition 1985, 4, :o2, 483750000
-          tz.transition 1985, 10, :o1, 496972800
-          tz.transition 1986, 4, :o2, 515286000
-          tz.transition 1986, 10, :o1, 528508800
-          tz.transition 1987, 4, :o2, 546822000
-          tz.transition 1987, 10, :o1, 560044800
-          tz.transition 1988, 4, :o2, 578444400
-          tz.transition 1988, 10, :o1, 591667200
-          tz.transition 1989, 5, :o2, 610412400
-          tz.transition 1989, 10, :o1, 623203200
-          tz.transition 1990, 4, :o2, 641516400
-          tz.transition 1990, 10, :o1, 654739200
-          tz.transition 1991, 4, :o2, 673052400
-          tz.transition 1991, 10, :o1, 686275200
-          tz.transition 1992, 4, :o2, 704674800
-          tz.transition 1992, 10, :o1, 717897600
-          tz.transition 1993, 4, :o2, 736210800
-          tz.transition 1993, 10, :o1, 749433600
-          tz.transition 1994, 4, :o2, 767746800
-          tz.transition 1994, 10, :o1, 780969600
-          tz.transition 1995, 4, :o2, 799020000
-          tz.transition 1995, 9, :o1, 812322000
-          tz.transition 1996, 4, :o2, 830469600
-          tz.transition 1996, 9, :o1, 843771600
-          tz.transition 1997, 4, :o2, 861919200
-          tz.transition 1997, 9, :o1, 875221200
-          tz.transition 1998, 4, :o2, 893368800
-          tz.transition 1998, 9, :o1, 906670800
-          tz.transition 1999, 4, :o2, 925423200
-          tz.transition 1999, 9, :o1, 938725200
-          tz.transition 2000, 4, :o2, 956872800
-          tz.transition 2000, 9, :o1, 970174800
-          tz.transition 2001, 4, :o2, 988322400
-          tz.transition 2001, 9, :o1, 1001624400
-          tz.transition 2002, 4, :o2, 1019772000
-          tz.transition 2002, 9, :o1, 1033074000
-          tz.transition 2003, 4, :o2, 1051221600
-          tz.transition 2003, 9, :o1, 1064523600
-          tz.transition 2004, 4, :o2, 1083276000
-          tz.transition 2004, 9, :o1, 1096578000
-          tz.transition 2005, 4, :o2, 1114725600
-          tz.transition 2005, 9, :o1, 1128027600
-          tz.transition 2006, 4, :o2, 1146175200
-          tz.transition 2006, 9, :o1, 1158872400
-          tz.transition 2007, 4, :o2, 1177624800
-          tz.transition 2007, 9, :o1, 1190926800
-          tz.transition 2008, 4, :o2, 1209074400
-          tz.transition 2008, 9, :o1, 1222376400
-          tz.transition 2009, 4, :o2, 1240524000
-          tz.transition 2009, 9, :o1, 1253826000
-          tz.transition 2010, 4, :o2, 1272578400
-          tz.transition 2010, 9, :o1, 1285880400
-          tz.transition 2011, 4, :o2, 1304028000
-          tz.transition 2011, 9, :o1, 1317330000
-          tz.transition 2012, 4, :o2, 1335477600
-          tz.transition 2012, 9, :o1, 1348779600
-          tz.transition 2013, 4, :o2, 1366927200
-          tz.transition 2013, 9, :o1, 1380229200
-          tz.transition 2014, 4, :o2, 1398376800
-          tz.transition 2014, 9, :o1, 1411678800
-          tz.transition 2015, 4, :o2, 1429826400
-          tz.transition 2015, 9, :o1, 1443128400
-          tz.transition 2016, 4, :o2, 1461880800
-          tz.transition 2016, 9, :o1, 1475182800
-          tz.transition 2017, 4, :o2, 1493330400
-          tz.transition 2017, 9, :o1, 1506632400
-          tz.transition 2018, 4, :o2, 1524780000
-          tz.transition 2018, 9, :o1, 1538082000
-          tz.transition 2019, 4, :o2, 1556229600
-          tz.transition 2019, 9, :o1, 1569531600
-          tz.transition 2020, 4, :o2, 1587679200
-          tz.transition 2020, 9, :o1, 1600981200
-          tz.transition 2021, 4, :o2, 1619733600
-          tz.transition 2021, 9, :o1, 1633035600
-          tz.transition 2022, 4, :o2, 1651183200
-          tz.transition 2022, 9, :o1, 1664485200
-          tz.transition 2023, 4, :o2, 1682632800
-          tz.transition 2023, 9, :o1, 1695934800
-          tz.transition 2024, 4, :o2, 1714082400
-          tz.transition 2024, 9, :o1, 1727384400
-          tz.transition 2025, 4, :o2, 1745532000
-          tz.transition 2025, 9, :o1, 1758834000
-          tz.transition 2026, 4, :o2, 1776981600
-          tz.transition 2026, 9, :o1, 1790283600
-          tz.transition 2027, 4, :o2, 1809036000
-          tz.transition 2027, 9, :o1, 1822338000
-          tz.transition 2028, 4, :o2, 1840485600
-          tz.transition 2028, 9, :o1, 1853787600
-          tz.transition 2029, 4, :o2, 1871935200
-          tz.transition 2029, 9, :o1, 1885237200
-          tz.transition 2030, 4, :o2, 1903384800
-          tz.transition 2030, 9, :o1, 1916686800
-          tz.transition 2031, 4, :o2, 1934834400
-          tz.transition 2031, 9, :o1, 1948136400
-          tz.transition 2032, 4, :o2, 1966888800
-          tz.transition 2032, 9, :o1, 1980190800
-          tz.transition 2033, 4, :o2, 1998338400
-          tz.transition 2033, 9, :o1, 2011640400
-          tz.transition 2034, 4, :o2, 2029788000
-          tz.transition 2034, 9, :o1, 2043090000
-          tz.transition 2035, 4, :o2, 2061237600
-          tz.transition 2035, 9, :o1, 2074539600
-          tz.transition 2036, 4, :o2, 2092687200
-          tz.transition 2036, 9, :o1, 2105989200
-          tz.transition 2037, 4, :o2, 2124136800
-          tz.transition 2037, 9, :o1, 2137438800
-          tz.transition 2038, 4, :o2, 29586521, 12
-          tz.transition 2038, 9, :o1, 19725579, 8
-          tz.transition 2039, 4, :o2, 29590889, 12
-          tz.transition 2039, 9, :o1, 19728491, 8
-          tz.transition 2040, 4, :o2, 29595257, 12
-          tz.transition 2040, 9, :o1, 19731403, 8
-          tz.transition 2041, 4, :o2, 29599625, 12
-          tz.transition 2041, 9, :o1, 19734315, 8
-          tz.transition 2042, 4, :o2, 29603993, 12
-          tz.transition 2042, 9, :o1, 19737227, 8
-          tz.transition 2043, 4, :o2, 29608361, 12
-          tz.transition 2043, 9, :o1, 19740139, 8
-          tz.transition 2044, 4, :o2, 29612813, 12
-          tz.transition 2044, 9, :o1, 19743107, 8
-          tz.transition 2045, 4, :o2, 29617181, 12
-          tz.transition 2045, 9, :o1, 19746019, 8
-          tz.transition 2046, 4, :o2, 29621549, 12
-          tz.transition 2046, 9, :o1, 19748931, 8
-          tz.transition 2047, 4, :o2, 29625917, 12
-          tz.transition 2047, 9, :o1, 19751843, 8
-          tz.transition 2048, 4, :o2, 29630285, 12
-          tz.transition 2048, 9, :o1, 19754755, 8
-          tz.transition 2049, 4, :o2, 29634737, 12
-          tz.transition 2049, 9, :o1, 19757723, 8
-          tz.transition 2050, 4, :o2, 29639105, 12
-          tz.transition 2050, 9, :o1, 19760635, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Casablanca.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Casablanca.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Casablanca.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Casablanca.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,38 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Casablanca
-        include TimezoneDefinition
-        
-        timezone 'Africa/Casablanca' do |tz|
-          tz.offset :o0, -1820, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          tz.offset :o3, 3600, 0, :CET
-          
-          tz.transition 1913, 10, :o1, 10454687371, 4320
-          tz.transition 1939, 9, :o2, 4859037, 2
-          tz.transition 1939, 11, :o1, 58310075, 24
-          tz.transition 1940, 2, :o2, 4859369, 2
-          tz.transition 1945, 11, :o1, 58362659, 24
-          tz.transition 1950, 6, :o2, 4866887, 2
-          tz.transition 1950, 10, :o1, 58406003, 24
-          tz.transition 1967, 6, :o2, 2439645, 1
-          tz.transition 1967, 9, :o1, 58554347, 24
-          tz.transition 1974, 6, :o2, 141264000
-          tz.transition 1974, 8, :o1, 147222000
-          tz.transition 1976, 5, :o2, 199756800
-          tz.transition 1976, 7, :o1, 207702000
-          tz.transition 1977, 5, :o2, 231292800
-          tz.transition 1977, 9, :o1, 244249200
-          tz.transition 1978, 6, :o2, 265507200
-          tz.transition 1978, 8, :o1, 271033200
-          tz.transition 1984, 3, :o3, 448243200
-          tz.transition 1985, 12, :o1, 504918000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ceuta.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ceuta.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ceuta.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ceuta.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,172 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Ceuta
-        include TimezoneDefinition
-        
-        timezone 'Africa/Ceuta' do |tz|
-          tz.offset :o0, -1276, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          tz.offset :o3, 3600, 0, :CET
-          tz.offset :o4, 3600, 3600, :CEST
-          
-          tz.transition 1901, 1, :o1, 52172327119, 21600
-          tz.transition 1918, 5, :o2, 58121291, 24
-          tz.transition 1918, 10, :o1, 29062493, 12
-          tz.transition 1924, 4, :o2, 58173419, 24
-          tz.transition 1924, 10, :o1, 58177523, 24
-          tz.transition 1926, 4, :o2, 58190963, 24
-          tz.transition 1926, 10, :o1, 58194995, 24
-          tz.transition 1927, 4, :o2, 58199531, 24
-          tz.transition 1927, 10, :o1, 58203731, 24
-          tz.transition 1928, 4, :o2, 58208435, 24
-          tz.transition 1928, 10, :o1, 58212635, 24
-          tz.transition 1967, 6, :o2, 2439645, 1
-          tz.transition 1967, 9, :o1, 58554347, 24
-          tz.transition 1974, 6, :o2, 141264000
-          tz.transition 1974, 8, :o1, 147222000
-          tz.transition 1976, 5, :o2, 199756800
-          tz.transition 1976, 7, :o1, 207702000
-          tz.transition 1977, 5, :o2, 231292800
-          tz.transition 1977, 9, :o1, 244249200
-          tz.transition 1978, 6, :o2, 265507200
-          tz.transition 1978, 8, :o1, 271033200
-          tz.transition 1984, 3, :o3, 448243200
-          tz.transition 1986, 3, :o4, 512528400
-          tz.transition 1986, 9, :o3, 528253200
-          tz.transition 1987, 3, :o4, 543978000
-          tz.transition 1987, 9, :o3, 559702800
-          tz.transition 1988, 3, :o4, 575427600
-          tz.transition 1988, 9, :o3, 591152400
-          tz.transition 1989, 3, :o4, 606877200
-          tz.transition 1989, 9, :o3, 622602000
-          tz.transition 1990, 3, :o4, 638326800
-          tz.transition 1990, 9, :o3, 654656400
-          tz.transition 1991, 3, :o4, 670381200
-          tz.transition 1991, 9, :o3, 686106000
-          tz.transition 1992, 3, :o4, 701830800
-          tz.transition 1992, 9, :o3, 717555600
-          tz.transition 1993, 3, :o4, 733280400
-          tz.transition 1993, 9, :o3, 749005200
-          tz.transition 1994, 3, :o4, 764730000
-          tz.transition 1994, 9, :o3, 780454800
-          tz.transition 1995, 3, :o4, 796179600
-          tz.transition 1995, 9, :o3, 811904400
-          tz.transition 1996, 3, :o4, 828234000
-          tz.transition 1996, 10, :o3, 846378000
-          tz.transition 1997, 3, :o4, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o4, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o4, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2000, 3, :o4, 954032400
-          tz.transition 2000, 10, :o3, 972781200
-          tz.transition 2001, 3, :o4, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o4, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o4, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o4, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o4, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o4, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o4, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o4, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o4, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o4, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o4, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o4, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o4, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o4, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o4, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o4, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o4, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o4, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o4, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o4, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o4, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o4, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o4, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o4, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o4, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o4, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o4, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o4, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o4, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o4, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o4, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o4, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o4, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o4, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o4, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o4, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o4, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o4, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o4, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o4, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o4, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o4, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o4, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o4, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o4, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o4, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o4, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o4, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o4, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o4, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Conakry.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Conakry.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Conakry.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Conakry.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Conakry
-        include TimezoneDefinition
-        
-        timezone 'Africa/Conakry' do |tz|
-          tz.offset :o0, -3292, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, -3600, 0, :WAT
-          
-          tz.transition 1912, 1, :o1, 52259094823, 21600
-          tz.transition 1934, 2, :o2, 4854989, 2
-          tz.transition 1960, 1, :o1, 58486429, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dakar.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dakar.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dakar.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dakar.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Dakar
-        include TimezoneDefinition
-        
-        timezone 'Africa/Dakar' do |tz|
-          tz.offset :o0, -4184, 0, :LMT
-          tz.offset :o1, -3600, 0, :WAT
-          tz.offset :o2, 0, 0, :GMT
-          
-          tz.transition 1912, 1, :o1, 26129547523, 10800
-          tz.transition 1941, 6, :o2, 58323517, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dar_es_Salaam.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dar_es_Salaam.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dar_es_Salaam.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Dar_es_Salaam.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Dar_es_Salaam
-        include TimezoneDefinition
-        
-        timezone 'Africa/Dar_es_Salaam' do |tz|
-          tz.offset :o0, 9428, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          tz.offset :o2, 9885, 0, :BEAUT
-          
-          tz.transition 1930, 12, :o1, 52408995643, 21600
-          tz.transition 1947, 12, :o2, 19460411, 8
-          tz.transition 1960, 12, :o1, 14038850221, 5760
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Djibouti.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Djibouti.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Djibouti.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Djibouti.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Djibouti
-        include TimezoneDefinition
-        
-        timezone 'Africa/Djibouti' do |tz|
-          tz.offset :o0, 10356, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          
-          tz.transition 1911, 6, :o1, 17418372337, 7200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Douala.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Douala.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Douala.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Douala.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Douala
-        include TimezoneDefinition
-        
-        timezone 'Africa/Douala' do |tz|
-          tz.offset :o0, 2328, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
-          
-          tz.transition 1911, 12, :o1, 8709848903, 3600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/El_Aaiun.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/El_Aaiun.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/El_Aaiun.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/El_Aaiun.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module El_Aaiun
-        include TimezoneDefinition
-        
-        timezone 'Africa/El_Aaiun' do |tz|
-          tz.offset :o0, -3168, 0, :LMT
-          tz.offset :o1, -3600, 0, :WAT
-          tz.offset :o2, 0, 0, :WET
-          
-          tz.transition 1934, 1, :o1, 728231561, 300
-          tz.transition 1976, 4, :o2, 198291600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Freetown.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Freetown.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Freetown.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Freetown.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,53 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Freetown
-        include TimezoneDefinition
-        
-        timezone 'Africa/Freetown' do |tz|
-          tz.offset :o0, -3180, 0, :LMT
-          tz.offset :o1, -3180, 0, :FMT
-          tz.offset :o2, -3600, 0, :WAT
-          tz.offset :o3, -3600, 2400, :SLST
-          tz.offset :o4, 0, 0, :WAT
-          tz.offset :o5, 0, 3600, :SLST
-          tz.offset :o6, 0, 0, :GMT
-          
-          tz.transition 1882, 1, :o1, 3468163013, 1440
-          tz.transition 1913, 6, :o2, 3484684133, 1440
-          tz.transition 1935, 6, :o3, 58270909, 24
-          tz.transition 1935, 10, :o2, 174821509, 72
-          tz.transition 1936, 6, :o3, 58279693, 24
-          tz.transition 1936, 10, :o2, 174847861, 72
-          tz.transition 1937, 6, :o3, 58288453, 24
-          tz.transition 1937, 10, :o2, 174874141, 72
-          tz.transition 1938, 6, :o3, 58297213, 24
-          tz.transition 1938, 10, :o2, 174900421, 72
-          tz.transition 1939, 6, :o3, 58305973, 24
-          tz.transition 1939, 10, :o2, 174926701, 72
-          tz.transition 1940, 6, :o3, 58314757, 24
-          tz.transition 1940, 10, :o2, 174953053, 72
-          tz.transition 1941, 6, :o3, 58323517, 24
-          tz.transition 1941, 10, :o2, 174979333, 72
-          tz.transition 1942, 6, :o3, 58332277, 24
-          tz.transition 1942, 10, :o2, 175005613, 72
-          tz.transition 1957, 1, :o4, 58460149, 24
-          tz.transition 1957, 6, :o5, 4871981, 2
-          tz.transition 1957, 8, :o6, 58465979, 24
-          tz.transition 1958, 6, :o5, 4872711, 2
-          tz.transition 1958, 8, :o6, 58474739, 24
-          tz.transition 1959, 6, :o5, 4873441, 2
-          tz.transition 1959, 8, :o6, 58483499, 24
-          tz.transition 1960, 6, :o5, 4874173, 2
-          tz.transition 1960, 8, :o6, 58492283, 24
-          tz.transition 1961, 6, :o5, 4874903, 2
-          tz.transition 1961, 8, :o6, 58501043, 24
-          tz.transition 1962, 6, :o5, 4875633, 2
-          tz.transition 1962, 8, :o6, 58509803, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Gaborone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Gaborone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Gaborone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Gaborone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Gaborone
-        include TimezoneDefinition
-        
-        timezone 'Africa/Gaborone' do |tz|
-          tz.offset :o0, 6220, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          tz.offset :o2, 7200, 3600, :CAST
-          
-          tz.transition 1884, 12, :o1, 10409223289, 4320
-          tz.transition 1943, 9, :o2, 4861973, 2
-          tz.transition 1944, 3, :o1, 58348043, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Harare.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Harare.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Harare.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Harare.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Harare
-        include TimezoneDefinition
-        
-        timezone 'Africa/Harare' do |tz|
-          tz.offset :o0, 7452, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1903, 2, :o1, 1932939531, 800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Johannesburg.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Johannesburg.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Johannesburg.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Johannesburg.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Johannesburg
-        include TimezoneDefinition
-        
-        timezone 'Africa/Johannesburg' do |tz|
-          tz.offset :o0, 6720, 0, :LMT
-          tz.offset :o1, 5400, 0, :SAST
-          tz.offset :o2, 7200, 0, :SAST
-          tz.offset :o3, 7200, 3600, :SAST
-          
-          tz.transition 1892, 2, :o1, 108546139, 45
-          tz.transition 1903, 2, :o2, 38658791, 16
-          tz.transition 1942, 9, :o3, 4861245, 2
-          tz.transition 1943, 3, :o2, 58339307, 24
-          tz.transition 1943, 9, :o3, 4861973, 2
-          tz.transition 1944, 3, :o2, 58348043, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kampala.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kampala.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kampala.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kampala.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Kampala
-        include TimezoneDefinition
-        
-        timezone 'Africa/Kampala' do |tz|
-          tz.offset :o0, 7780, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          tz.offset :o2, 9000, 0, :BEAT
-          tz.offset :o3, 9885, 0, :BEAUT
-          
-          tz.transition 1928, 6, :o1, 10477850731, 4320
-          tz.transition 1929, 12, :o2, 19407819, 8
-          tz.transition 1947, 12, :o3, 116762467, 48
-          tz.transition 1956, 12, :o1, 14030434861, 5760
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Khartoum.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Khartoum.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Khartoum.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Khartoum.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,53 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Khartoum
-        include TimezoneDefinition
-        
-        timezone 'Africa/Khartoum' do |tz|
-          tz.offset :o0, 7808, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          tz.offset :o2, 7200, 3600, :CAST
-          tz.offset :o3, 10800, 0, :EAT
-          
-          tz.transition 1930, 12, :o1, 3275562253, 1350
-          tz.transition 1970, 4, :o2, 10360800
-          tz.transition 1970, 10, :o1, 24786000
-          tz.transition 1971, 4, :o2, 41810400
-          tz.transition 1971, 10, :o1, 56322000
-          tz.transition 1972, 4, :o2, 73432800
-          tz.transition 1972, 10, :o1, 87944400
-          tz.transition 1973, 4, :o2, 104882400
-          tz.transition 1973, 10, :o1, 119480400
-          tz.transition 1974, 4, :o2, 136332000
-          tz.transition 1974, 10, :o1, 151016400
-          tz.transition 1975, 4, :o2, 167781600
-          tz.transition 1975, 10, :o1, 182552400
-          tz.transition 1976, 4, :o2, 199231200
-          tz.transition 1976, 10, :o1, 214174800
-          tz.transition 1977, 4, :o2, 230680800
-          tz.transition 1977, 10, :o1, 245710800
-          tz.transition 1978, 4, :o2, 262735200
-          tz.transition 1978, 10, :o1, 277246800
-          tz.transition 1979, 4, :o2, 294184800
-          tz.transition 1979, 10, :o1, 308782800
-          tz.transition 1980, 4, :o2, 325634400
-          tz.transition 1980, 10, :o1, 340405200
-          tz.transition 1981, 4, :o2, 357084000
-          tz.transition 1981, 10, :o1, 371941200
-          tz.transition 1982, 4, :o2, 388533600
-          tz.transition 1982, 10, :o1, 403477200
-          tz.transition 1983, 4, :o2, 419983200
-          tz.transition 1983, 10, :o1, 435013200
-          tz.transition 1984, 4, :o2, 452037600
-          tz.transition 1984, 10, :o1, 466635600
-          tz.transition 1985, 4, :o2, 483487200
-          tz.transition 1985, 10, :o1, 498171600
-          tz.transition 2000, 1, :o3, 947930400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kigali.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kigali.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kigali.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kigali.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Kigali
-        include TimezoneDefinition
-        
-        timezone 'Africa/Kigali' do |tz|
-          tz.offset :o0, 7216, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1935, 5, :o1, 13110953849, 5400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kinshasa.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kinshasa.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kinshasa.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Kinshasa.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Kinshasa
-        include TimezoneDefinition
-        
-        timezone 'Africa/Kinshasa' do |tz|
-          tz.offset :o0, 3672, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
-          
-          tz.transition 1897, 11, :o1, 965694983, 400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lagos.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lagos.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lagos.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lagos.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Lagos
-        include TimezoneDefinition
-        
-        timezone 'Africa/Lagos' do |tz|
-          tz.offset :o0, 816, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
-          
-          tz.transition 1919, 8, :o1, 4359964483, 1800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Libreville.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Libreville.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Libreville.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Libreville.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Libreville
-        include TimezoneDefinition
-        
-        timezone 'Africa/Libreville' do |tz|
-          tz.offset :o0, 2268, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
-          
-          tz.transition 1911, 12, :o1, 1935521979, 800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lome.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lome.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lome.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lome.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Lome
-        include TimezoneDefinition
-        
-        timezone 'Africa/Lome' do |tz|
-          tz.offset :o0, 292, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          
-          tz.transition 1892, 12, :o1, 52109233127, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Luanda.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Luanda.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Luanda.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Luanda.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Luanda
-        include TimezoneDefinition
-        
-        timezone 'Africa/Luanda' do |tz|
-          tz.offset :o0, 3176, 0, :LMT
-          tz.offset :o1, 3124, 0, :AOT
-          tz.offset :o2, 3600, 0, :WAT
-          
-          tz.transition 1891, 12, :o1, 26050663403, 10800
-          tz.transition 1911, 5, :o2, 52254341219, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lubumbashi.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lubumbashi.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lubumbashi.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lubumbashi.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Lubumbashi
-        include TimezoneDefinition
-        
-        timezone 'Africa/Lubumbashi' do |tz|
-          tz.offset :o0, 6592, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1897, 11, :o1, 1629610261, 675
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lusaka.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lusaka.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lusaka.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Lusaka.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Lusaka
-        include TimezoneDefinition
-        
-        timezone 'Africa/Lusaka' do |tz|
-          tz.offset :o0, 6788, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1903, 2, :o1, 52189367503, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Malabo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Malabo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Malabo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Malabo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Malabo
-        include TimezoneDefinition
-        
-        timezone 'Africa/Malabo' do |tz|
-          tz.offset :o0, 2108, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, 3600, 0, :WAT
-          
-          tz.transition 1911, 12, :o1, 52259093473, 21600
-          tz.transition 1963, 12, :o2, 4876757, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maputo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maputo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maputo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maputo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Maputo
-        include TimezoneDefinition
-        
-        timezone 'Africa/Maputo' do |tz|
-          tz.offset :o0, 7820, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1903, 2, :o1, 10437873449, 4320
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maseru.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maseru.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maseru.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Maseru.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Maseru
-        include TimezoneDefinition
-        
-        timezone 'Africa/Maseru' do |tz|
-          tz.offset :o0, 6600, 0, :LMT
-          tz.offset :o1, 7200, 0, :SAST
-          tz.offset :o2, 7200, 3600, :SAST
-          
-          tz.transition 1903, 2, :o1, 347929117, 144
-          tz.transition 1943, 9, :o2, 4861973, 2
-          tz.transition 1944, 3, :o1, 58348043, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mbabane.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mbabane.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mbabane.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mbabane.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Mbabane
-        include TimezoneDefinition
-        
-        timezone 'Africa/Mbabane' do |tz|
-          tz.offset :o0, 7464, 0, :LMT
-          tz.offset :o1, 7200, 0, :SAST
-          
-          tz.transition 1903, 2, :o1, 8698227889, 3600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mogadishu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mogadishu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mogadishu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Mogadishu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Mogadishu
-        include TimezoneDefinition
-        
-        timezone 'Africa/Mogadishu' do |tz|
-          tz.offset :o0, 10888, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          tz.offset :o2, 9000, 0, :BEAT
-          
-          tz.transition 1893, 10, :o1, 26057898439, 10800
-          tz.transition 1930, 12, :o2, 19410739, 8
-          tz.transition 1956, 12, :o1, 116920291, 48
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Monrovia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Monrovia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Monrovia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Monrovia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Monrovia
-        include TimezoneDefinition
-        
-        timezone 'Africa/Monrovia' do |tz|
-          tz.offset :o0, -2588, 0, :LMT
-          tz.offset :o1, -2588, 0, :MMT
-          tz.offset :o2, -2670, 0, :LRT
-          tz.offset :o3, 0, 0, :GMT
-          
-          tz.transition 1882, 1, :o1, 52022445047, 21600
-          tz.transition 1919, 3, :o2, 52315600247, 21600
-          tz.transition 1972, 5, :o3, 73529070
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nairobi.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nairobi.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nairobi.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nairobi.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Nairobi
-        include TimezoneDefinition
-        
-        timezone 'Africa/Nairobi' do |tz|
-          tz.offset :o0, 8836, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          tz.offset :o2, 9000, 0, :BEAT
-          tz.offset :o3, 9885, 0, :BEAUT
-          
-          tz.transition 1928, 6, :o1, 52389253391, 21600
-          tz.transition 1929, 12, :o2, 19407819, 8
-          tz.transition 1939, 12, :o3, 116622211, 48
-          tz.transition 1959, 12, :o1, 14036742061, 5760
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ndjamena.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ndjamena.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ndjamena.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ndjamena.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Ndjamena
-        include TimezoneDefinition
-        
-        timezone 'Africa/Ndjamena' do |tz|
-          tz.offset :o0, 3612, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
-          tz.offset :o2, 3600, 3600, :WAST
-          
-          tz.transition 1911, 12, :o1, 17419697699, 7200
-          tz.transition 1979, 10, :o2, 308703600
-          tz.transition 1980, 3, :o1, 321314400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Niamey.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Niamey.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Niamey.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Niamey.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Niamey
-        include TimezoneDefinition
-        
-        timezone 'Africa/Niamey' do |tz|
-          tz.offset :o0, 508, 0, :LMT
-          tz.offset :o1, -3600, 0, :WAT
-          tz.offset :o2, 0, 0, :GMT
-          tz.offset :o3, 3600, 0, :WAT
-          
-          tz.transition 1911, 12, :o1, 52259093873, 21600
-          tz.transition 1934, 2, :o2, 58259869, 24
-          tz.transition 1960, 1, :o3, 4873869, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nouakchott.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nouakchott.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nouakchott.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Nouakchott.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Nouakchott
-        include TimezoneDefinition
-        
-        timezone 'Africa/Nouakchott' do |tz|
-          tz.offset :o0, -3828, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, -3600, 0, :WAT
-          
-          tz.transition 1912, 1, :o1, 17419698319, 7200
-          tz.transition 1934, 2, :o2, 4854989, 2
-          tz.transition 1960, 11, :o1, 58494397, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ouagadougou.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ouagadougou.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ouagadougou.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Ouagadougou.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Ouagadougou
-        include TimezoneDefinition
-        
-        timezone 'Africa/Ouagadougou' do |tz|
-          tz.offset :o0, -364, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          
-          tz.transition 1912, 1, :o1, 52259094091, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Porto__m__Novo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Porto__m__Novo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Porto__m__Novo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Porto__m__Novo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Porto__m__Novo
-        include TimezoneDefinition
-        
-        timezone 'Africa/Porto-Novo' do |tz|
-          tz.offset :o0, 628, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, 3600, 0, :WAT
-          
-          tz.transition 1911, 12, :o1, 52259093843, 21600
-          tz.transition 1934, 2, :o2, 4854989, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Sao_Tome.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Sao_Tome.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Sao_Tome.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Sao_Tome.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Sao_Tome
-        include TimezoneDefinition
-        
-        timezone 'Africa/Sao_Tome' do |tz|
-          tz.offset :o0, 1616, 0, :LMT
-          tz.offset :o1, -2192, 0, :LMT
-          tz.offset :o2, 0, 0, :GMT
-          
-          tz.transition 1883, 12, :o1, 13009552999, 5400
-          tz.transition 1912, 1, :o2, 13064773637, 5400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Timbuktu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Timbuktu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Timbuktu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Timbuktu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Timbuktu
-        include TimezoneDefinition
-        
-        linked_timezone 'Africa/Timbuktu', 'Africa/Bamako'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tripoli.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tripoli.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tripoli.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tripoli.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,48 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Tripoli
-        include TimezoneDefinition
-        
-        timezone 'Africa/Tripoli' do |tz|
-          tz.offset :o0, 3164, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          tz.offset :o3, 7200, 0, :EET
-          
-          tz.transition 1919, 12, :o1, 52322208409, 21600
-          tz.transition 1951, 10, :o2, 58414405, 24
-          tz.transition 1951, 12, :o1, 29208149, 12
-          tz.transition 1953, 10, :o2, 58431829, 24
-          tz.transition 1953, 12, :o1, 29216921, 12
-          tz.transition 1955, 9, :o2, 58449131, 24
-          tz.transition 1955, 12, :o1, 29225681, 12
-          tz.transition 1958, 12, :o3, 58477667, 24
-          tz.transition 1981, 12, :o1, 378684000
-          tz.transition 1982, 3, :o2, 386463600
-          tz.transition 1982, 9, :o1, 402271200
-          tz.transition 1983, 3, :o2, 417999600
-          tz.transition 1983, 9, :o1, 433807200
-          tz.transition 1984, 3, :o2, 449622000
-          tz.transition 1984, 9, :o1, 465429600
-          tz.transition 1985, 4, :o2, 481590000
-          tz.transition 1985, 9, :o1, 496965600
-          tz.transition 1986, 4, :o2, 512953200
-          tz.transition 1986, 10, :o1, 528674400
-          tz.transition 1987, 3, :o2, 544230000
-          tz.transition 1987, 9, :o1, 560037600
-          tz.transition 1988, 3, :o2, 575852400
-          tz.transition 1988, 9, :o1, 591660000
-          tz.transition 1989, 3, :o2, 607388400
-          tz.transition 1989, 9, :o1, 623196000
-          tz.transition 1990, 5, :o3, 641775600
-          tz.transition 1996, 9, :o1, 844034400
-          tz.transition 1997, 4, :o2, 860108400
-          tz.transition 1997, 10, :o3, 875916000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tunis.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tunis.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tunis.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Tunis.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,137 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Tunis
-        include TimezoneDefinition
-        
-        timezone 'Africa/Tunis' do |tz|
-          tz.offset :o0, 2444, 0, :LMT
-          tz.offset :o1, 561, 0, :PMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1881, 5, :o1, 52017389389, 21600
-          tz.transition 1911, 3, :o2, 69670267013, 28800
-          tz.transition 1939, 4, :o3, 29152433, 12
-          tz.transition 1939, 11, :o2, 29155037, 12
-          tz.transition 1940, 2, :o3, 29156225, 12
-          tz.transition 1941, 10, :o2, 29163281, 12
-          tz.transition 1942, 3, :o3, 58330259, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 4, :o2, 4861663, 2
-          tz.transition 1943, 4, :o3, 58340149, 24
-          tz.transition 1943, 10, :o2, 4862003, 2
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 10, :o2, 29176457, 12
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 9, :o2, 29180573, 12
-          tz.transition 1977, 4, :o3, 231202800
-          tz.transition 1977, 9, :o2, 243903600
-          tz.transition 1978, 4, :o3, 262825200
-          tz.transition 1978, 9, :o2, 276044400
-          tz.transition 1988, 5, :o3, 581122800
-          tz.transition 1988, 9, :o2, 591145200
-          tz.transition 1989, 3, :o3, 606870000
-          tz.transition 1989, 9, :o2, 622594800
-          tz.transition 1990, 4, :o3, 641516400
-          tz.transition 1990, 9, :o2, 654649200
-          tz.transition 2005, 4, :o3, 1114902000
-          tz.transition 2005, 9, :o2, 1128038400
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Windhoek.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Windhoek.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Windhoek.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Africa/Windhoek.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,140 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Windhoek
-        include TimezoneDefinition
-        
-        timezone 'Africa/Windhoek' do |tz|
-          tz.offset :o0, 4104, 0, :LMT
-          tz.offset :o1, 5400, 0, :SWAT
-          tz.offset :o2, 7200, 0, :SAST
-          tz.offset :o3, 7200, 3600, :SAST
-          tz.offset :o4, 7200, 0, :CAT
-          tz.offset :o5, 3600, 0, :WAT
-          tz.offset :o6, 3600, 3600, :WAST
-          
-          tz.transition 1892, 2, :o1, 964854581, 400
-          tz.transition 1903, 2, :o2, 38658791, 16
-          tz.transition 1942, 9, :o3, 4861245, 2
-          tz.transition 1943, 3, :o2, 58339307, 24
-          tz.transition 1990, 3, :o4, 637970400
-          tz.transition 1994, 4, :o5, 765324000
-          tz.transition 1994, 9, :o6, 778640400
-          tz.transition 1995, 4, :o5, 796780800
-          tz.transition 1995, 9, :o6, 810090000
-          tz.transition 1996, 4, :o5, 828835200
-          tz.transition 1996, 9, :o6, 841539600
-          tz.transition 1997, 4, :o5, 860284800
-          tz.transition 1997, 9, :o6, 873594000
-          tz.transition 1998, 4, :o5, 891734400
-          tz.transition 1998, 9, :o6, 905043600
-          tz.transition 1999, 4, :o5, 923184000
-          tz.transition 1999, 9, :o6, 936493200
-          tz.transition 2000, 4, :o5, 954633600
-          tz.transition 2000, 9, :o6, 967942800
-          tz.transition 2001, 4, :o5, 986083200
-          tz.transition 2001, 9, :o6, 999392400
-          tz.transition 2002, 4, :o5, 1018137600
-          tz.transition 2002, 9, :o6, 1030842000
-          tz.transition 2003, 4, :o5, 1049587200
-          tz.transition 2003, 9, :o6, 1062896400
-          tz.transition 2004, 4, :o5, 1081036800
-          tz.transition 2004, 9, :o6, 1094346000
-          tz.transition 2005, 4, :o5, 1112486400
-          tz.transition 2005, 9, :o6, 1125795600
-          tz.transition 2006, 4, :o5, 1143936000
-          tz.transition 2006, 9, :o6, 1157245200
-          tz.transition 2007, 4, :o5, 1175385600
-          tz.transition 2007, 9, :o6, 1188694800
-          tz.transition 2008, 4, :o5, 1207440000
-          tz.transition 2008, 9, :o6, 1220749200
-          tz.transition 2009, 4, :o5, 1238889600
-          tz.transition 2009, 9, :o6, 1252198800
-          tz.transition 2010, 4, :o5, 1270339200
-          tz.transition 2010, 9, :o6, 1283648400
-          tz.transition 2011, 4, :o5, 1301788800
-          tz.transition 2011, 9, :o6, 1315098000
-          tz.transition 2012, 4, :o5, 1333238400
-          tz.transition 2012, 9, :o6, 1346547600
-          tz.transition 2013, 4, :o5, 1365292800
-          tz.transition 2013, 9, :o6, 1377997200
-          tz.transition 2014, 4, :o5, 1396742400
-          tz.transition 2014, 9, :o6, 1410051600
-          tz.transition 2015, 4, :o5, 1428192000
-          tz.transition 2015, 9, :o6, 1441501200
-          tz.transition 2016, 4, :o5, 1459641600
-          tz.transition 2016, 9, :o6, 1472950800
-          tz.transition 2017, 4, :o5, 1491091200
-          tz.transition 2017, 9, :o6, 1504400400
-          tz.transition 2018, 4, :o5, 1522540800
-          tz.transition 2018, 9, :o6, 1535850000
-          tz.transition 2019, 4, :o5, 1554595200
-          tz.transition 2019, 9, :o6, 1567299600
-          tz.transition 2020, 4, :o5, 1586044800
-          tz.transition 2020, 9, :o6, 1599354000
-          tz.transition 2021, 4, :o5, 1617494400
-          tz.transition 2021, 9, :o6, 1630803600
-          tz.transition 2022, 4, :o5, 1648944000
-          tz.transition 2022, 9, :o6, 1662253200
-          tz.transition 2023, 4, :o5, 1680393600
-          tz.transition 2023, 9, :o6, 1693702800
-          tz.transition 2024, 4, :o5, 1712448000
-          tz.transition 2024, 9, :o6, 1725152400
-          tz.transition 2025, 4, :o5, 1743897600
-          tz.transition 2025, 9, :o6, 1757206800
-          tz.transition 2026, 4, :o5, 1775347200
-          tz.transition 2026, 9, :o6, 1788656400
-          tz.transition 2027, 4, :o5, 1806796800
-          tz.transition 2027, 9, :o6, 1820106000
-          tz.transition 2028, 4, :o5, 1838246400
-          tz.transition 2028, 9, :o6, 1851555600
-          tz.transition 2029, 4, :o5, 1869696000
-          tz.transition 2029, 9, :o6, 1883005200
-          tz.transition 2030, 4, :o5, 1901750400
-          tz.transition 2030, 9, :o6, 1914454800
-          tz.transition 2031, 4, :o5, 1933200000
-          tz.transition 2031, 9, :o6, 1946509200
-          tz.transition 2032, 4, :o5, 1964649600
-          tz.transition 2032, 9, :o6, 1977958800
-          tz.transition 2033, 4, :o5, 1996099200
-          tz.transition 2033, 9, :o6, 2009408400
-          tz.transition 2034, 4, :o5, 2027548800
-          tz.transition 2034, 9, :o6, 2040858000
-          tz.transition 2035, 4, :o5, 2058998400
-          tz.transition 2035, 9, :o6, 2072307600
-          tz.transition 2036, 4, :o5, 2091052800
-          tz.transition 2036, 9, :o6, 2104362000
-          tz.transition 2037, 4, :o5, 2122502400
-          tz.transition 2037, 9, :o6, 2135811600
-          tz.transition 2038, 4, :o5, 4931035, 2
-          tz.transition 2038, 9, :o6, 59176117, 24
-          tz.transition 2039, 4, :o5, 4931763, 2
-          tz.transition 2039, 9, :o6, 59184853, 24
-          tz.transition 2040, 4, :o5, 4932491, 2
-          tz.transition 2040, 9, :o6, 59193589, 24
-          tz.transition 2041, 4, :o5, 4933233, 2
-          tz.transition 2041, 9, :o6, 59202325, 24
-          tz.transition 2042, 4, :o5, 4933961, 2
-          tz.transition 2042, 9, :o6, 59211229, 24
-          tz.transition 2043, 4, :o5, 4934689, 2
-          tz.transition 2043, 9, :o6, 59219965, 24
-          tz.transition 2044, 4, :o5, 4935417, 2
-          tz.transition 2044, 9, :o6, 59228701, 24
-          tz.transition 2045, 4, :o5, 4936145, 2
-          tz.transition 2045, 9, :o6, 59237437, 24
-          tz.transition 2046, 4, :o5, 4936873, 2
-          tz.transition 2046, 9, :o6, 59246173, 24
-          tz.transition 2047, 4, :o5, 4937615, 2
-          tz.transition 2047, 9, :o6, 59254909, 24
-          tz.transition 2048, 4, :o5, 4938343, 2
-          tz.transition 2048, 9, :o6, 59263813, 24
-          tz.transition 2049, 4, :o5, 4939071, 2
-          tz.transition 2049, 9, :o6, 59272549, 24
-          tz.transition 2050, 4, :o5, 4939799, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Adak.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Adak.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Adak.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Adak.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,196 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Adak
-        include TimezoneDefinition
-        
-        timezone 'America/Adak' do |tz|
-          tz.offset :o0, 44001, 0, :LMT
-          tz.offset :o1, -42398, 0, :LMT
-          tz.offset :o2, -39600, 0, :NST
-          tz.offset :o3, -39600, 3600, :NWT
-          tz.offset :o4, -39600, 3600, :NPT
-          tz.offset :o5, -39600, 0, :BST
-          tz.offset :o6, -39600, 3600, :BDT
-          tz.offset :o7, -36000, 0, :AHST
-          tz.offset :o8, -36000, 0, :HAST
-          tz.offset :o9, -36000, 3600, :HADT
-          
-          tz.transition 1867, 10, :o1, 23071267111, 9600
-          tz.transition 1900, 8, :o2, 104338907599, 43200
-          tz.transition 1942, 2, :o3, 58329601, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 2431729, 1
-          tz.transition 1967, 4, :o5, 58549967, 24
-          tz.transition 1969, 4, :o6, 58568137, 24
-          tz.transition 1969, 10, :o5, 2440521, 1
-          tz.transition 1970, 4, :o6, 9982800
-          tz.transition 1970, 10, :o5, 25704000
-          tz.transition 1971, 4, :o6, 41432400
-          tz.transition 1971, 10, :o5, 57758400
-          tz.transition 1972, 4, :o6, 73486800
-          tz.transition 1972, 10, :o5, 89208000
-          tz.transition 1973, 4, :o6, 104936400
-          tz.transition 1973, 10, :o5, 120657600
-          tz.transition 1974, 1, :o6, 126709200
-          tz.transition 1974, 10, :o5, 152107200
-          tz.transition 1975, 2, :o6, 162392400
-          tz.transition 1975, 10, :o5, 183556800
-          tz.transition 1976, 4, :o6, 199285200
-          tz.transition 1976, 10, :o5, 215611200
-          tz.transition 1977, 4, :o6, 230734800
-          tz.transition 1977, 10, :o5, 247060800
-          tz.transition 1978, 4, :o6, 262789200
-          tz.transition 1978, 10, :o5, 278510400
-          tz.transition 1979, 4, :o6, 294238800
-          tz.transition 1979, 10, :o5, 309960000
-          tz.transition 1980, 4, :o6, 325688400
-          tz.transition 1980, 10, :o5, 341409600
-          tz.transition 1981, 4, :o6, 357138000
-          tz.transition 1981, 10, :o5, 372859200
-          tz.transition 1982, 4, :o6, 388587600
-          tz.transition 1982, 10, :o5, 404913600
-          tz.transition 1983, 4, :o6, 420037200
-          tz.transition 1983, 10, :o7, 436363200
-          tz.transition 1983, 11, :o8, 439034400
-          tz.transition 1984, 4, :o9, 452088000
-          tz.transition 1984, 10, :o8, 467809200
-          tz.transition 1985, 4, :o9, 483537600
-          tz.transition 1985, 10, :o8, 499258800
-          tz.transition 1986, 4, :o9, 514987200
-          tz.transition 1986, 10, :o8, 530708400
-          tz.transition 1987, 4, :o9, 544622400
-          tz.transition 1987, 10, :o8, 562158000
-          tz.transition 1988, 4, :o9, 576072000
-          tz.transition 1988, 10, :o8, 594212400
-          tz.transition 1989, 4, :o9, 607521600
-          tz.transition 1989, 10, :o8, 625662000
-          tz.transition 1990, 4, :o9, 638971200
-          tz.transition 1990, 10, :o8, 657111600
-          tz.transition 1991, 4, :o9, 671025600
-          tz.transition 1991, 10, :o8, 688561200
-          tz.transition 1992, 4, :o9, 702475200
-          tz.transition 1992, 10, :o8, 720010800
-          tz.transition 1993, 4, :o9, 733924800
-          tz.transition 1993, 10, :o8, 752065200
-          tz.transition 1994, 4, :o9, 765374400
-          tz.transition 1994, 10, :o8, 783514800
-          tz.transition 1995, 4, :o9, 796824000
-          tz.transition 1995, 10, :o8, 814964400
-          tz.transition 1996, 4, :o9, 828878400
-          tz.transition 1996, 10, :o8, 846414000
-          tz.transition 1997, 4, :o9, 860328000
-          tz.transition 1997, 10, :o8, 877863600
-          tz.transition 1998, 4, :o9, 891777600
-          tz.transition 1998, 10, :o8, 909313200
-          tz.transition 1999, 4, :o9, 923227200
-          tz.transition 1999, 10, :o8, 941367600
-          tz.transition 2000, 4, :o9, 954676800
-          tz.transition 2000, 10, :o8, 972817200
-          tz.transition 2001, 4, :o9, 986126400
-          tz.transition 2001, 10, :o8, 1004266800
-          tz.transition 2002, 4, :o9, 1018180800
-          tz.transition 2002, 10, :o8, 1035716400
-          tz.transition 2003, 4, :o9, 1049630400
-          tz.transition 2003, 10, :o8, 1067166000
-          tz.transition 2004, 4, :o9, 1081080000
-          tz.transition 2004, 10, :o8, 1099220400
-          tz.transition 2005, 4, :o9, 1112529600
-          tz.transition 2005, 10, :o8, 1130670000
-          tz.transition 2006, 4, :o9, 1143979200
-          tz.transition 2006, 10, :o8, 1162119600
-          tz.transition 2007, 3, :o9, 1173614400
-          tz.transition 2007, 11, :o8, 1194174000
-          tz.transition 2008, 3, :o9, 1205064000
-          tz.transition 2008, 11, :o8, 1225623600
-          tz.transition 2009, 3, :o9, 1236513600
-          tz.transition 2009, 11, :o8, 1257073200
-          tz.transition 2010, 3, :o9, 1268568000
-          tz.transition 2010, 11, :o8, 1289127600
-          tz.transition 2011, 3, :o9, 1300017600
-          tz.transition 2011, 11, :o8, 1320577200
-          tz.transition 2012, 3, :o9, 1331467200
-          tz.transition 2012, 11, :o8, 1352026800
-          tz.transition 2013, 3, :o9, 1362916800
-          tz.transition 2013, 11, :o8, 1383476400
-          tz.transition 2014, 3, :o9, 1394366400
-          tz.transition 2014, 11, :o8, 1414926000
-          tz.transition 2015, 3, :o9, 1425816000
-          tz.transition 2015, 11, :o8, 1446375600
-          tz.transition 2016, 3, :o9, 1457870400
-          tz.transition 2016, 11, :o8, 1478430000
-          tz.transition 2017, 3, :o9, 1489320000
-          tz.transition 2017, 11, :o8, 1509879600
-          tz.transition 2018, 3, :o9, 1520769600
-          tz.transition 2018, 11, :o8, 1541329200
-          tz.transition 2019, 3, :o9, 1552219200
-          tz.transition 2019, 11, :o8, 1572778800
-          tz.transition 2020, 3, :o9, 1583668800
-          tz.transition 2020, 11, :o8, 1604228400
-          tz.transition 2021, 3, :o9, 1615723200
-          tz.transition 2021, 11, :o8, 1636282800
-          tz.transition 2022, 3, :o9, 1647172800
-          tz.transition 2022, 11, :o8, 1667732400
-          tz.transition 2023, 3, :o9, 1678622400
-          tz.transition 2023, 11, :o8, 1699182000
-          tz.transition 2024, 3, :o9, 1710072000
-          tz.transition 2024, 11, :o8, 1730631600
-          tz.transition 2025, 3, :o9, 1741521600
-          tz.transition 2025, 11, :o8, 1762081200
-          tz.transition 2026, 3, :o9, 1772971200
-          tz.transition 2026, 11, :o8, 1793530800
-          tz.transition 2027, 3, :o9, 1805025600
-          tz.transition 2027, 11, :o8, 1825585200
-          tz.transition 2028, 3, :o9, 1836475200
-          tz.transition 2028, 11, :o8, 1857034800
-          tz.transition 2029, 3, :o9, 1867924800
-          tz.transition 2029, 11, :o8, 1888484400
-          tz.transition 2030, 3, :o9, 1899374400
-          tz.transition 2030, 11, :o8, 1919934000
-          tz.transition 2031, 3, :o9, 1930824000
-          tz.transition 2031, 11, :o8, 1951383600
-          tz.transition 2032, 3, :o9, 1962878400
-          tz.transition 2032, 11, :o8, 1983438000
-          tz.transition 2033, 3, :o9, 1994328000
-          tz.transition 2033, 11, :o8, 2014887600
-          tz.transition 2034, 3, :o9, 2025777600
-          tz.transition 2034, 11, :o8, 2046337200
-          tz.transition 2035, 3, :o9, 2057227200
-          tz.transition 2035, 11, :o8, 2077786800
-          tz.transition 2036, 3, :o9, 2088676800
-          tz.transition 2036, 11, :o8, 2109236400
-          tz.transition 2037, 3, :o9, 2120126400
-          tz.transition 2037, 11, :o8, 2140686000
-          tz.transition 2038, 3, :o9, 2465497, 1
-          tz.transition 2038, 11, :o8, 59177639, 24
-          tz.transition 2039, 3, :o9, 2465861, 1
-          tz.transition 2039, 11, :o8, 59186375, 24
-          tz.transition 2040, 3, :o9, 2466225, 1
-          tz.transition 2040, 11, :o8, 59195111, 24
-          tz.transition 2041, 3, :o9, 2466589, 1
-          tz.transition 2041, 11, :o8, 59203847, 24
-          tz.transition 2042, 3, :o9, 2466953, 1
-          tz.transition 2042, 11, :o8, 59212583, 24
-          tz.transition 2043, 3, :o9, 2467317, 1
-          tz.transition 2043, 11, :o8, 59221319, 24
-          tz.transition 2044, 3, :o9, 2467688, 1
-          tz.transition 2044, 11, :o8, 59230223, 24
-          tz.transition 2045, 3, :o9, 2468052, 1
-          tz.transition 2045, 11, :o8, 59238959, 24
-          tz.transition 2046, 3, :o9, 2468416, 1
-          tz.transition 2046, 11, :o8, 59247695, 24
-          tz.transition 2047, 3, :o9, 2468780, 1
-          tz.transition 2047, 11, :o8, 59256431, 24
-          tz.transition 2048, 3, :o9, 2469144, 1
-          tz.transition 2048, 11, :o8, 59265167, 24
-          tz.transition 2049, 3, :o9, 2469515, 1
-          tz.transition 2049, 11, :o8, 59274071, 24
-          tz.transition 2050, 3, :o9, 2469879, 1
-          tz.transition 2050, 11, :o8, 59282807, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anchorage.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anchorage.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anchorage.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anchorage.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,196 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Anchorage
-        include TimezoneDefinition
-        
-        timezone 'America/Anchorage' do |tz|
-          tz.offset :o0, 50424, 0, :LMT
-          tz.offset :o1, -35976, 0, :LMT
-          tz.offset :o2, -36000, 0, :CAT
-          tz.offset :o3, -36000, 3600, :CAWT
-          tz.offset :o4, -36000, 3600, :CAPT
-          tz.offset :o5, -36000, 0, :AHST
-          tz.offset :o6, -36000, 3600, :AHDT
-          tz.offset :o7, -32400, 0, :YST
-          tz.offset :o8, -32400, 0, :AKST
-          tz.offset :o9, -32400, 3600, :AKDT
-          
-          tz.transition 1867, 10, :o1, 8651724899, 3600
-          tz.transition 1900, 8, :o2, 8694908699, 3600
-          tz.transition 1942, 2, :o3, 2430400, 1
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 58361495, 24
-          tz.transition 1967, 4, :o5, 29274983, 12
-          tz.transition 1969, 4, :o6, 2440339, 1
-          tz.transition 1969, 10, :o5, 58572503, 24
-          tz.transition 1970, 4, :o6, 9979200
-          tz.transition 1970, 10, :o5, 25700400
-          tz.transition 1971, 4, :o6, 41428800
-          tz.transition 1971, 10, :o5, 57754800
-          tz.transition 1972, 4, :o6, 73483200
-          tz.transition 1972, 10, :o5, 89204400
-          tz.transition 1973, 4, :o6, 104932800
-          tz.transition 1973, 10, :o5, 120654000
-          tz.transition 1974, 1, :o6, 126705600
-          tz.transition 1974, 10, :o5, 152103600
-          tz.transition 1975, 2, :o6, 162388800
-          tz.transition 1975, 10, :o5, 183553200
-          tz.transition 1976, 4, :o6, 199281600
-          tz.transition 1976, 10, :o5, 215607600
-          tz.transition 1977, 4, :o6, 230731200
-          tz.transition 1977, 10, :o5, 247057200
-          tz.transition 1978, 4, :o6, 262785600
-          tz.transition 1978, 10, :o5, 278506800
-          tz.transition 1979, 4, :o6, 294235200
-          tz.transition 1979, 10, :o5, 309956400
-          tz.transition 1980, 4, :o6, 325684800
-          tz.transition 1980, 10, :o5, 341406000
-          tz.transition 1981, 4, :o6, 357134400
-          tz.transition 1981, 10, :o5, 372855600
-          tz.transition 1982, 4, :o6, 388584000
-          tz.transition 1982, 10, :o5, 404910000
-          tz.transition 1983, 4, :o6, 420033600
-          tz.transition 1983, 10, :o7, 436359600
-          tz.transition 1983, 11, :o8, 439030800
-          tz.transition 1984, 4, :o9, 452084400
-          tz.transition 1984, 10, :o8, 467805600
-          tz.transition 1985, 4, :o9, 483534000
-          tz.transition 1985, 10, :o8, 499255200
-          tz.transition 1986, 4, :o9, 514983600
-          tz.transition 1986, 10, :o8, 530704800
-          tz.transition 1987, 4, :o9, 544618800
-          tz.transition 1987, 10, :o8, 562154400
-          tz.transition 1988, 4, :o9, 576068400
-          tz.transition 1988, 10, :o8, 594208800
-          tz.transition 1989, 4, :o9, 607518000
-          tz.transition 1989, 10, :o8, 625658400
-          tz.transition 1990, 4, :o9, 638967600
-          tz.transition 1990, 10, :o8, 657108000
-          tz.transition 1991, 4, :o9, 671022000
-          tz.transition 1991, 10, :o8, 688557600
-          tz.transition 1992, 4, :o9, 702471600
-          tz.transition 1992, 10, :o8, 720007200
-          tz.transition 1993, 4, :o9, 733921200
-          tz.transition 1993, 10, :o8, 752061600
-          tz.transition 1994, 4, :o9, 765370800
-          tz.transition 1994, 10, :o8, 783511200
-          tz.transition 1995, 4, :o9, 796820400
-          tz.transition 1995, 10, :o8, 814960800
-          tz.transition 1996, 4, :o9, 828874800
-          tz.transition 1996, 10, :o8, 846410400
-          tz.transition 1997, 4, :o9, 860324400
-          tz.transition 1997, 10, :o8, 877860000
-          tz.transition 1998, 4, :o9, 891774000
-          tz.transition 1998, 10, :o8, 909309600
-          tz.transition 1999, 4, :o9, 923223600
-          tz.transition 1999, 10, :o8, 941364000
-          tz.transition 2000, 4, :o9, 954673200
-          tz.transition 2000, 10, :o8, 972813600
-          tz.transition 2001, 4, :o9, 986122800
-          tz.transition 2001, 10, :o8, 1004263200
-          tz.transition 2002, 4, :o9, 1018177200
-          tz.transition 2002, 10, :o8, 1035712800
-          tz.transition 2003, 4, :o9, 1049626800
-          tz.transition 2003, 10, :o8, 1067162400
-          tz.transition 2004, 4, :o9, 1081076400
-          tz.transition 2004, 10, :o8, 1099216800
-          tz.transition 2005, 4, :o9, 1112526000
-          tz.transition 2005, 10, :o8, 1130666400
-          tz.transition 2006, 4, :o9, 1143975600
-          tz.transition 2006, 10, :o8, 1162116000
-          tz.transition 2007, 3, :o9, 1173610800
-          tz.transition 2007, 11, :o8, 1194170400
-          tz.transition 2008, 3, :o9, 1205060400
-          tz.transition 2008, 11, :o8, 1225620000
-          tz.transition 2009, 3, :o9, 1236510000
-          tz.transition 2009, 11, :o8, 1257069600
-          tz.transition 2010, 3, :o9, 1268564400
-          tz.transition 2010, 11, :o8, 1289124000
-          tz.transition 2011, 3, :o9, 1300014000
-          tz.transition 2011, 11, :o8, 1320573600
-          tz.transition 2012, 3, :o9, 1331463600
-          tz.transition 2012, 11, :o8, 1352023200
-          tz.transition 2013, 3, :o9, 1362913200
-          tz.transition 2013, 11, :o8, 1383472800
-          tz.transition 2014, 3, :o9, 1394362800
-          tz.transition 2014, 11, :o8, 1414922400
-          tz.transition 2015, 3, :o9, 1425812400
-          tz.transition 2015, 11, :o8, 1446372000
-          tz.transition 2016, 3, :o9, 1457866800
-          tz.transition 2016, 11, :o8, 1478426400
-          tz.transition 2017, 3, :o9, 1489316400
-          tz.transition 2017, 11, :o8, 1509876000
-          tz.transition 2018, 3, :o9, 1520766000
-          tz.transition 2018, 11, :o8, 1541325600
-          tz.transition 2019, 3, :o9, 1552215600
-          tz.transition 2019, 11, :o8, 1572775200
-          tz.transition 2020, 3, :o9, 1583665200
-          tz.transition 2020, 11, :o8, 1604224800
-          tz.transition 2021, 3, :o9, 1615719600
-          tz.transition 2021, 11, :o8, 1636279200
-          tz.transition 2022, 3, :o9, 1647169200
-          tz.transition 2022, 11, :o8, 1667728800
-          tz.transition 2023, 3, :o9, 1678618800
-          tz.transition 2023, 11, :o8, 1699178400
-          tz.transition 2024, 3, :o9, 1710068400
-          tz.transition 2024, 11, :o8, 1730628000
-          tz.transition 2025, 3, :o9, 1741518000
-          tz.transition 2025, 11, :o8, 1762077600
-          tz.transition 2026, 3, :o9, 1772967600
-          tz.transition 2026, 11, :o8, 1793527200
-          tz.transition 2027, 3, :o9, 1805022000
-          tz.transition 2027, 11, :o8, 1825581600
-          tz.transition 2028, 3, :o9, 1836471600
-          tz.transition 2028, 11, :o8, 1857031200
-          tz.transition 2029, 3, :o9, 1867921200
-          tz.transition 2029, 11, :o8, 1888480800
-          tz.transition 2030, 3, :o9, 1899370800
-          tz.transition 2030, 11, :o8, 1919930400
-          tz.transition 2031, 3, :o9, 1930820400
-          tz.transition 2031, 11, :o8, 1951380000
-          tz.transition 2032, 3, :o9, 1962874800
-          tz.transition 2032, 11, :o8, 1983434400
-          tz.transition 2033, 3, :o9, 1994324400
-          tz.transition 2033, 11, :o8, 2014884000
-          tz.transition 2034, 3, :o9, 2025774000
-          tz.transition 2034, 11, :o8, 2046333600
-          tz.transition 2035, 3, :o9, 2057223600
-          tz.transition 2035, 11, :o8, 2077783200
-          tz.transition 2036, 3, :o9, 2088673200
-          tz.transition 2036, 11, :o8, 2109232800
-          tz.transition 2037, 3, :o9, 2120122800
-          tz.transition 2037, 11, :o8, 2140682400
-          tz.transition 2038, 3, :o9, 59171927, 24
-          tz.transition 2038, 11, :o8, 29588819, 12
-          tz.transition 2039, 3, :o9, 59180663, 24
-          tz.transition 2039, 11, :o8, 29593187, 12
-          tz.transition 2040, 3, :o9, 59189399, 24
-          tz.transition 2040, 11, :o8, 29597555, 12
-          tz.transition 2041, 3, :o9, 59198135, 24
-          tz.transition 2041, 11, :o8, 29601923, 12
-          tz.transition 2042, 3, :o9, 59206871, 24
-          tz.transition 2042, 11, :o8, 29606291, 12
-          tz.transition 2043, 3, :o9, 59215607, 24
-          tz.transition 2043, 11, :o8, 29610659, 12
-          tz.transition 2044, 3, :o9, 59224511, 24
-          tz.transition 2044, 11, :o8, 29615111, 12
-          tz.transition 2045, 3, :o9, 59233247, 24
-          tz.transition 2045, 11, :o8, 29619479, 12
-          tz.transition 2046, 3, :o9, 59241983, 24
-          tz.transition 2046, 11, :o8, 29623847, 12
-          tz.transition 2047, 3, :o9, 59250719, 24
-          tz.transition 2047, 11, :o8, 29628215, 12
-          tz.transition 2048, 3, :o9, 59259455, 24
-          tz.transition 2048, 11, :o8, 29632583, 12
-          tz.transition 2049, 3, :o9, 59268359, 24
-          tz.transition 2049, 11, :o8, 29637035, 12
-          tz.transition 2050, 3, :o9, 59277095, 24
-          tz.transition 2050, 11, :o8, 29641403, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anguilla.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anguilla.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anguilla.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Anguilla.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Anguilla
-        include TimezoneDefinition
-        
-        timezone 'America/Anguilla' do |tz|
-          tz.offset :o0, -15136, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1912, 3, :o1, 6532551923, 2700
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Antigua.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Antigua.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Antigua.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Antigua.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Antigua
-        include TimezoneDefinition
-        
-        timezone 'America/Antigua' do |tz|
-          tz.offset :o0, -14832, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -14400, 0, :AST
-          
-          tz.transition 1912, 3, :o1, 1451678203, 600
-          tz.transition 1951, 1, :o2, 58407545, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Araguaina.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Araguaina.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Araguaina.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Araguaina.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,67 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Araguaina
-        include TimezoneDefinition
-        
-        timezone 'America/Araguaina' do |tz|
-          tz.offset :o0, -11568, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 4356240541, 1800
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 12, :o2, 19506981, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-          tz.transition 1988, 10, :o2, 592974000
-          tz.transition 1989, 1, :o1, 602042400
-          tz.transition 1989, 10, :o2, 624423600
-          tz.transition 1990, 2, :o1, 634701600
-          tz.transition 1995, 10, :o2, 813726000
-          tz.transition 1996, 2, :o1, 824004000
-          tz.transition 1996, 10, :o2, 844570800
-          tz.transition 1997, 2, :o1, 856058400
-          tz.transition 1997, 10, :o2, 876106800
-          tz.transition 1998, 3, :o1, 888717600
-          tz.transition 1998, 10, :o2, 908074800
-          tz.transition 1999, 2, :o1, 919562400
-          tz.transition 1999, 10, :o2, 938919600
-          tz.transition 2000, 2, :o1, 951616800
-          tz.transition 2000, 10, :o2, 970974000
-          tz.transition 2001, 2, :o1, 982461600
-          tz.transition 2001, 10, :o2, 1003028400
-          tz.transition 2002, 2, :o1, 1013911200
-          tz.transition 2002, 11, :o2, 1036292400
-          tz.transition 2003, 2, :o1, 1045360800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,80 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Buenos_Aires
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Buenos_Aires' do |tz|
-            tz.offset :o0, -14028, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            
-            tz.transition 1894, 10, :o1, 17374555169, 7200
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o4, 667965600
-            tz.transition 1991, 10, :o5, 687927600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Catamarca.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Catamarca.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Catamarca.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Catamarca.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,83 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Catamarca
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Catamarca' do |tz|
-            tz.offset :o0, -15788, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 52123665947, 21600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o6, 667965600
-            tz.transition 1991, 10, :o5, 687931200
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 6, :o6, 1086058800
-            tz.transition 2004, 6, :o4, 1087704000
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/ComodRivadavia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/ComodRivadavia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/ComodRivadavia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/ComodRivadavia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,15 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module ComodRivadavia
-          include TimezoneDefinition
-          
-          linked_timezone 'America/Argentina/ComodRivadavia', 'America/Argentina/Catamarca'
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Cordoba.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Cordoba.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Cordoba.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Cordoba.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,81 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Cordoba
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Cordoba' do |tz|
-            tz.offset :o0, -15408, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 1447879607, 600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o6, 667965600
-            tz.transition 1991, 10, :o5, 687931200
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Jujuy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Jujuy.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Jujuy.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Jujuy.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,82 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Jujuy
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Jujuy' do |tz|
-            tz.offset :o0, -15672, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            tz.offset :o7, -14400, 3600, :WARST
-            
-            tz.transition 1894, 10, :o1, 8687277653, 3600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o6, 636516000
-            tz.transition 1990, 10, :o7, 657086400
-            tz.transition 1991, 3, :o6, 669178800
-            tz.transition 1991, 10, :o5, 686721600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/La_Rioja.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/La_Rioja.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/La_Rioja.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/La_Rioja.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,84 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module La_Rioja
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/La_Rioja' do |tz|
-            tz.offset :o0, -16044, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 17374555337, 7200
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o6, 667792800
-            tz.transition 1991, 5, :o4, 673588800
-            tz.transition 1991, 10, :o5, 687927600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 6, :o6, 1086058800
-            tz.transition 2004, 6, :o4, 1087704000
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Mendoza.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Mendoza.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Mendoza.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Mendoza.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,84 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Mendoza
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Mendoza' do |tz|
-            tz.offset :o0, -16516, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            tz.offset :o7, -14400, 3600, :WARST
-            
-            tz.transition 1894, 10, :o1, 52123666129, 21600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o6, 636516000
-            tz.transition 1990, 10, :o7, 655963200
-            tz.transition 1991, 3, :o6, 667796400
-            tz.transition 1991, 10, :o7, 687499200
-            tz.transition 1992, 3, :o6, 699418800
-            tz.transition 1992, 10, :o5, 719380800
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 5, :o6, 1085281200
-            tz.transition 2004, 9, :o4, 1096171200
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Rio_Gallegos.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Rio_Gallegos.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Rio_Gallegos.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Rio_Gallegos.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,83 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Rio_Gallegos
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Rio_Gallegos' do |tz|
-            tz.offset :o0, -16612, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 52123666153, 21600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o4, 667965600
-            tz.transition 1991, 10, :o5, 687927600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 6, :o6, 1086058800
-            tz.transition 2004, 6, :o4, 1087704000
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/San_Juan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/San_Juan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/San_Juan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/San_Juan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,84 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module San_Juan
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/San_Juan' do |tz|
-            tz.offset :o0, -16444, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 52123666111, 21600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o6, 667792800
-            tz.transition 1991, 5, :o4, 673588800
-            tz.transition 1991, 10, :o5, 687927600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 5, :o6, 1085972400
-            tz.transition 2004, 7, :o4, 1090728000
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Tucuman.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Tucuman.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Tucuman.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Tucuman.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,83 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Tucuman
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Tucuman' do |tz|
-            tz.offset :o0, -15652, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 52123665913, 21600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o6, 667965600
-            tz.transition 1991, 10, :o5, 687931200
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 6, :o6, 1086058800
-            tz.transition 2004, 6, :o4, 1087099200
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Ushuaia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Ushuaia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Ushuaia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Argentina/Ushuaia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,83 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Ushuaia
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Ushuaia' do |tz|
-            tz.offset :o0, -16392, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 8687277683, 3600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o4, 667965600
-            tz.transition 1991, 10, :o5, 687927600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 5, :o6, 1085886000
-            tz.transition 2004, 6, :o4, 1087704000
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Aruba.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Aruba.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Aruba.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Aruba.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Aruba
-        include TimezoneDefinition
-        
-        timezone 'America/Aruba' do |tz|
-          tz.offset :o0, -16824, 0, :LMT
-          tz.offset :o1, -16200, 0, :ANT
-          tz.offset :o2, -14400, 0, :AST
-          
-          tz.transition 1912, 2, :o1, 8710000901, 3600
-          tz.transition 1965, 1, :o2, 39020187, 16
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Asuncion.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Asuncion.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Asuncion.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Asuncion.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,174 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Asuncion
-        include TimezoneDefinition
-        
-        timezone 'America/Asuncion' do |tz|
-          tz.offset :o0, -13840, 0, :LMT
-          tz.offset :o1, -13840, 0, :AMT
-          tz.offset :o2, -14400, 0, :PYT
-          tz.offset :o3, -10800, 0, :PYT
-          tz.offset :o4, -14400, 3600, :PYST
-          
-          tz.transition 1890, 1, :o1, 2604278153, 1080
-          tz.transition 1931, 10, :o2, 2620754633, 1080
-          tz.transition 1972, 10, :o3, 86760000
-          tz.transition 1974, 4, :o2, 134017200
-          tz.transition 1975, 10, :o4, 181368000
-          tz.transition 1976, 3, :o2, 194497200
-          tz.transition 1976, 10, :o4, 212990400
-          tz.transition 1977, 3, :o2, 226033200
-          tz.transition 1977, 10, :o4, 244526400
-          tz.transition 1978, 3, :o2, 257569200
-          tz.transition 1978, 10, :o4, 276062400
-          tz.transition 1979, 4, :o2, 291783600
-          tz.transition 1979, 10, :o4, 307598400
-          tz.transition 1980, 4, :o2, 323406000
-          tz.transition 1980, 10, :o4, 339220800
-          tz.transition 1981, 4, :o2, 354942000
-          tz.transition 1981, 10, :o4, 370756800
-          tz.transition 1982, 4, :o2, 386478000
-          tz.transition 1982, 10, :o4, 402292800
-          tz.transition 1983, 4, :o2, 418014000
-          tz.transition 1983, 10, :o4, 433828800
-          tz.transition 1984, 4, :o2, 449636400
-          tz.transition 1984, 10, :o4, 465451200
-          tz.transition 1985, 4, :o2, 481172400
-          tz.transition 1985, 10, :o4, 496987200
-          tz.transition 1986, 4, :o2, 512708400
-          tz.transition 1986, 10, :o4, 528523200
-          tz.transition 1987, 4, :o2, 544244400
-          tz.transition 1987, 10, :o4, 560059200
-          tz.transition 1988, 4, :o2, 575866800
-          tz.transition 1988, 10, :o4, 591681600
-          tz.transition 1989, 4, :o2, 607402800
-          tz.transition 1989, 10, :o4, 625032000
-          tz.transition 1990, 4, :o2, 638938800
-          tz.transition 1990, 10, :o4, 654753600
-          tz.transition 1991, 4, :o2, 670474800
-          tz.transition 1991, 10, :o4, 686721600
-          tz.transition 1992, 3, :o2, 699418800
-          tz.transition 1992, 10, :o4, 718257600
-          tz.transition 1993, 3, :o2, 733546800
-          tz.transition 1993, 10, :o4, 749448000
-          tz.transition 1994, 2, :o2, 762318000
-          tz.transition 1994, 10, :o4, 780984000
-          tz.transition 1995, 2, :o2, 793767600
-          tz.transition 1995, 10, :o4, 812520000
-          tz.transition 1996, 3, :o2, 825649200
-          tz.transition 1996, 10, :o4, 844574400
-          tz.transition 1997, 2, :o2, 856666800
-          tz.transition 1997, 10, :o4, 876024000
-          tz.transition 1998, 3, :o2, 888721200
-          tz.transition 1998, 10, :o4, 907473600
-          tz.transition 1999, 3, :o2, 920775600
-          tz.transition 1999, 10, :o4, 938923200
-          tz.transition 2000, 3, :o2, 952225200
-          tz.transition 2000, 10, :o4, 970372800
-          tz.transition 2001, 3, :o2, 983674800
-          tz.transition 2001, 10, :o4, 1002427200
-          tz.transition 2002, 4, :o2, 1018148400
-          tz.transition 2002, 9, :o4, 1030852800
-          tz.transition 2003, 4, :o2, 1049598000
-          tz.transition 2003, 9, :o4, 1062907200
-          tz.transition 2004, 4, :o2, 1081047600
-          tz.transition 2004, 10, :o4, 1097985600
-          tz.transition 2005, 3, :o2, 1110682800
-          tz.transition 2005, 10, :o4, 1129435200
-          tz.transition 2006, 3, :o2, 1142132400
-          tz.transition 2006, 10, :o4, 1160884800
-          tz.transition 2007, 3, :o2, 1173582000
-          tz.transition 2007, 10, :o4, 1192939200
-          tz.transition 2008, 3, :o2, 1205031600
-          tz.transition 2008, 10, :o4, 1224388800
-          tz.transition 2009, 3, :o2, 1236481200
-          tz.transition 2009, 10, :o4, 1255838400
-          tz.transition 2010, 3, :o2, 1268535600
-          tz.transition 2010, 10, :o4, 1287288000
-          tz.transition 2011, 3, :o2, 1299985200
-          tz.transition 2011, 10, :o4, 1318737600
-          tz.transition 2012, 3, :o2, 1331434800
-          tz.transition 2012, 10, :o4, 1350792000
-          tz.transition 2013, 3, :o2, 1362884400
-          tz.transition 2013, 10, :o4, 1382241600
-          tz.transition 2014, 3, :o2, 1394334000
-          tz.transition 2014, 10, :o4, 1413691200
-          tz.transition 2015, 3, :o2, 1425783600
-          tz.transition 2015, 10, :o4, 1445140800
-          tz.transition 2016, 3, :o2, 1457838000
-          tz.transition 2016, 10, :o4, 1476590400
-          tz.transition 2017, 3, :o2, 1489287600
-          tz.transition 2017, 10, :o4, 1508040000
-          tz.transition 2018, 3, :o2, 1520737200
-          tz.transition 2018, 10, :o4, 1540094400
-          tz.transition 2019, 3, :o2, 1552186800
-          tz.transition 2019, 10, :o4, 1571544000
-          tz.transition 2020, 3, :o2, 1583636400
-          tz.transition 2020, 10, :o4, 1602993600
-          tz.transition 2021, 3, :o2, 1615690800
-          tz.transition 2021, 10, :o4, 1634443200
-          tz.transition 2022, 3, :o2, 1647140400
-          tz.transition 2022, 10, :o4, 1665892800
-          tz.transition 2023, 3, :o2, 1678590000
-          tz.transition 2023, 10, :o4, 1697342400
-          tz.transition 2024, 3, :o2, 1710039600
-          tz.transition 2024, 10, :o4, 1729396800
-          tz.transition 2025, 3, :o2, 1741489200
-          tz.transition 2025, 10, :o4, 1760846400
-          tz.transition 2026, 3, :o2, 1772938800
-          tz.transition 2026, 10, :o4, 1792296000
-          tz.transition 2027, 3, :o2, 1804993200
-          tz.transition 2027, 10, :o4, 1823745600
-          tz.transition 2028, 3, :o2, 1836442800
-          tz.transition 2028, 10, :o4, 1855195200
-          tz.transition 2029, 3, :o2, 1867892400
-          tz.transition 2029, 10, :o4, 1887249600
-          tz.transition 2030, 3, :o2, 1899342000
-          tz.transition 2030, 10, :o4, 1918699200
-          tz.transition 2031, 3, :o2, 1930791600
-          tz.transition 2031, 10, :o4, 1950148800
-          tz.transition 2032, 3, :o2, 1962846000
-          tz.transition 2032, 10, :o4, 1981598400
-          tz.transition 2033, 3, :o2, 1994295600
-          tz.transition 2033, 10, :o4, 2013048000
-          tz.transition 2034, 3, :o2, 2025745200
-          tz.transition 2034, 10, :o4, 2044497600
-          tz.transition 2035, 3, :o2, 2057194800
-          tz.transition 2035, 10, :o4, 2076552000
-          tz.transition 2036, 3, :o2, 2088644400
-          tz.transition 2036, 10, :o4, 2108001600
-          tz.transition 2037, 3, :o2, 2120094000
-          tz.transition 2037, 10, :o4, 2139451200
-          tz.transition 2038, 3, :o2, 19723973, 8
-          tz.transition 2038, 10, :o4, 7397141, 3
-          tz.transition 2039, 3, :o2, 19726885, 8
-          tz.transition 2039, 10, :o4, 7398233, 3
-          tz.transition 2040, 3, :o2, 19729797, 8
-          tz.transition 2040, 10, :o4, 7399346, 3
-          tz.transition 2041, 3, :o2, 19732709, 8
-          tz.transition 2041, 10, :o4, 7400438, 3
-          tz.transition 2042, 3, :o2, 19735621, 8
-          tz.transition 2042, 10, :o4, 7401530, 3
-          tz.transition 2043, 3, :o2, 19738533, 8
-          tz.transition 2043, 10, :o4, 7402622, 3
-          tz.transition 2044, 3, :o2, 19741501, 8
-          tz.transition 2044, 10, :o4, 7403714, 3
-          tz.transition 2045, 3, :o2, 19744413, 8
-          tz.transition 2045, 10, :o4, 7404806, 3
-          tz.transition 2046, 3, :o2, 19747325, 8
-          tz.transition 2046, 10, :o4, 7405919, 3
-          tz.transition 2047, 3, :o2, 19750237, 8
-          tz.transition 2047, 10, :o4, 7407011, 3
-          tz.transition 2048, 3, :o2, 19753149, 8
-          tz.transition 2048, 10, :o4, 7408103, 3
-          tz.transition 2049, 3, :o2, 19756117, 8
-          tz.transition 2049, 10, :o4, 7409195, 3
-          tz.transition 2050, 3, :o2, 19759029, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atikokan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atikokan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atikokan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atikokan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,28 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Atikokan
-        include TimezoneDefinition
-        
-        timezone 'America/Atikokan' do |tz|
-          tz.offset :o0, -21988, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -21600, 3600, :CWT
-          tz.offset :o4, -21600, 3600, :CPT
-          tz.offset :o5, -18000, 0, :EST
-          
-          tz.transition 1895, 1, :o1, 52125006697, 21600
-          tz.transition 1918, 4, :o2, 14530187, 6
-          tz.transition 1918, 10, :o1, 58125547, 24
-          tz.transition 1940, 9, :o2, 9719607, 4
-          tz.transition 1942, 2, :o3, 14582399, 6
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o5, 58361491, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atka.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atka.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atka.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Atka.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Atka
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Atka', 'America/Adak'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bahia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bahia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bahia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bahia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,77 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Bahia
-        include TimezoneDefinition
-        
-        timezone 'America/Bahia' do |tz|
-          tz.offset :o0, -9244, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 52274885911, 21600
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 12, :o2, 19506981, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-          tz.transition 1988, 10, :o2, 592974000
-          tz.transition 1989, 1, :o1, 602042400
-          tz.transition 1989, 10, :o2, 624423600
-          tz.transition 1990, 2, :o1, 634701600
-          tz.transition 1990, 10, :o2, 656478000
-          tz.transition 1991, 2, :o1, 666756000
-          tz.transition 1991, 10, :o2, 687927600
-          tz.transition 1992, 2, :o1, 697600800
-          tz.transition 1992, 10, :o2, 719982000
-          tz.transition 1993, 1, :o1, 728445600
-          tz.transition 1993, 10, :o2, 750826800
-          tz.transition 1994, 2, :o1, 761709600
-          tz.transition 1994, 10, :o2, 782276400
-          tz.transition 1995, 2, :o1, 793159200
-          tz.transition 1995, 10, :o2, 813726000
-          tz.transition 1996, 2, :o1, 824004000
-          tz.transition 1996, 10, :o2, 844570800
-          tz.transition 1997, 2, :o1, 856058400
-          tz.transition 1997, 10, :o2, 876106800
-          tz.transition 1998, 3, :o1, 888717600
-          tz.transition 1998, 10, :o2, 908074800
-          tz.transition 1999, 2, :o1, 919562400
-          tz.transition 1999, 10, :o2, 938919600
-          tz.transition 2000, 2, :o1, 951616800
-          tz.transition 2000, 10, :o2, 970974000
-          tz.transition 2001, 2, :o1, 982461600
-          tz.transition 2001, 10, :o2, 1003028400
-          tz.transition 2002, 2, :o1, 1013911200
-          tz.transition 2002, 11, :o2, 1036292400
-          tz.transition 2003, 2, :o1, 1045360800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Barbados.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Barbados.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Barbados.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Barbados.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,29 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Barbados
-        include TimezoneDefinition
-        
-        timezone 'America/Barbados' do |tz|
-          tz.offset :o0, -14308, 0, :LMT
-          tz.offset :o1, -14308, 0, :BMT
-          tz.offset :o2, -14400, 0, :AST
-          tz.offset :o3, -14400, 3600, :ADT
-          
-          tz.transition 1924, 1, :o1, 52353770377, 21600
-          tz.transition 1932, 1, :o2, 52416885577, 21600
-          tz.transition 1977, 6, :o3, 234943200
-          tz.transition 1977, 10, :o2, 244616400
-          tz.transition 1978, 4, :o3, 261554400
-          tz.transition 1978, 10, :o2, 276066000
-          tz.transition 1979, 4, :o3, 293004000
-          tz.transition 1979, 9, :o2, 307515600
-          tz.transition 1980, 4, :o3, 325058400
-          tz.transition 1980, 9, :o2, 338706000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belem.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belem.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belem.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belem.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Belem
-        include TimezoneDefinition
-        
-        timezone 'America/Belem' do |tz|
-          tz.offset :o0, -11636, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 52274886509, 21600
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 12, :o2, 19506981, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belize.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belize.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belize.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Belize.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,74 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Belize
-        include TimezoneDefinition
-        
-        timezone 'America/Belize' do |tz|
-          tz.offset :o0, -21168, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 1800, :CHDT
-          tz.offset :o3, -21600, 3600, :CDT
-          
-          tz.transition 1912, 4, :o1, 483898749, 200
-          tz.transition 1918, 10, :o2, 9687491, 4
-          tz.transition 1919, 2, :o1, 116255939, 48
-          tz.transition 1919, 10, :o2, 9688947, 4
-          tz.transition 1920, 2, :o1, 116273747, 48
-          tz.transition 1920, 10, :o2, 9690403, 4
-          tz.transition 1921, 2, :o1, 116291219, 48
-          tz.transition 1921, 10, :o2, 9691859, 4
-          tz.transition 1922, 2, :o1, 116308691, 48
-          tz.transition 1922, 10, :o2, 9693343, 4
-          tz.transition 1923, 2, :o1, 116326163, 48
-          tz.transition 1923, 10, :o2, 9694799, 4
-          tz.transition 1924, 2, :o1, 116343635, 48
-          tz.transition 1924, 10, :o2, 9696255, 4
-          tz.transition 1925, 2, :o1, 116361443, 48
-          tz.transition 1925, 10, :o2, 9697711, 4
-          tz.transition 1926, 2, :o1, 116378915, 48
-          tz.transition 1926, 10, :o2, 9699167, 4
-          tz.transition 1927, 2, :o1, 116396387, 48
-          tz.transition 1927, 10, :o2, 9700623, 4
-          tz.transition 1928, 2, :o1, 116413859, 48
-          tz.transition 1928, 10, :o2, 9702107, 4
-          tz.transition 1929, 2, :o1, 116431331, 48
-          tz.transition 1929, 10, :o2, 9703563, 4
-          tz.transition 1930, 2, :o1, 116448803, 48
-          tz.transition 1930, 10, :o2, 9705019, 4
-          tz.transition 1931, 2, :o1, 116466611, 48
-          tz.transition 1931, 10, :o2, 9706475, 4
-          tz.transition 1932, 2, :o1, 116484083, 48
-          tz.transition 1932, 10, :o2, 9707931, 4
-          tz.transition 1933, 2, :o1, 116501555, 48
-          tz.transition 1933, 10, :o2, 9709415, 4
-          tz.transition 1934, 2, :o1, 116519027, 48
-          tz.transition 1934, 10, :o2, 9710871, 4
-          tz.transition 1935, 2, :o1, 116536499, 48
-          tz.transition 1935, 10, :o2, 9712327, 4
-          tz.transition 1936, 2, :o1, 116553971, 48
-          tz.transition 1936, 10, :o2, 9713783, 4
-          tz.transition 1937, 2, :o1, 116571779, 48
-          tz.transition 1937, 10, :o2, 9715239, 4
-          tz.transition 1938, 2, :o1, 116589251, 48
-          tz.transition 1938, 10, :o2, 9716695, 4
-          tz.transition 1939, 2, :o1, 116606723, 48
-          tz.transition 1939, 10, :o2, 9718179, 4
-          tz.transition 1940, 2, :o1, 116624195, 48
-          tz.transition 1940, 10, :o2, 9719635, 4
-          tz.transition 1941, 2, :o1, 116641667, 48
-          tz.transition 1941, 10, :o2, 9721091, 4
-          tz.transition 1942, 2, :o1, 116659475, 48
-          tz.transition 1942, 10, :o2, 9722547, 4
-          tz.transition 1943, 2, :o1, 116676947, 48
-          tz.transition 1973, 12, :o3, 123919200
-          tz.transition 1974, 2, :o1, 129618000
-          tz.transition 1982, 12, :o3, 409039200
-          tz.transition 1983, 2, :o1, 413874000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Blanc__m__Sablon.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Blanc__m__Sablon.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Blanc__m__Sablon.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Blanc__m__Sablon.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,26 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Blanc__m__Sablon
-        include TimezoneDefinition
-        
-        timezone 'America/Blanc-Sablon' do |tz|
-          tz.offset :o0, -13708, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          tz.offset :o3, -14400, 3600, :AWT
-          tz.offset :o4, -14400, 3600, :APT
-          
-          tz.transition 1884, 1, :o1, 52038215827, 21600
-          tz.transition 1918, 4, :o2, 9686791, 4
-          tz.transition 1918, 10, :o1, 58125545, 24
-          tz.transition 1942, 2, :o3, 9721599, 4
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361489, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boa_Vista.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boa_Vista.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boa_Vista.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boa_Vista.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,51 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Boa_Vista
-        include TimezoneDefinition
-        
-        timezone 'America/Boa_Vista' do |tz|
-          tz.offset :o0, -14560, 0, :LMT
-          tz.offset :o1, -14400, 0, :AMT
-          tz.offset :o2, -14400, 3600, :AMST
-          
-          tz.transition 1914, 1, :o1, 1306872181, 540
-          tz.transition 1931, 10, :o2, 19412945, 8
-          tz.transition 1932, 4, :o1, 19414389, 8
-          tz.transition 1932, 10, :o2, 7280951, 3
-          tz.transition 1933, 4, :o1, 19417309, 8
-          tz.transition 1949, 12, :o2, 7299755, 3
-          tz.transition 1950, 4, :o1, 7300163, 3
-          tz.transition 1950, 12, :o2, 7300850, 3
-          tz.transition 1951, 4, :o1, 19469901, 8
-          tz.transition 1951, 12, :o2, 7301945, 3
-          tz.transition 1952, 4, :o1, 19472829, 8
-          tz.transition 1952, 12, :o2, 7303043, 3
-          tz.transition 1953, 3, :o1, 19475501, 8
-          tz.transition 1963, 12, :o2, 7315118, 3
-          tz.transition 1964, 3, :o1, 19507645, 8
-          tz.transition 1965, 1, :o2, 7316375, 3
-          tz.transition 1965, 3, :o1, 19510805, 8
-          tz.transition 1965, 12, :o2, 7317287, 3
-          tz.transition 1966, 3, :o1, 19513485, 8
-          tz.transition 1966, 11, :o2, 7318292, 3
-          tz.transition 1967, 3, :o1, 19516405, 8
-          tz.transition 1967, 11, :o2, 7319387, 3
-          tz.transition 1968, 3, :o1, 19519333, 8
-          tz.transition 1985, 11, :o2, 499752000
-          tz.transition 1986, 3, :o1, 511239600
-          tz.transition 1986, 10, :o2, 530596800
-          tz.transition 1987, 2, :o1, 540270000
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 2, :o1, 571201200
-          tz.transition 1999, 10, :o2, 938923200
-          tz.transition 2000, 2, :o1, 951620400
-          tz.transition 2000, 10, :o2, 970977600
-          tz.transition 2000, 10, :o1, 971578800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bogota.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bogota.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bogota.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Bogota.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Bogota
-        include TimezoneDefinition
-        
-        timezone 'America/Bogota' do |tz|
-          tz.offset :o0, -17780, 0, :LMT
-          tz.offset :o1, -17780, 0, :BMT
-          tz.offset :o2, -18000, 0, :COT
-          tz.offset :o3, -18000, 3600, :COST
-          
-          tz.transition 1884, 3, :o1, 10407954409, 4320
-          tz.transition 1914, 11, :o2, 10456385929, 4320
-          tz.transition 1992, 5, :o3, 704869200
-          tz.transition 1993, 4, :o2, 733896000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boise.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boise.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boise.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Boise.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,199 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Boise
-        include TimezoneDefinition
-        
-        timezone 'America/Boise' do |tz|
-          tz.offset :o0, -27889, 0, :LMT
-          tz.offset :o1, -28800, 0, :PST
-          tz.offset :o2, -28800, 3600, :PDT
-          tz.offset :o3, -25200, 0, :MST
-          tz.offset :o4, -25200, 3600, :MWT
-          tz.offset :o5, -25200, 3600, :MPT
-          tz.offset :o6, -25200, 3600, :MDT
-          
-          tz.transition 1883, 11, :o1, 7227400, 3
-          tz.transition 1918, 3, :o2, 29060207, 12
-          tz.transition 1918, 10, :o1, 19375151, 8
-          tz.transition 1919, 3, :o2, 29064575, 12
-          tz.transition 1919, 10, :o1, 19378063, 8
-          tz.transition 1923, 5, :o3, 29082635, 12
-          tz.transition 1942, 2, :o4, 19443199, 8
-          tz.transition 1945, 8, :o5, 58360379, 24
-          tz.transition 1945, 9, :o3, 14590373, 6
-          tz.transition 1967, 4, :o6, 19516887, 8
-          tz.transition 1967, 10, :o3, 14638757, 6
-          tz.transition 1968, 4, :o6, 19519799, 8
-          tz.transition 1968, 10, :o3, 14640941, 6
-          tz.transition 1969, 4, :o6, 19522711, 8
-          tz.transition 1969, 10, :o3, 14643125, 6
-          tz.transition 1970, 4, :o6, 9968400
-          tz.transition 1970, 10, :o3, 25689600
-          tz.transition 1971, 4, :o6, 41418000
-          tz.transition 1971, 10, :o3, 57744000
-          tz.transition 1972, 4, :o6, 73472400
-          tz.transition 1972, 10, :o3, 89193600
-          tz.transition 1973, 4, :o6, 104922000
-          tz.transition 1973, 10, :o3, 120643200
-          tz.transition 1974, 2, :o6, 129114000
-          tz.transition 1974, 10, :o3, 152092800
-          tz.transition 1975, 2, :o6, 162378000
-          tz.transition 1975, 10, :o3, 183542400
-          tz.transition 1976, 4, :o6, 199270800
-          tz.transition 1976, 10, :o3, 215596800
-          tz.transition 1977, 4, :o6, 230720400
-          tz.transition 1977, 10, :o3, 247046400
-          tz.transition 1978, 4, :o6, 262774800
-          tz.transition 1978, 10, :o3, 278496000
-          tz.transition 1979, 4, :o6, 294224400
-          tz.transition 1979, 10, :o3, 309945600
-          tz.transition 1980, 4, :o6, 325674000
-          tz.transition 1980, 10, :o3, 341395200
-          tz.transition 1981, 4, :o6, 357123600
-          tz.transition 1981, 10, :o3, 372844800
-          tz.transition 1982, 4, :o6, 388573200
-          tz.transition 1982, 10, :o3, 404899200
-          tz.transition 1983, 4, :o6, 420022800
-          tz.transition 1983, 10, :o3, 436348800
-          tz.transition 1984, 4, :o6, 452077200
-          tz.transition 1984, 10, :o3, 467798400
-          tz.transition 1985, 4, :o6, 483526800
-          tz.transition 1985, 10, :o3, 499248000
-          tz.transition 1986, 4, :o6, 514976400
-          tz.transition 1986, 10, :o3, 530697600
-          tz.transition 1987, 4, :o6, 544611600
-          tz.transition 1987, 10, :o3, 562147200
-          tz.transition 1988, 4, :o6, 576061200
-          tz.transition 1988, 10, :o3, 594201600
-          tz.transition 1989, 4, :o6, 607510800
-          tz.transition 1989, 10, :o3, 625651200
-          tz.transition 1990, 4, :o6, 638960400
-          tz.transition 1990, 10, :o3, 657100800
-          tz.transition 1991, 4, :o6, 671014800
-          tz.transition 1991, 10, :o3, 688550400
-          tz.transition 1992, 4, :o6, 702464400
-          tz.transition 1992, 10, :o3, 720000000
-          tz.transition 1993, 4, :o6, 733914000
-          tz.transition 1993, 10, :o3, 752054400
-          tz.transition 1994, 4, :o6, 765363600
-          tz.transition 1994, 10, :o3, 783504000
-          tz.transition 1995, 4, :o6, 796813200
-          tz.transition 1995, 10, :o3, 814953600
-          tz.transition 1996, 4, :o6, 828867600
-          tz.transition 1996, 10, :o3, 846403200
-          tz.transition 1997, 4, :o6, 860317200
-          tz.transition 1997, 10, :o3, 877852800
-          tz.transition 1998, 4, :o6, 891766800
-          tz.transition 1998, 10, :o3, 909302400
-          tz.transition 1999, 4, :o6, 923216400
-          tz.transition 1999, 10, :o3, 941356800
-          tz.transition 2000, 4, :o6, 954666000
-          tz.transition 2000, 10, :o3, 972806400
-          tz.transition 2001, 4, :o6, 986115600
-          tz.transition 2001, 10, :o3, 1004256000
-          tz.transition 2002, 4, :o6, 1018170000
-          tz.transition 2002, 10, :o3, 1035705600
-          tz.transition 2003, 4, :o6, 1049619600
-          tz.transition 2003, 10, :o3, 1067155200
-          tz.transition 2004, 4, :o6, 1081069200
-          tz.transition 2004, 10, :o3, 1099209600
-          tz.transition 2005, 4, :o6, 1112518800
-          tz.transition 2005, 10, :o3, 1130659200
-          tz.transition 2006, 4, :o6, 1143968400
-          tz.transition 2006, 10, :o3, 1162108800
-          tz.transition 2007, 3, :o6, 1173603600
-          tz.transition 2007, 11, :o3, 1194163200
-          tz.transition 2008, 3, :o6, 1205053200
-          tz.transition 2008, 11, :o3, 1225612800
-          tz.transition 2009, 3, :o6, 1236502800
-          tz.transition 2009, 11, :o3, 1257062400
-          tz.transition 2010, 3, :o6, 1268557200
-          tz.transition 2010, 11, :o3, 1289116800
-          tz.transition 2011, 3, :o6, 1300006800
-          tz.transition 2011, 11, :o3, 1320566400
-          tz.transition 2012, 3, :o6, 1331456400
-          tz.transition 2012, 11, :o3, 1352016000
-          tz.transition 2013, 3, :o6, 1362906000
-          tz.transition 2013, 11, :o3, 1383465600
-          tz.transition 2014, 3, :o6, 1394355600
-          tz.transition 2014, 11, :o3, 1414915200
-          tz.transition 2015, 3, :o6, 1425805200
-          tz.transition 2015, 11, :o3, 1446364800
-          tz.transition 2016, 3, :o6, 1457859600
-          tz.transition 2016, 11, :o3, 1478419200
-          tz.transition 2017, 3, :o6, 1489309200
-          tz.transition 2017, 11, :o3, 1509868800
-          tz.transition 2018, 3, :o6, 1520758800
-          tz.transition 2018, 11, :o3, 1541318400
-          tz.transition 2019, 3, :o6, 1552208400
-          tz.transition 2019, 11, :o3, 1572768000
-          tz.transition 2020, 3, :o6, 1583658000
-          tz.transition 2020, 11, :o3, 1604217600
-          tz.transition 2021, 3, :o6, 1615712400
-          tz.transition 2021, 11, :o3, 1636272000
-          tz.transition 2022, 3, :o6, 1647162000
-          tz.transition 2022, 11, :o3, 1667721600
-          tz.transition 2023, 3, :o6, 1678611600
-          tz.transition 2023, 11, :o3, 1699171200
-          tz.transition 2024, 3, :o6, 1710061200
-          tz.transition 2024, 11, :o3, 1730620800
-          tz.transition 2025, 3, :o6, 1741510800
-          tz.transition 2025, 11, :o3, 1762070400
-          tz.transition 2026, 3, :o6, 1772960400
-          tz.transition 2026, 11, :o3, 1793520000
-          tz.transition 2027, 3, :o6, 1805014800
-          tz.transition 2027, 11, :o3, 1825574400
-          tz.transition 2028, 3, :o6, 1836464400
-          tz.transition 2028, 11, :o3, 1857024000
-          tz.transition 2029, 3, :o6, 1867914000
-          tz.transition 2029, 11, :o3, 1888473600
-          tz.transition 2030, 3, :o6, 1899363600
-          tz.transition 2030, 11, :o3, 1919923200
-          tz.transition 2031, 3, :o6, 1930813200
-          tz.transition 2031, 11, :o3, 1951372800
-          tz.transition 2032, 3, :o6, 1962867600
-          tz.transition 2032, 11, :o3, 1983427200
-          tz.transition 2033, 3, :o6, 1994317200
-          tz.transition 2033, 11, :o3, 2014876800
-          tz.transition 2034, 3, :o6, 2025766800
-          tz.transition 2034, 11, :o3, 2046326400
-          tz.transition 2035, 3, :o6, 2057216400
-          tz.transition 2035, 11, :o3, 2077776000
-          tz.transition 2036, 3, :o6, 2088666000
-          tz.transition 2036, 11, :o3, 2109225600
-          tz.transition 2037, 3, :o6, 2120115600
-          tz.transition 2037, 11, :o3, 2140675200
-          tz.transition 2038, 3, :o6, 19723975, 8
-          tz.transition 2038, 11, :o3, 14794409, 6
-          tz.transition 2039, 3, :o6, 19726887, 8
-          tz.transition 2039, 11, :o3, 14796593, 6
-          tz.transition 2040, 3, :o6, 19729799, 8
-          tz.transition 2040, 11, :o3, 14798777, 6
-          tz.transition 2041, 3, :o6, 19732711, 8
-          tz.transition 2041, 11, :o3, 14800961, 6
-          tz.transition 2042, 3, :o6, 19735623, 8
-          tz.transition 2042, 11, :o3, 14803145, 6
-          tz.transition 2043, 3, :o6, 19738535, 8
-          tz.transition 2043, 11, :o3, 14805329, 6
-          tz.transition 2044, 3, :o6, 19741503, 8
-          tz.transition 2044, 11, :o3, 14807555, 6
-          tz.transition 2045, 3, :o6, 19744415, 8
-          tz.transition 2045, 11, :o3, 14809739, 6
-          tz.transition 2046, 3, :o6, 19747327, 8
-          tz.transition 2046, 11, :o3, 14811923, 6
-          tz.transition 2047, 3, :o6, 19750239, 8
-          tz.transition 2047, 11, :o3, 14814107, 6
-          tz.transition 2048, 3, :o6, 19753151, 8
-          tz.transition 2048, 11, :o3, 14816291, 6
-          tz.transition 2049, 3, :o6, 19756119, 8
-          tz.transition 2049, 11, :o3, 14818517, 6
-          tz.transition 2050, 3, :o6, 19759031, 8
-          tz.transition 2050, 11, :o3, 14820701, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Buenos_Aires.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Buenos_Aires.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Buenos_Aires.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Buenos_Aires.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Buenos_Aires
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Buenos_Aires', 'America/Argentina/Buenos_Aires'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cambridge_Bay.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cambridge_Bay.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cambridge_Bay.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cambridge_Bay.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,177 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Cambridge_Bay
-        include TimezoneDefinition
-        
-        timezone 'America/Cambridge_Bay' do |tz|
-          tz.offset :o0, -25220, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          tz.offset :o5, -25200, 7200, :MDDT
-          tz.offset :o6, -21600, 0, :CST
-          tz.offset :o7, -21600, 3600, :CDT
-          tz.offset :o8, -18000, 0, :EST
-          
-          tz.transition 1884, 1, :o1, 10407643741, 4320
-          tz.transition 1918, 4, :o2, 19373583, 8
-          tz.transition 1918, 10, :o1, 14531363, 6
-          tz.transition 1919, 5, :o2, 19376831, 8
-          tz.transition 1919, 11, :o1, 9689055, 4
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1965, 4, :o5, 58533019, 24
-          tz.transition 1965, 10, :o1, 58537555, 24
-          tz.transition 1980, 4, :o2, 325674000
-          tz.transition 1980, 10, :o1, 341395200
-          tz.transition 1981, 4, :o2, 357123600
-          tz.transition 1981, 10, :o1, 372844800
-          tz.transition 1982, 4, :o2, 388573200
-          tz.transition 1982, 10, :o1, 404899200
-          tz.transition 1983, 4, :o2, 420022800
-          tz.transition 1983, 10, :o1, 436348800
-          tz.transition 1984, 4, :o2, 452077200
-          tz.transition 1984, 10, :o1, 467798400
-          tz.transition 1985, 4, :o2, 483526800
-          tz.transition 1985, 10, :o1, 499248000
-          tz.transition 1986, 4, :o2, 514976400
-          tz.transition 1986, 10, :o1, 530697600
-          tz.transition 1987, 4, :o2, 544611600
-          tz.transition 1987, 10, :o1, 562147200
-          tz.transition 1988, 4, :o2, 576061200
-          tz.transition 1988, 10, :o1, 594201600
-          tz.transition 1989, 4, :o2, 607510800
-          tz.transition 1989, 10, :o1, 625651200
-          tz.transition 1990, 4, :o2, 638960400
-          tz.transition 1990, 10, :o1, 657100800
-          tz.transition 1991, 4, :o2, 671014800
-          tz.transition 1991, 10, :o1, 688550400
-          tz.transition 1992, 4, :o2, 702464400
-          tz.transition 1992, 10, :o1, 720000000
-          tz.transition 1993, 4, :o2, 733914000
-          tz.transition 1993, 10, :o1, 752054400
-          tz.transition 1994, 4, :o2, 765363600
-          tz.transition 1994, 10, :o1, 783504000
-          tz.transition 1995, 4, :o2, 796813200
-          tz.transition 1995, 10, :o1, 814953600
-          tz.transition 1996, 4, :o2, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o2, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o2, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o2, 923216400
-          tz.transition 1999, 10, :o6, 941356800
-          tz.transition 2000, 4, :o7, 954662400
-          tz.transition 2000, 10, :o8, 972802800
-          tz.transition 2000, 11, :o6, 973400400
-          tz.transition 2001, 4, :o2, 986115600
-          tz.transition 2001, 10, :o1, 1004256000
-          tz.transition 2002, 4, :o2, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o2, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o2, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o2, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o2, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 3, :o2, 1173603600
-          tz.transition 2007, 11, :o1, 1194163200
-          tz.transition 2008, 3, :o2, 1205053200
-          tz.transition 2008, 11, :o1, 1225612800
-          tz.transition 2009, 3, :o2, 1236502800
-          tz.transition 2009, 11, :o1, 1257062400
-          tz.transition 2010, 3, :o2, 1268557200
-          tz.transition 2010, 11, :o1, 1289116800
-          tz.transition 2011, 3, :o2, 1300006800
-          tz.transition 2011, 11, :o1, 1320566400
-          tz.transition 2012, 3, :o2, 1331456400
-          tz.transition 2012, 11, :o1, 1352016000
-          tz.transition 2013, 3, :o2, 1362906000
-          tz.transition 2013, 11, :o1, 1383465600
-          tz.transition 2014, 3, :o2, 1394355600
-          tz.transition 2014, 11, :o1, 1414915200
-          tz.transition 2015, 3, :o2, 1425805200
-          tz.transition 2015, 11, :o1, 1446364800
-          tz.transition 2016, 3, :o2, 1457859600
-          tz.transition 2016, 11, :o1, 1478419200
-          tz.transition 2017, 3, :o2, 1489309200
-          tz.transition 2017, 11, :o1, 1509868800
-          tz.transition 2018, 3, :o2, 1520758800
-          tz.transition 2018, 11, :o1, 1541318400
-          tz.transition 2019, 3, :o2, 1552208400
-          tz.transition 2019, 11, :o1, 1572768000
-          tz.transition 2020, 3, :o2, 1583658000
-          tz.transition 2020, 11, :o1, 1604217600
-          tz.transition 2021, 3, :o2, 1615712400
-          tz.transition 2021, 11, :o1, 1636272000
-          tz.transition 2022, 3, :o2, 1647162000
-          tz.transition 2022, 11, :o1, 1667721600
-          tz.transition 2023, 3, :o2, 1678611600
-          tz.transition 2023, 11, :o1, 1699171200
-          tz.transition 2024, 3, :o2, 1710061200
-          tz.transition 2024, 11, :o1, 1730620800
-          tz.transition 2025, 3, :o2, 1741510800
-          tz.transition 2025, 11, :o1, 1762070400
-          tz.transition 2026, 3, :o2, 1772960400
-          tz.transition 2026, 11, :o1, 1793520000
-          tz.transition 2027, 3, :o2, 1805014800
-          tz.transition 2027, 11, :o1, 1825574400
-          tz.transition 2028, 3, :o2, 1836464400
-          tz.transition 2028, 11, :o1, 1857024000
-          tz.transition 2029, 3, :o2, 1867914000
-          tz.transition 2029, 11, :o1, 1888473600
-          tz.transition 2030, 3, :o2, 1899363600
-          tz.transition 2030, 11, :o1, 1919923200
-          tz.transition 2031, 3, :o2, 1930813200
-          tz.transition 2031, 11, :o1, 1951372800
-          tz.transition 2032, 3, :o2, 1962867600
-          tz.transition 2032, 11, :o1, 1983427200
-          tz.transition 2033, 3, :o2, 1994317200
-          tz.transition 2033, 11, :o1, 2014876800
-          tz.transition 2034, 3, :o2, 2025766800
-          tz.transition 2034, 11, :o1, 2046326400
-          tz.transition 2035, 3, :o2, 2057216400
-          tz.transition 2035, 11, :o1, 2077776000
-          tz.transition 2036, 3, :o2, 2088666000
-          tz.transition 2036, 11, :o1, 2109225600
-          tz.transition 2037, 3, :o2, 2120115600
-          tz.transition 2037, 11, :o1, 2140675200
-          tz.transition 2038, 3, :o2, 19723975, 8
-          tz.transition 2038, 11, :o1, 14794409, 6
-          tz.transition 2039, 3, :o2, 19726887, 8
-          tz.transition 2039, 11, :o1, 14796593, 6
-          tz.transition 2040, 3, :o2, 19729799, 8
-          tz.transition 2040, 11, :o1, 14798777, 6
-          tz.transition 2041, 3, :o2, 19732711, 8
-          tz.transition 2041, 11, :o1, 14800961, 6
-          tz.transition 2042, 3, :o2, 19735623, 8
-          tz.transition 2042, 11, :o1, 14803145, 6
-          tz.transition 2043, 3, :o2, 19738535, 8
-          tz.transition 2043, 11, :o1, 14805329, 6
-          tz.transition 2044, 3, :o2, 19741503, 8
-          tz.transition 2044, 11, :o1, 14807555, 6
-          tz.transition 2045, 3, :o2, 19744415, 8
-          tz.transition 2045, 11, :o1, 14809739, 6
-          tz.transition 2046, 3, :o2, 19747327, 8
-          tz.transition 2046, 11, :o1, 14811923, 6
-          tz.transition 2047, 3, :o2, 19750239, 8
-          tz.transition 2047, 11, :o1, 14814107, 6
-          tz.transition 2048, 3, :o2, 19753151, 8
-          tz.transition 2048, 11, :o1, 14816291, 6
-          tz.transition 2049, 3, :o2, 19756119, 8
-          tz.transition 2049, 11, :o1, 14818517, 6
-          tz.transition 2050, 3, :o2, 19759031, 8
-          tz.transition 2050, 11, :o1, 14820701, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Campo_Grande.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Campo_Grande.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Campo_Grande.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Campo_Grande.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,171 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Campo_Grande
-        include TimezoneDefinition
-        
-        timezone 'America/Campo_Grande' do |tz|
-          tz.offset :o0, -13108, 0, :LMT
-          tz.offset :o1, -14400, 0, :AMT
-          tz.offset :o2, -14400, 3600, :AMST
-          
-          tz.transition 1914, 1, :o1, 52274886877, 21600
-          tz.transition 1931, 10, :o2, 19412945, 8
-          tz.transition 1932, 4, :o1, 19414389, 8
-          tz.transition 1932, 10, :o2, 7280951, 3
-          tz.transition 1933, 4, :o1, 19417309, 8
-          tz.transition 1949, 12, :o2, 7299755, 3
-          tz.transition 1950, 4, :o1, 7300163, 3
-          tz.transition 1950, 12, :o2, 7300850, 3
-          tz.transition 1951, 4, :o1, 19469901, 8
-          tz.transition 1951, 12, :o2, 7301945, 3
-          tz.transition 1952, 4, :o1, 19472829, 8
-          tz.transition 1952, 12, :o2, 7303043, 3
-          tz.transition 1953, 3, :o1, 19475501, 8
-          tz.transition 1963, 12, :o2, 7315118, 3
-          tz.transition 1964, 3, :o1, 19507645, 8
-          tz.transition 1965, 1, :o2, 7316375, 3
-          tz.transition 1965, 3, :o1, 19510805, 8
-          tz.transition 1965, 12, :o2, 7317287, 3
-          tz.transition 1966, 3, :o1, 19513485, 8
-          tz.transition 1966, 11, :o2, 7318292, 3
-          tz.transition 1967, 3, :o1, 19516405, 8
-          tz.transition 1967, 11, :o2, 7319387, 3
-          tz.transition 1968, 3, :o1, 19519333, 8
-          tz.transition 1985, 11, :o2, 499752000
-          tz.transition 1986, 3, :o1, 511239600
-          tz.transition 1986, 10, :o2, 530596800
-          tz.transition 1987, 2, :o1, 540270000
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 2, :o1, 571201200
-          tz.transition 1988, 10, :o2, 592977600
-          tz.transition 1989, 1, :o1, 602046000
-          tz.transition 1989, 10, :o2, 624427200
-          tz.transition 1990, 2, :o1, 634705200
-          tz.transition 1990, 10, :o2, 656481600
-          tz.transition 1991, 2, :o1, 666759600
-          tz.transition 1991, 10, :o2, 687931200
-          tz.transition 1992, 2, :o1, 697604400
-          tz.transition 1992, 10, :o2, 719985600
-          tz.transition 1993, 1, :o1, 728449200
-          tz.transition 1993, 10, :o2, 750830400
-          tz.transition 1994, 2, :o1, 761713200
-          tz.transition 1994, 10, :o2, 782280000
-          tz.transition 1995, 2, :o1, 793162800
-          tz.transition 1995, 10, :o2, 813729600
-          tz.transition 1996, 2, :o1, 824007600
-          tz.transition 1996, 10, :o2, 844574400
-          tz.transition 1997, 2, :o1, 856062000
-          tz.transition 1997, 10, :o2, 876110400
-          tz.transition 1998, 3, :o1, 888721200
-          tz.transition 1998, 10, :o2, 908078400
-          tz.transition 1999, 2, :o1, 919566000
-          tz.transition 1999, 10, :o2, 938923200
-          tz.transition 2000, 2, :o1, 951620400
-          tz.transition 2000, 10, :o2, 970977600
-          tz.transition 2001, 2, :o1, 982465200
-          tz.transition 2001, 10, :o2, 1003032000
-          tz.transition 2002, 2, :o1, 1013914800
-          tz.transition 2002, 11, :o2, 1036296000
-          tz.transition 2003, 2, :o1, 1045364400
-          tz.transition 2003, 10, :o2, 1066536000
-          tz.transition 2004, 2, :o1, 1076814000
-          tz.transition 2004, 11, :o2, 1099368000
-          tz.transition 2005, 2, :o1, 1108868400
-          tz.transition 2005, 10, :o2, 1129435200
-          tz.transition 2006, 2, :o1, 1140318000
-          tz.transition 2006, 11, :o2, 1162699200
-          tz.transition 2007, 2, :o1, 1172372400
-          tz.transition 2007, 11, :o2, 1194148800
-          tz.transition 2008, 2, :o1, 1203822000
-          tz.transition 2008, 11, :o2, 1225598400
-          tz.transition 2009, 2, :o1, 1235271600
-          tz.transition 2009, 11, :o2, 1257048000
-          tz.transition 2010, 2, :o1, 1267326000
-          tz.transition 2010, 11, :o2, 1289102400
-          tz.transition 2011, 2, :o1, 1298775600
-          tz.transition 2011, 11, :o2, 1320552000
-          tz.transition 2012, 2, :o1, 1330225200
-          tz.transition 2012, 11, :o2, 1352001600
-          tz.transition 2013, 2, :o1, 1361674800
-          tz.transition 2013, 11, :o2, 1383451200
-          tz.transition 2014, 2, :o1, 1393124400
-          tz.transition 2014, 11, :o2, 1414900800
-          tz.transition 2015, 2, :o1, 1424574000
-          tz.transition 2015, 11, :o2, 1446350400
-          tz.transition 2016, 2, :o1, 1456628400
-          tz.transition 2016, 11, :o2, 1478404800
-          tz.transition 2017, 2, :o1, 1488078000
-          tz.transition 2017, 11, :o2, 1509854400
-          tz.transition 2018, 2, :o1, 1519527600
-          tz.transition 2018, 11, :o2, 1541304000
-          tz.transition 2019, 2, :o1, 1550977200
-          tz.transition 2019, 11, :o2, 1572753600
-          tz.transition 2020, 2, :o1, 1582426800
-          tz.transition 2020, 11, :o2, 1604203200
-          tz.transition 2021, 2, :o1, 1614481200
-          tz.transition 2021, 11, :o2, 1636257600
-          tz.transition 2022, 2, :o1, 1645930800
-          tz.transition 2022, 11, :o2, 1667707200
-          tz.transition 2023, 2, :o1, 1677380400
-          tz.transition 2023, 11, :o2, 1699156800
-          tz.transition 2024, 2, :o1, 1708830000
-          tz.transition 2024, 11, :o2, 1730606400
-          tz.transition 2025, 2, :o1, 1740279600
-          tz.transition 2025, 11, :o2, 1762056000
-          tz.transition 2026, 2, :o1, 1771729200
-          tz.transition 2026, 11, :o2, 1793505600
-          tz.transition 2027, 2, :o1, 1803783600
-          tz.transition 2027, 11, :o2, 1825560000
-          tz.transition 2028, 2, :o1, 1835233200
-          tz.transition 2028, 11, :o2, 1857009600
-          tz.transition 2029, 2, :o1, 1866682800
-          tz.transition 2029, 11, :o2, 1888459200
-          tz.transition 2030, 2, :o1, 1898132400
-          tz.transition 2030, 11, :o2, 1919908800
-          tz.transition 2031, 2, :o1, 1929582000
-          tz.transition 2031, 11, :o2, 1951358400
-          tz.transition 2032, 2, :o1, 1961636400
-          tz.transition 2032, 11, :o2, 1983412800
-          tz.transition 2033, 2, :o1, 1993086000
-          tz.transition 2033, 11, :o2, 2014862400
-          tz.transition 2034, 2, :o1, 2024535600
-          tz.transition 2034, 11, :o2, 2046312000
-          tz.transition 2035, 2, :o1, 2055985200
-          tz.transition 2035, 11, :o2, 2077761600
-          tz.transition 2036, 2, :o1, 2087434800
-          tz.transition 2036, 11, :o2, 2109211200
-          tz.transition 2037, 2, :o1, 2118884400
-          tz.transition 2037, 11, :o2, 2140660800
-          tz.transition 2038, 2, :o1, 19723861, 8
-          tz.transition 2038, 11, :o2, 7397204, 3
-          tz.transition 2039, 2, :o1, 19726773, 8
-          tz.transition 2039, 11, :o2, 7398296, 3
-          tz.transition 2040, 2, :o1, 19729685, 8
-          tz.transition 2040, 11, :o2, 7399388, 3
-          tz.transition 2041, 2, :o1, 19732597, 8
-          tz.transition 2041, 11, :o2, 7400480, 3
-          tz.transition 2042, 2, :o1, 19735509, 8
-          tz.transition 2042, 11, :o2, 7401572, 3
-          tz.transition 2043, 2, :o1, 19738421, 8
-          tz.transition 2043, 11, :o2, 7402664, 3
-          tz.transition 2044, 2, :o1, 19741389, 8
-          tz.transition 2044, 11, :o2, 7403777, 3
-          tz.transition 2045, 2, :o1, 19744301, 8
-          tz.transition 2045, 11, :o2, 7404869, 3
-          tz.transition 2046, 2, :o1, 19747213, 8
-          tz.transition 2046, 11, :o2, 7405961, 3
-          tz.transition 2047, 2, :o1, 19750125, 8
-          tz.transition 2047, 11, :o2, 7407053, 3
-          tz.transition 2048, 2, :o1, 19753037, 8
-          tz.transition 2048, 11, :o2, 7408145, 3
-          tz.transition 2049, 2, :o1, 19756005, 8
-          tz.transition 2049, 11, :o2, 7409258, 3
-          tz.transition 2050, 2, :o1, 19758917, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cancun.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cancun.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cancun.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cancun.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,133 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Cancun
-        include TimezoneDefinition
-        
-        timezone 'America/Cancun' do |tz|
-          tz.offset :o0, -20824, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -18000, 3600, :EDT
-          tz.offset :o4, -21600, 3600, :CDT
-          
-          tz.transition 1922, 1, :o1, 9692223, 4
-          tz.transition 1981, 12, :o2, 377935200
-          tz.transition 1996, 4, :o3, 828860400
-          tz.transition 1996, 10, :o2, 846396000
-          tz.transition 1997, 4, :o3, 860310000
-          tz.transition 1997, 10, :o2, 877845600
-          tz.transition 1998, 4, :o3, 891759600
-          tz.transition 1998, 8, :o4, 902037600
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o4, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o4, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 5, :o4, 989136000
-          tz.transition 2001, 9, :o1, 1001833200
-          tz.transition 2002, 4, :o4, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o4, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o4, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o4, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o4, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 4, :o4, 1175414400
-          tz.transition 2007, 10, :o1, 1193554800
-          tz.transition 2008, 4, :o4, 1207468800
-          tz.transition 2008, 10, :o1, 1225004400
-          tz.transition 2009, 4, :o4, 1238918400
-          tz.transition 2009, 10, :o1, 1256454000
-          tz.transition 2010, 4, :o4, 1270368000
-          tz.transition 2010, 10, :o1, 1288508400
-          tz.transition 2011, 4, :o4, 1301817600
-          tz.transition 2011, 10, :o1, 1319958000
-          tz.transition 2012, 4, :o4, 1333267200
-          tz.transition 2012, 10, :o1, 1351407600
-          tz.transition 2013, 4, :o4, 1365321600
-          tz.transition 2013, 10, :o1, 1382857200
-          tz.transition 2014, 4, :o4, 1396771200
-          tz.transition 2014, 10, :o1, 1414306800
-          tz.transition 2015, 4, :o4, 1428220800
-          tz.transition 2015, 10, :o1, 1445756400
-          tz.transition 2016, 4, :o4, 1459670400
-          tz.transition 2016, 10, :o1, 1477810800
-          tz.transition 2017, 4, :o4, 1491120000
-          tz.transition 2017, 10, :o1, 1509260400
-          tz.transition 2018, 4, :o4, 1522569600
-          tz.transition 2018, 10, :o1, 1540710000
-          tz.transition 2019, 4, :o4, 1554624000
-          tz.transition 2019, 10, :o1, 1572159600
-          tz.transition 2020, 4, :o4, 1586073600
-          tz.transition 2020, 10, :o1, 1603609200
-          tz.transition 2021, 4, :o4, 1617523200
-          tz.transition 2021, 10, :o1, 1635663600
-          tz.transition 2022, 4, :o4, 1648972800
-          tz.transition 2022, 10, :o1, 1667113200
-          tz.transition 2023, 4, :o4, 1680422400
-          tz.transition 2023, 10, :o1, 1698562800
-          tz.transition 2024, 4, :o4, 1712476800
-          tz.transition 2024, 10, :o1, 1730012400
-          tz.transition 2025, 4, :o4, 1743926400
-          tz.transition 2025, 10, :o1, 1761462000
-          tz.transition 2026, 4, :o4, 1775376000
-          tz.transition 2026, 10, :o1, 1792911600
-          tz.transition 2027, 4, :o4, 1806825600
-          tz.transition 2027, 10, :o1, 1824966000
-          tz.transition 2028, 4, :o4, 1838275200
-          tz.transition 2028, 10, :o1, 1856415600
-          tz.transition 2029, 4, :o4, 1869724800
-          tz.transition 2029, 10, :o1, 1887865200
-          tz.transition 2030, 4, :o4, 1901779200
-          tz.transition 2030, 10, :o1, 1919314800
-          tz.transition 2031, 4, :o4, 1933228800
-          tz.transition 2031, 10, :o1, 1950764400
-          tz.transition 2032, 4, :o4, 1964678400
-          tz.transition 2032, 10, :o1, 1982818800
-          tz.transition 2033, 4, :o4, 1996128000
-          tz.transition 2033, 10, :o1, 2014268400
-          tz.transition 2034, 4, :o4, 2027577600
-          tz.transition 2034, 10, :o1, 2045718000
-          tz.transition 2035, 4, :o4, 2059027200
-          tz.transition 2035, 10, :o1, 2077167600
-          tz.transition 2036, 4, :o4, 2091081600
-          tz.transition 2036, 10, :o1, 2108617200
-          tz.transition 2037, 4, :o4, 2122531200
-          tz.transition 2037, 10, :o1, 2140066800
-          tz.transition 2038, 4, :o4, 14793107, 6
-          tz.transition 2038, 10, :o1, 59177467, 24
-          tz.transition 2039, 4, :o4, 14795291, 6
-          tz.transition 2039, 10, :o1, 59186203, 24
-          tz.transition 2040, 4, :o4, 14797475, 6
-          tz.transition 2040, 10, :o1, 59194939, 24
-          tz.transition 2041, 4, :o4, 14799701, 6
-          tz.transition 2041, 10, :o1, 59203675, 24
-          tz.transition 2042, 4, :o4, 14801885, 6
-          tz.transition 2042, 10, :o1, 59212411, 24
-          tz.transition 2043, 4, :o4, 14804069, 6
-          tz.transition 2043, 10, :o1, 59221147, 24
-          tz.transition 2044, 4, :o4, 14806253, 6
-          tz.transition 2044, 10, :o1, 59230051, 24
-          tz.transition 2045, 4, :o4, 14808437, 6
-          tz.transition 2045, 10, :o1, 59238787, 24
-          tz.transition 2046, 4, :o4, 14810621, 6
-          tz.transition 2046, 10, :o1, 59247523, 24
-          tz.transition 2047, 4, :o4, 14812847, 6
-          tz.transition 2047, 10, :o1, 59256259, 24
-          tz.transition 2048, 4, :o4, 14815031, 6
-          tz.transition 2048, 10, :o1, 59264995, 24
-          tz.transition 2049, 4, :o4, 14817215, 6
-          tz.transition 2049, 10, :o1, 59273899, 24
-          tz.transition 2050, 4, :o4, 14819399, 6
-          tz.transition 2050, 10, :o1, 59282635, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Caracas.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Caracas.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Caracas.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Caracas.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Caracas
-        include TimezoneDefinition
-        
-        timezone 'America/Caracas' do |tz|
-          tz.offset :o0, -16064, 0, :LMT
-          tz.offset :o1, -16060, 0, :CMT
-          tz.offset :o2, -16200, 0, :VET
-          tz.offset :o3, -14400, 0, :VET
-          
-          tz.transition 1890, 1, :o1, 1627673863, 675
-          tz.transition 1912, 2, :o2, 10452001043, 4320
-          tz.transition 1965, 1, :o3, 39020187, 16
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Catamarca.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Catamarca.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Catamarca.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Catamarca.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Catamarca
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Catamarca', 'America/Argentina/Catamarca'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayenne.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayenne.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayenne.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayenne.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Cayenne
-        include TimezoneDefinition
-        
-        timezone 'America/Cayenne' do |tz|
-          tz.offset :o0, -12560, 0, :LMT
-          tz.offset :o1, -14400, 0, :GFT
-          tz.offset :o2, -10800, 0, :GFT
-          
-          tz.transition 1911, 7, :o1, 2612756137, 1080
-          tz.transition 1967, 10, :o2, 7319294, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayman.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayman.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayman.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cayman.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Cayman
-        include TimezoneDefinition
-        
-        timezone 'America/Cayman' do |tz|
-          tz.offset :o0, -19532, 0, :LMT
-          tz.offset :o1, -18432, 0, :KMT
-          tz.offset :o2, -18000, 0, :EST
-          
-          tz.transition 1890, 1, :o1, 52085564483, 21600
-          tz.transition 1912, 2, :o2, 362915057, 150
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chicago.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chicago.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chicago.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chicago.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,283 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Chicago
-        include TimezoneDefinition
-        
-        timezone 'America/Chicago' do |tz|
-          tz.offset :o0, -21036, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -18000, 0, :EST
-          tz.offset :o4, -21600, 3600, :CWT
-          tz.offset :o5, -21600, 3600, :CPT
-          
-          tz.transition 1883, 11, :o1, 9636533, 4
-          tz.transition 1918, 3, :o2, 14530103, 6
-          tz.transition 1918, 10, :o1, 58125451, 24
-          tz.transition 1919, 3, :o2, 14532287, 6
-          tz.transition 1919, 10, :o1, 58134187, 24
-          tz.transition 1920, 6, :o2, 14534933, 6
-          tz.transition 1920, 10, :o1, 58143091, 24
-          tz.transition 1921, 3, :o2, 14536655, 6
-          tz.transition 1921, 10, :o1, 58151827, 24
-          tz.transition 1922, 4, :o2, 14539049, 6
-          tz.transition 1922, 9, :o1, 58159723, 24
-          tz.transition 1923, 4, :o2, 14541233, 6
-          tz.transition 1923, 9, :o1, 58168627, 24
-          tz.transition 1924, 4, :o2, 14543417, 6
-          tz.transition 1924, 9, :o1, 58177363, 24
-          tz.transition 1925, 4, :o2, 14545601, 6
-          tz.transition 1925, 9, :o1, 58186099, 24
-          tz.transition 1926, 4, :o2, 14547785, 6
-          tz.transition 1926, 9, :o1, 58194835, 24
-          tz.transition 1927, 4, :o2, 14549969, 6
-          tz.transition 1927, 9, :o1, 58203571, 24
-          tz.transition 1928, 4, :o2, 14552195, 6
-          tz.transition 1928, 9, :o1, 58212475, 24
-          tz.transition 1929, 4, :o2, 14554379, 6
-          tz.transition 1929, 9, :o1, 58221211, 24
-          tz.transition 1930, 4, :o2, 14556563, 6
-          tz.transition 1930, 9, :o1, 58229947, 24
-          tz.transition 1931, 4, :o2, 14558747, 6
-          tz.transition 1931, 9, :o1, 58238683, 24
-          tz.transition 1932, 4, :o2, 14560931, 6
-          tz.transition 1932, 9, :o1, 58247419, 24
-          tz.transition 1933, 4, :o2, 14563157, 6
-          tz.transition 1933, 9, :o1, 58256155, 24
-          tz.transition 1934, 4, :o2, 14565341, 6
-          tz.transition 1934, 9, :o1, 58265059, 24
-          tz.transition 1935, 4, :o2, 14567525, 6
-          tz.transition 1935, 9, :o1, 58273795, 24
-          tz.transition 1936, 3, :o3, 14569373, 6
-          tz.transition 1936, 11, :o1, 58283707, 24
-          tz.transition 1937, 4, :o2, 14571893, 6
-          tz.transition 1937, 9, :o1, 58291267, 24
-          tz.transition 1938, 4, :o2, 14574077, 6
-          tz.transition 1938, 9, :o1, 58300003, 24
-          tz.transition 1939, 4, :o2, 14576303, 6
-          tz.transition 1939, 9, :o1, 58308739, 24
-          tz.transition 1940, 4, :o2, 14578487, 6
-          tz.transition 1940, 9, :o1, 58317643, 24
-          tz.transition 1941, 4, :o2, 14580671, 6
-          tz.transition 1941, 9, :o1, 58326379, 24
-          tz.transition 1942, 2, :o4, 14582399, 6
-          tz.transition 1945, 8, :o5, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361491, 24
-          tz.transition 1946, 4, :o2, 14591633, 6
-          tz.transition 1946, 9, :o1, 58370227, 24
-          tz.transition 1947, 4, :o2, 14593817, 6
-          tz.transition 1947, 9, :o1, 58378963, 24
-          tz.transition 1948, 4, :o2, 14596001, 6
-          tz.transition 1948, 9, :o1, 58387699, 24
-          tz.transition 1949, 4, :o2, 14598185, 6
-          tz.transition 1949, 9, :o1, 58396435, 24
-          tz.transition 1950, 4, :o2, 14600411, 6
-          tz.transition 1950, 9, :o1, 58405171, 24
-          tz.transition 1951, 4, :o2, 14602595, 6
-          tz.transition 1951, 9, :o1, 58414075, 24
-          tz.transition 1952, 4, :o2, 14604779, 6
-          tz.transition 1952, 9, :o1, 58422811, 24
-          tz.transition 1953, 4, :o2, 14606963, 6
-          tz.transition 1953, 9, :o1, 58431547, 24
-          tz.transition 1954, 4, :o2, 14609147, 6
-          tz.transition 1954, 9, :o1, 58440283, 24
-          tz.transition 1955, 4, :o2, 14611331, 6
-          tz.transition 1955, 10, :o1, 58449859, 24
-          tz.transition 1956, 4, :o2, 14613557, 6
-          tz.transition 1956, 10, :o1, 58458595, 24
-          tz.transition 1957, 4, :o2, 14615741, 6
-          tz.transition 1957, 10, :o1, 58467331, 24
-          tz.transition 1958, 4, :o2, 14617925, 6
-          tz.transition 1958, 10, :o1, 58476067, 24
-          tz.transition 1959, 4, :o2, 14620109, 6
-          tz.transition 1959, 10, :o1, 58484803, 24
-          tz.transition 1960, 4, :o2, 14622293, 6
-          tz.transition 1960, 10, :o1, 58493707, 24
-          tz.transition 1961, 4, :o2, 14624519, 6
-          tz.transition 1961, 10, :o1, 58502443, 24
-          tz.transition 1962, 4, :o2, 14626703, 6
-          tz.transition 1962, 10, :o1, 58511179, 24
-          tz.transition 1963, 4, :o2, 14628887, 6
-          tz.transition 1963, 10, :o1, 58519915, 24
-          tz.transition 1964, 4, :o2, 14631071, 6
-          tz.transition 1964, 10, :o1, 58528651, 24
-          tz.transition 1965, 4, :o2, 14633255, 6
-          tz.transition 1965, 10, :o1, 58537555, 24
-          tz.transition 1966, 4, :o2, 14635439, 6
-          tz.transition 1966, 10, :o1, 58546291, 24
-          tz.transition 1967, 4, :o2, 14637665, 6
-          tz.transition 1967, 10, :o1, 58555027, 24
-          tz.transition 1968, 4, :o2, 14639849, 6
-          tz.transition 1968, 10, :o1, 58563763, 24
-          tz.transition 1969, 4, :o2, 14642033, 6
-          tz.transition 1969, 10, :o1, 58572499, 24
-          tz.transition 1970, 4, :o2, 9964800
-          tz.transition 1970, 10, :o1, 25686000
-          tz.transition 1971, 4, :o2, 41414400
-          tz.transition 1971, 10, :o1, 57740400
-          tz.transition 1972, 4, :o2, 73468800
-          tz.transition 1972, 10, :o1, 89190000
-          tz.transition 1973, 4, :o2, 104918400
-          tz.transition 1973, 10, :o1, 120639600
-          tz.transition 1974, 1, :o2, 126691200
-          tz.transition 1974, 10, :o1, 152089200
-          tz.transition 1975, 2, :o2, 162374400
-          tz.transition 1975, 10, :o1, 183538800
-          tz.transition 1976, 4, :o2, 199267200
-          tz.transition 1976, 10, :o1, 215593200
-          tz.transition 1977, 4, :o2, 230716800
-          tz.transition 1977, 10, :o1, 247042800
-          tz.transition 1978, 4, :o2, 262771200
-          tz.transition 1978, 10, :o1, 278492400
-          tz.transition 1979, 4, :o2, 294220800
-          tz.transition 1979, 10, :o1, 309942000
-          tz.transition 1980, 4, :o2, 325670400
-          tz.transition 1980, 10, :o1, 341391600
-          tz.transition 1981, 4, :o2, 357120000
-          tz.transition 1981, 10, :o1, 372841200
-          tz.transition 1982, 4, :o2, 388569600
-          tz.transition 1982, 10, :o1, 404895600
-          tz.transition 1983, 4, :o2, 420019200
-          tz.transition 1983, 10, :o1, 436345200
-          tz.transition 1984, 4, :o2, 452073600
-          tz.transition 1984, 10, :o1, 467794800
-          tz.transition 1985, 4, :o2, 483523200
-          tz.transition 1985, 10, :o1, 499244400
-          tz.transition 1986, 4, :o2, 514972800
-          tz.transition 1986, 10, :o1, 530694000
-          tz.transition 1987, 4, :o2, 544608000
-          tz.transition 1987, 10, :o1, 562143600
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594198000
-          tz.transition 1989, 4, :o2, 607507200
-          tz.transition 1989, 10, :o1, 625647600
-          tz.transition 1990, 4, :o2, 638956800
-          tz.transition 1990, 10, :o1, 657097200
-          tz.transition 1991, 4, :o2, 671011200
-          tz.transition 1991, 10, :o1, 688546800
-          tz.transition 1992, 4, :o2, 702460800
-          tz.transition 1992, 10, :o1, 719996400
-          tz.transition 1993, 4, :o2, 733910400
-          tz.transition 1993, 10, :o1, 752050800
-          tz.transition 1994, 4, :o2, 765360000
-          tz.transition 1994, 10, :o1, 783500400
-          tz.transition 1995, 4, :o2, 796809600
-          tz.transition 1995, 10, :o1, 814950000
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 4, :o2, 986112000
-          tz.transition 2001, 10, :o1, 1004252400
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 3, :o2, 1173600000
-          tz.transition 2007, 11, :o1, 1194159600
-          tz.transition 2008, 3, :o2, 1205049600
-          tz.transition 2008, 11, :o1, 1225609200
-          tz.transition 2009, 3, :o2, 1236499200
-          tz.transition 2009, 11, :o1, 1257058800
-          tz.transition 2010, 3, :o2, 1268553600
-          tz.transition 2010, 11, :o1, 1289113200
-          tz.transition 2011, 3, :o2, 1300003200
-          tz.transition 2011, 11, :o1, 1320562800
-          tz.transition 2012, 3, :o2, 1331452800
-          tz.transition 2012, 11, :o1, 1352012400
-          tz.transition 2013, 3, :o2, 1362902400
-          tz.transition 2013, 11, :o1, 1383462000
-          tz.transition 2014, 3, :o2, 1394352000
-          tz.transition 2014, 11, :o1, 1414911600
-          tz.transition 2015, 3, :o2, 1425801600
-          tz.transition 2015, 11, :o1, 1446361200
-          tz.transition 2016, 3, :o2, 1457856000
-          tz.transition 2016, 11, :o1, 1478415600
-          tz.transition 2017, 3, :o2, 1489305600
-          tz.transition 2017, 11, :o1, 1509865200
-          tz.transition 2018, 3, :o2, 1520755200
-          tz.transition 2018, 11, :o1, 1541314800
-          tz.transition 2019, 3, :o2, 1552204800
-          tz.transition 2019, 11, :o1, 1572764400
-          tz.transition 2020, 3, :o2, 1583654400
-          tz.transition 2020, 11, :o1, 1604214000
-          tz.transition 2021, 3, :o2, 1615708800
-          tz.transition 2021, 11, :o1, 1636268400
-          tz.transition 2022, 3, :o2, 1647158400
-          tz.transition 2022, 11, :o1, 1667718000
-          tz.transition 2023, 3, :o2, 1678608000
-          tz.transition 2023, 11, :o1, 1699167600
-          tz.transition 2024, 3, :o2, 1710057600
-          tz.transition 2024, 11, :o1, 1730617200
-          tz.transition 2025, 3, :o2, 1741507200
-          tz.transition 2025, 11, :o1, 1762066800
-          tz.transition 2026, 3, :o2, 1772956800
-          tz.transition 2026, 11, :o1, 1793516400
-          tz.transition 2027, 3, :o2, 1805011200
-          tz.transition 2027, 11, :o1, 1825570800
-          tz.transition 2028, 3, :o2, 1836460800
-          tz.transition 2028, 11, :o1, 1857020400
-          tz.transition 2029, 3, :o2, 1867910400
-          tz.transition 2029, 11, :o1, 1888470000
-          tz.transition 2030, 3, :o2, 1899360000
-          tz.transition 2030, 11, :o1, 1919919600
-          tz.transition 2031, 3, :o2, 1930809600
-          tz.transition 2031, 11, :o1, 1951369200
-          tz.transition 2032, 3, :o2, 1962864000
-          tz.transition 2032, 11, :o1, 1983423600
-          tz.transition 2033, 3, :o2, 1994313600
-          tz.transition 2033, 11, :o1, 2014873200
-          tz.transition 2034, 3, :o2, 2025763200
-          tz.transition 2034, 11, :o1, 2046322800
-          tz.transition 2035, 3, :o2, 2057212800
-          tz.transition 2035, 11, :o1, 2077772400
-          tz.transition 2036, 3, :o2, 2088662400
-          tz.transition 2036, 11, :o1, 2109222000
-          tz.transition 2037, 3, :o2, 2120112000
-          tz.transition 2037, 11, :o1, 2140671600
-          tz.transition 2038, 3, :o2, 14792981, 6
-          tz.transition 2038, 11, :o1, 59177635, 24
-          tz.transition 2039, 3, :o2, 14795165, 6
-          tz.transition 2039, 11, :o1, 59186371, 24
-          tz.transition 2040, 3, :o2, 14797349, 6
-          tz.transition 2040, 11, :o1, 59195107, 24
-          tz.transition 2041, 3, :o2, 14799533, 6
-          tz.transition 2041, 11, :o1, 59203843, 24
-          tz.transition 2042, 3, :o2, 14801717, 6
-          tz.transition 2042, 11, :o1, 59212579, 24
-          tz.transition 2043, 3, :o2, 14803901, 6
-          tz.transition 2043, 11, :o1, 59221315, 24
-          tz.transition 2044, 3, :o2, 14806127, 6
-          tz.transition 2044, 11, :o1, 59230219, 24
-          tz.transition 2045, 3, :o2, 14808311, 6
-          tz.transition 2045, 11, :o1, 59238955, 24
-          tz.transition 2046, 3, :o2, 14810495, 6
-          tz.transition 2046, 11, :o1, 59247691, 24
-          tz.transition 2047, 3, :o2, 14812679, 6
-          tz.transition 2047, 11, :o1, 59256427, 24
-          tz.transition 2048, 3, :o2, 14814863, 6
-          tz.transition 2048, 11, :o1, 59265163, 24
-          tz.transition 2049, 3, :o2, 14817089, 6
-          tz.transition 2049, 11, :o1, 59274067, 24
-          tz.transition 2050, 3, :o2, 14819273, 6
-          tz.transition 2050, 11, :o1, 59282803, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chihuahua.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chihuahua.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chihuahua.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Chihuahua.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,136 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Chihuahua
-        include TimezoneDefinition
-        
-        timezone 'America/Chihuahua' do |tz|
-          tz.offset :o0, -25460, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -21600, 3600, :CDT
-          tz.offset :o4, -25200, 3600, :MDT
-          
-          tz.transition 1922, 1, :o1, 58153339, 24
-          tz.transition 1927, 6, :o2, 9700171, 4
-          tz.transition 1930, 11, :o1, 9705183, 4
-          tz.transition 1931, 5, :o2, 9705855, 4
-          tz.transition 1931, 10, :o1, 9706463, 4
-          tz.transition 1932, 4, :o2, 58243171, 24
-          tz.transition 1996, 4, :o3, 828864000
-          tz.transition 1996, 10, :o2, 846399600
-          tz.transition 1997, 4, :o3, 860313600
-          tz.transition 1997, 10, :o2, 877849200
-          tz.transition 1998, 4, :o4, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o4, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o4, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 5, :o4, 989139600
-          tz.transition 2001, 9, :o1, 1001836800
-          tz.transition 2002, 4, :o4, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o4, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o4, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o4, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o4, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 4, :o4, 1175418000
-          tz.transition 2007, 10, :o1, 1193558400
-          tz.transition 2008, 4, :o4, 1207472400
-          tz.transition 2008, 10, :o1, 1225008000
-          tz.transition 2009, 4, :o4, 1238922000
-          tz.transition 2009, 10, :o1, 1256457600
-          tz.transition 2010, 4, :o4, 1270371600
-          tz.transition 2010, 10, :o1, 1288512000
-          tz.transition 2011, 4, :o4, 1301821200
-          tz.transition 2011, 10, :o1, 1319961600
-          tz.transition 2012, 4, :o4, 1333270800
-          tz.transition 2012, 10, :o1, 1351411200
-          tz.transition 2013, 4, :o4, 1365325200
-          tz.transition 2013, 10, :o1, 1382860800
-          tz.transition 2014, 4, :o4, 1396774800
-          tz.transition 2014, 10, :o1, 1414310400
-          tz.transition 2015, 4, :o4, 1428224400
-          tz.transition 2015, 10, :o1, 1445760000
-          tz.transition 2016, 4, :o4, 1459674000
-          tz.transition 2016, 10, :o1, 1477814400
-          tz.transition 2017, 4, :o4, 1491123600
-          tz.transition 2017, 10, :o1, 1509264000
-          tz.transition 2018, 4, :o4, 1522573200
-          tz.transition 2018, 10, :o1, 1540713600
-          tz.transition 2019, 4, :o4, 1554627600
-          tz.transition 2019, 10, :o1, 1572163200
-          tz.transition 2020, 4, :o4, 1586077200
-          tz.transition 2020, 10, :o1, 1603612800
-          tz.transition 2021, 4, :o4, 1617526800
-          tz.transition 2021, 10, :o1, 1635667200
-          tz.transition 2022, 4, :o4, 1648976400
-          tz.transition 2022, 10, :o1, 1667116800
-          tz.transition 2023, 4, :o4, 1680426000
-          tz.transition 2023, 10, :o1, 1698566400
-          tz.transition 2024, 4, :o4, 1712480400
-          tz.transition 2024, 10, :o1, 1730016000
-          tz.transition 2025, 4, :o4, 1743930000
-          tz.transition 2025, 10, :o1, 1761465600
-          tz.transition 2026, 4, :o4, 1775379600
-          tz.transition 2026, 10, :o1, 1792915200
-          tz.transition 2027, 4, :o4, 1806829200
-          tz.transition 2027, 10, :o1, 1824969600
-          tz.transition 2028, 4, :o4, 1838278800
-          tz.transition 2028, 10, :o1, 1856419200
-          tz.transition 2029, 4, :o4, 1869728400
-          tz.transition 2029, 10, :o1, 1887868800
-          tz.transition 2030, 4, :o4, 1901782800
-          tz.transition 2030, 10, :o1, 1919318400
-          tz.transition 2031, 4, :o4, 1933232400
-          tz.transition 2031, 10, :o1, 1950768000
-          tz.transition 2032, 4, :o4, 1964682000
-          tz.transition 2032, 10, :o1, 1982822400
-          tz.transition 2033, 4, :o4, 1996131600
-          tz.transition 2033, 10, :o1, 2014272000
-          tz.transition 2034, 4, :o4, 2027581200
-          tz.transition 2034, 10, :o1, 2045721600
-          tz.transition 2035, 4, :o4, 2059030800
-          tz.transition 2035, 10, :o1, 2077171200
-          tz.transition 2036, 4, :o4, 2091085200
-          tz.transition 2036, 10, :o1, 2108620800
-          tz.transition 2037, 4, :o4, 2122534800
-          tz.transition 2037, 10, :o1, 2140070400
-          tz.transition 2038, 4, :o4, 19724143, 8
-          tz.transition 2038, 10, :o1, 14794367, 6
-          tz.transition 2039, 4, :o4, 19727055, 8
-          tz.transition 2039, 10, :o1, 14796551, 6
-          tz.transition 2040, 4, :o4, 19729967, 8
-          tz.transition 2040, 10, :o1, 14798735, 6
-          tz.transition 2041, 4, :o4, 19732935, 8
-          tz.transition 2041, 10, :o1, 14800919, 6
-          tz.transition 2042, 4, :o4, 19735847, 8
-          tz.transition 2042, 10, :o1, 14803103, 6
-          tz.transition 2043, 4, :o4, 19738759, 8
-          tz.transition 2043, 10, :o1, 14805287, 6
-          tz.transition 2044, 4, :o4, 19741671, 8
-          tz.transition 2044, 10, :o1, 14807513, 6
-          tz.transition 2045, 4, :o4, 19744583, 8
-          tz.transition 2045, 10, :o1, 14809697, 6
-          tz.transition 2046, 4, :o4, 19747495, 8
-          tz.transition 2046, 10, :o1, 14811881, 6
-          tz.transition 2047, 4, :o4, 19750463, 8
-          tz.transition 2047, 10, :o1, 14814065, 6
-          tz.transition 2048, 4, :o4, 19753375, 8
-          tz.transition 2048, 10, :o1, 14816249, 6
-          tz.transition 2049, 4, :o4, 19756287, 8
-          tz.transition 2049, 10, :o1, 14818475, 6
-          tz.transition 2050, 4, :o4, 19759199, 8
-          tz.transition 2050, 10, :o1, 14820659, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Coral_Harbour.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Coral_Harbour.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Coral_Harbour.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Coral_Harbour.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Coral_Harbour
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Coral_Harbour', 'America/Atikokan'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cordoba.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cordoba.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cordoba.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cordoba.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Cordoba
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Cordoba', 'America/Argentina/Cordoba'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Costa_Rica.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Costa_Rica.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Costa_Rica.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Costa_Rica.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,29 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Costa_Rica
-        include TimezoneDefinition
-        
-        timezone 'America/Costa_Rica' do |tz|
-          tz.offset :o0, -20180, 0, :LMT
-          tz.offset :o1, -20180, 0, :SJMT
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -21600, 3600, :CDT
-          
-          tz.transition 1890, 1, :o1, 10417112929, 4320
-          tz.transition 1921, 1, :o2, 10466084449, 4320
-          tz.transition 1979, 2, :o3, 288770400
-          tz.transition 1979, 6, :o2, 297234000
-          tz.transition 1980, 2, :o3, 320220000
-          tz.transition 1980, 6, :o2, 328683600
-          tz.transition 1991, 1, :o3, 664264800
-          tz.transition 1991, 7, :o2, 678344400
-          tz.transition 1992, 1, :o3, 695714400
-          tz.transition 1992, 3, :o2, 700635600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cuiaba.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cuiaba.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cuiaba.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Cuiaba.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,169 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Cuiaba
-        include TimezoneDefinition
-        
-        timezone 'America/Cuiaba' do |tz|
-          tz.offset :o0, -13460, 0, :LMT
-          tz.offset :o1, -14400, 0, :AMT
-          tz.offset :o2, -14400, 3600, :AMST
-          
-          tz.transition 1914, 1, :o1, 10454977393, 4320
-          tz.transition 1931, 10, :o2, 19412945, 8
-          tz.transition 1932, 4, :o1, 19414389, 8
-          tz.transition 1932, 10, :o2, 7280951, 3
-          tz.transition 1933, 4, :o1, 19417309, 8
-          tz.transition 1949, 12, :o2, 7299755, 3
-          tz.transition 1950, 4, :o1, 7300163, 3
-          tz.transition 1950, 12, :o2, 7300850, 3
-          tz.transition 1951, 4, :o1, 19469901, 8
-          tz.transition 1951, 12, :o2, 7301945, 3
-          tz.transition 1952, 4, :o1, 19472829, 8
-          tz.transition 1952, 12, :o2, 7303043, 3
-          tz.transition 1953, 3, :o1, 19475501, 8
-          tz.transition 1963, 12, :o2, 7315118, 3
-          tz.transition 1964, 3, :o1, 19507645, 8
-          tz.transition 1965, 1, :o2, 7316375, 3
-          tz.transition 1965, 3, :o1, 19510805, 8
-          tz.transition 1965, 12, :o2, 7317287, 3
-          tz.transition 1966, 3, :o1, 19513485, 8
-          tz.transition 1966, 11, :o2, 7318292, 3
-          tz.transition 1967, 3, :o1, 19516405, 8
-          tz.transition 1967, 11, :o2, 7319387, 3
-          tz.transition 1968, 3, :o1, 19519333, 8
-          tz.transition 1985, 11, :o2, 499752000
-          tz.transition 1986, 3, :o1, 511239600
-          tz.transition 1986, 10, :o2, 530596800
-          tz.transition 1987, 2, :o1, 540270000
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 2, :o1, 571201200
-          tz.transition 1988, 10, :o2, 592977600
-          tz.transition 1989, 1, :o1, 602046000
-          tz.transition 1989, 10, :o2, 624427200
-          tz.transition 1990, 2, :o1, 634705200
-          tz.transition 1990, 10, :o2, 656481600
-          tz.transition 1991, 2, :o1, 666759600
-          tz.transition 1991, 10, :o2, 687931200
-          tz.transition 1992, 2, :o1, 697604400
-          tz.transition 1992, 10, :o2, 719985600
-          tz.transition 1993, 1, :o1, 728449200
-          tz.transition 1993, 10, :o2, 750830400
-          tz.transition 1994, 2, :o1, 761713200
-          tz.transition 1994, 10, :o2, 782280000
-          tz.transition 1995, 2, :o1, 793162800
-          tz.transition 1995, 10, :o2, 813729600
-          tz.transition 1996, 2, :o1, 824007600
-          tz.transition 1996, 10, :o2, 844574400
-          tz.transition 1997, 2, :o1, 856062000
-          tz.transition 1997, 10, :o2, 876110400
-          tz.transition 1998, 3, :o1, 888721200
-          tz.transition 1998, 10, :o2, 908078400
-          tz.transition 1999, 2, :o1, 919566000
-          tz.transition 1999, 10, :o2, 938923200
-          tz.transition 2000, 2, :o1, 951620400
-          tz.transition 2000, 10, :o2, 970977600
-          tz.transition 2001, 2, :o1, 982465200
-          tz.transition 2001, 10, :o2, 1003032000
-          tz.transition 2002, 2, :o1, 1013914800
-          tz.transition 2002, 11, :o2, 1036296000
-          tz.transition 2003, 2, :o1, 1045364400
-          tz.transition 2004, 11, :o2, 1099368000
-          tz.transition 2005, 2, :o1, 1108868400
-          tz.transition 2005, 10, :o2, 1129435200
-          tz.transition 2006, 2, :o1, 1140318000
-          tz.transition 2006, 11, :o2, 1162699200
-          tz.transition 2007, 2, :o1, 1172372400
-          tz.transition 2007, 11, :o2, 1194148800
-          tz.transition 2008, 2, :o1, 1203822000
-          tz.transition 2008, 11, :o2, 1225598400
-          tz.transition 2009, 2, :o1, 1235271600
-          tz.transition 2009, 11, :o2, 1257048000
-          tz.transition 2010, 2, :o1, 1267326000
-          tz.transition 2010, 11, :o2, 1289102400
-          tz.transition 2011, 2, :o1, 1298775600
-          tz.transition 2011, 11, :o2, 1320552000
-          tz.transition 2012, 2, :o1, 1330225200
-          tz.transition 2012, 11, :o2, 1352001600
-          tz.transition 2013, 2, :o1, 1361674800
-          tz.transition 2013, 11, :o2, 1383451200
-          tz.transition 2014, 2, :o1, 1393124400
-          tz.transition 2014, 11, :o2, 1414900800
-          tz.transition 2015, 2, :o1, 1424574000
-          tz.transition 2015, 11, :o2, 1446350400
-          tz.transition 2016, 2, :o1, 1456628400
-          tz.transition 2016, 11, :o2, 1478404800
-          tz.transition 2017, 2, :o1, 1488078000
-          tz.transition 2017, 11, :o2, 1509854400
-          tz.transition 2018, 2, :o1, 1519527600
-          tz.transition 2018, 11, :o2, 1541304000
-          tz.transition 2019, 2, :o1, 1550977200
-          tz.transition 2019, 11, :o2, 1572753600
-          tz.transition 2020, 2, :o1, 1582426800
-          tz.transition 2020, 11, :o2, 1604203200
-          tz.transition 2021, 2, :o1, 1614481200
-          tz.transition 2021, 11, :o2, 1636257600
-          tz.transition 2022, 2, :o1, 1645930800
-          tz.transition 2022, 11, :o2, 1667707200
-          tz.transition 2023, 2, :o1, 1677380400
-          tz.transition 2023, 11, :o2, 1699156800
-          tz.transition 2024, 2, :o1, 1708830000
-          tz.transition 2024, 11, :o2, 1730606400
-          tz.transition 2025, 2, :o1, 1740279600
-          tz.transition 2025, 11, :o2, 1762056000
-          tz.transition 2026, 2, :o1, 1771729200
-          tz.transition 2026, 11, :o2, 1793505600
-          tz.transition 2027, 2, :o1, 1803783600
-          tz.transition 2027, 11, :o2, 1825560000
-          tz.transition 2028, 2, :o1, 1835233200
-          tz.transition 2028, 11, :o2, 1857009600
-          tz.transition 2029, 2, :o1, 1866682800
-          tz.transition 2029, 11, :o2, 1888459200
-          tz.transition 2030, 2, :o1, 1898132400
-          tz.transition 2030, 11, :o2, 1919908800
-          tz.transition 2031, 2, :o1, 1929582000
-          tz.transition 2031, 11, :o2, 1951358400
-          tz.transition 2032, 2, :o1, 1961636400
-          tz.transition 2032, 11, :o2, 1983412800
-          tz.transition 2033, 2, :o1, 1993086000
-          tz.transition 2033, 11, :o2, 2014862400
-          tz.transition 2034, 2, :o1, 2024535600
-          tz.transition 2034, 11, :o2, 2046312000
-          tz.transition 2035, 2, :o1, 2055985200
-          tz.transition 2035, 11, :o2, 2077761600
-          tz.transition 2036, 2, :o1, 2087434800
-          tz.transition 2036, 11, :o2, 2109211200
-          tz.transition 2037, 2, :o1, 2118884400
-          tz.transition 2037, 11, :o2, 2140660800
-          tz.transition 2038, 2, :o1, 19723861, 8
-          tz.transition 2038, 11, :o2, 7397204, 3
-          tz.transition 2039, 2, :o1, 19726773, 8
-          tz.transition 2039, 11, :o2, 7398296, 3
-          tz.transition 2040, 2, :o1, 19729685, 8
-          tz.transition 2040, 11, :o2, 7399388, 3
-          tz.transition 2041, 2, :o1, 19732597, 8
-          tz.transition 2041, 11, :o2, 7400480, 3
-          tz.transition 2042, 2, :o1, 19735509, 8
-          tz.transition 2042, 11, :o2, 7401572, 3
-          tz.transition 2043, 2, :o1, 19738421, 8
-          tz.transition 2043, 11, :o2, 7402664, 3
-          tz.transition 2044, 2, :o1, 19741389, 8
-          tz.transition 2044, 11, :o2, 7403777, 3
-          tz.transition 2045, 2, :o1, 19744301, 8
-          tz.transition 2045, 11, :o2, 7404869, 3
-          tz.transition 2046, 2, :o1, 19747213, 8
-          tz.transition 2046, 11, :o2, 7405961, 3
-          tz.transition 2047, 2, :o1, 19750125, 8
-          tz.transition 2047, 11, :o2, 7407053, 3
-          tz.transition 2048, 2, :o1, 19753037, 8
-          tz.transition 2048, 11, :o2, 7408145, 3
-          tz.transition 2049, 2, :o1, 19756005, 8
-          tz.transition 2049, 11, :o2, 7409258, 3
-          tz.transition 2050, 2, :o1, 19758917, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Curacao.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Curacao.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Curacao.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Curacao.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Curacao
-        include TimezoneDefinition
-        
-        timezone 'America/Curacao' do |tz|
-          tz.offset :o0, -16544, 0, :LMT
-          tz.offset :o1, -16200, 0, :ANT
-          tz.offset :o2, -14400, 0, :AST
-          
-          tz.transition 1912, 2, :o1, 6532500667, 2700
-          tz.transition 1965, 1, :o2, 39020187, 16
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Danmarkshavn.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Danmarkshavn.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Danmarkshavn.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Danmarkshavn.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,53 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Danmarkshavn
-        include TimezoneDefinition
-        
-        timezone 'America/Danmarkshavn' do |tz|
-          tz.offset :o0, -4480, 0, :LMT
-          tz.offset :o1, -10800, 0, :WGT
-          tz.offset :o2, -10800, 3600, :WGST
-          tz.offset :o3, 0, 0, :GMT
-          
-          tz.transition 1916, 7, :o1, 653689589, 270
-          tz.transition 1980, 4, :o2, 323845200
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 1, :o3, 820465200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,176 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Dawson
-        include TimezoneDefinition
-        
-        timezone 'America/Dawson' do |tz|
-          tz.offset :o0, -33460, 0, :LMT
-          tz.offset :o1, -32400, 0, :YST
-          tz.offset :o2, -32400, 3600, :YDT
-          tz.offset :o3, -32400, 3600, :YWT
-          tz.offset :o4, -32400, 3600, :YPT
-          tz.offset :o5, -32400, 7200, :YDDT
-          tz.offset :o6, -28800, 0, :PST
-          tz.offset :o7, -28800, 3600, :PDT
-          
-          tz.transition 1900, 8, :o1, 10433888153, 4320
-          tz.transition 1918, 4, :o2, 58120751, 24
-          tz.transition 1918, 10, :o1, 29062727, 12
-          tz.transition 1919, 5, :o2, 58130495, 24
-          tz.transition 1919, 11, :o1, 14533583, 6
-          tz.transition 1942, 2, :o3, 58329599, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 29180747, 12
-          tz.transition 1965, 4, :o5, 19511007, 8
-          tz.transition 1965, 10, :o1, 19512519, 8
-          tz.transition 1973, 10, :o6, 120646800
-          tz.transition 1980, 4, :o7, 325677600
-          tz.transition 1980, 10, :o6, 341398800
-          tz.transition 1981, 4, :o7, 357127200
-          tz.transition 1981, 10, :o6, 372848400
-          tz.transition 1982, 4, :o7, 388576800
-          tz.transition 1982, 10, :o6, 404902800
-          tz.transition 1983, 4, :o7, 420026400
-          tz.transition 1983, 10, :o6, 436352400
-          tz.transition 1984, 4, :o7, 452080800
-          tz.transition 1984, 10, :o6, 467802000
-          tz.transition 1985, 4, :o7, 483530400
-          tz.transition 1985, 10, :o6, 499251600
-          tz.transition 1986, 4, :o7, 514980000
-          tz.transition 1986, 10, :o6, 530701200
-          tz.transition 1987, 4, :o7, 544615200
-          tz.transition 1987, 10, :o6, 562150800
-          tz.transition 1988, 4, :o7, 576064800
-          tz.transition 1988, 10, :o6, 594205200
-          tz.transition 1989, 4, :o7, 607514400
-          tz.transition 1989, 10, :o6, 625654800
-          tz.transition 1990, 4, :o7, 638964000
-          tz.transition 1990, 10, :o6, 657104400
-          tz.transition 1991, 4, :o7, 671018400
-          tz.transition 1991, 10, :o6, 688554000
-          tz.transition 1992, 4, :o7, 702468000
-          tz.transition 1992, 10, :o6, 720003600
-          tz.transition 1993, 4, :o7, 733917600
-          tz.transition 1993, 10, :o6, 752058000
-          tz.transition 1994, 4, :o7, 765367200
-          tz.transition 1994, 10, :o6, 783507600
-          tz.transition 1995, 4, :o7, 796816800
-          tz.transition 1995, 10, :o6, 814957200
-          tz.transition 1996, 4, :o7, 828871200
-          tz.transition 1996, 10, :o6, 846406800
-          tz.transition 1997, 4, :o7, 860320800
-          tz.transition 1997, 10, :o6, 877856400
-          tz.transition 1998, 4, :o7, 891770400
-          tz.transition 1998, 10, :o6, 909306000
-          tz.transition 1999, 4, :o7, 923220000
-          tz.transition 1999, 10, :o6, 941360400
-          tz.transition 2000, 4, :o7, 954669600
-          tz.transition 2000, 10, :o6, 972810000
-          tz.transition 2001, 4, :o7, 986119200
-          tz.transition 2001, 10, :o6, 1004259600
-          tz.transition 2002, 4, :o7, 1018173600
-          tz.transition 2002, 10, :o6, 1035709200
-          tz.transition 2003, 4, :o7, 1049623200
-          tz.transition 2003, 10, :o6, 1067158800
-          tz.transition 2004, 4, :o7, 1081072800
-          tz.transition 2004, 10, :o6, 1099213200
-          tz.transition 2005, 4, :o7, 1112522400
-          tz.transition 2005, 10, :o6, 1130662800
-          tz.transition 2006, 4, :o7, 1143972000
-          tz.transition 2006, 10, :o6, 1162112400
-          tz.transition 2007, 3, :o7, 1173607200
-          tz.transition 2007, 11, :o6, 1194166800
-          tz.transition 2008, 3, :o7, 1205056800
-          tz.transition 2008, 11, :o6, 1225616400
-          tz.transition 2009, 3, :o7, 1236506400
-          tz.transition 2009, 11, :o6, 1257066000
-          tz.transition 2010, 3, :o7, 1268560800
-          tz.transition 2010, 11, :o6, 1289120400
-          tz.transition 2011, 3, :o7, 1300010400
-          tz.transition 2011, 11, :o6, 1320570000
-          tz.transition 2012, 3, :o7, 1331460000
-          tz.transition 2012, 11, :o6, 1352019600
-          tz.transition 2013, 3, :o7, 1362909600
-          tz.transition 2013, 11, :o6, 1383469200
-          tz.transition 2014, 3, :o7, 1394359200
-          tz.transition 2014, 11, :o6, 1414918800
-          tz.transition 2015, 3, :o7, 1425808800
-          tz.transition 2015, 11, :o6, 1446368400
-          tz.transition 2016, 3, :o7, 1457863200
-          tz.transition 2016, 11, :o6, 1478422800
-          tz.transition 2017, 3, :o7, 1489312800
-          tz.transition 2017, 11, :o6, 1509872400
-          tz.transition 2018, 3, :o7, 1520762400
-          tz.transition 2018, 11, :o6, 1541322000
-          tz.transition 2019, 3, :o7, 1552212000
-          tz.transition 2019, 11, :o6, 1572771600
-          tz.transition 2020, 3, :o7, 1583661600
-          tz.transition 2020, 11, :o6, 1604221200
-          tz.transition 2021, 3, :o7, 1615716000
-          tz.transition 2021, 11, :o6, 1636275600
-          tz.transition 2022, 3, :o7, 1647165600
-          tz.transition 2022, 11, :o6, 1667725200
-          tz.transition 2023, 3, :o7, 1678615200
-          tz.transition 2023, 11, :o6, 1699174800
-          tz.transition 2024, 3, :o7, 1710064800
-          tz.transition 2024, 11, :o6, 1730624400
-          tz.transition 2025, 3, :o7, 1741514400
-          tz.transition 2025, 11, :o6, 1762074000
-          tz.transition 2026, 3, :o7, 1772964000
-          tz.transition 2026, 11, :o6, 1793523600
-          tz.transition 2027, 3, :o7, 1805018400
-          tz.transition 2027, 11, :o6, 1825578000
-          tz.transition 2028, 3, :o7, 1836468000
-          tz.transition 2028, 11, :o6, 1857027600
-          tz.transition 2029, 3, :o7, 1867917600
-          tz.transition 2029, 11, :o6, 1888477200
-          tz.transition 2030, 3, :o7, 1899367200
-          tz.transition 2030, 11, :o6, 1919926800
-          tz.transition 2031, 3, :o7, 1930816800
-          tz.transition 2031, 11, :o6, 1951376400
-          tz.transition 2032, 3, :o7, 1962871200
-          tz.transition 2032, 11, :o6, 1983430800
-          tz.transition 2033, 3, :o7, 1994320800
-          tz.transition 2033, 11, :o6, 2014880400
-          tz.transition 2034, 3, :o7, 2025770400
-          tz.transition 2034, 11, :o6, 2046330000
-          tz.transition 2035, 3, :o7, 2057220000
-          tz.transition 2035, 11, :o6, 2077779600
-          tz.transition 2036, 3, :o7, 2088669600
-          tz.transition 2036, 11, :o6, 2109229200
-          tz.transition 2037, 3, :o7, 2120119200
-          tz.transition 2037, 11, :o6, 2140678800
-          tz.transition 2038, 3, :o7, 29585963, 12
-          tz.transition 2038, 11, :o6, 19725879, 8
-          tz.transition 2039, 3, :o7, 29590331, 12
-          tz.transition 2039, 11, :o6, 19728791, 8
-          tz.transition 2040, 3, :o7, 29594699, 12
-          tz.transition 2040, 11, :o6, 19731703, 8
-          tz.transition 2041, 3, :o7, 29599067, 12
-          tz.transition 2041, 11, :o6, 19734615, 8
-          tz.transition 2042, 3, :o7, 29603435, 12
-          tz.transition 2042, 11, :o6, 19737527, 8
-          tz.transition 2043, 3, :o7, 29607803, 12
-          tz.transition 2043, 11, :o6, 19740439, 8
-          tz.transition 2044, 3, :o7, 29612255, 12
-          tz.transition 2044, 11, :o6, 19743407, 8
-          tz.transition 2045, 3, :o7, 29616623, 12
-          tz.transition 2045, 11, :o6, 19746319, 8
-          tz.transition 2046, 3, :o7, 29620991, 12
-          tz.transition 2046, 11, :o6, 19749231, 8
-          tz.transition 2047, 3, :o7, 29625359, 12
-          tz.transition 2047, 11, :o6, 19752143, 8
-          tz.transition 2048, 3, :o7, 29629727, 12
-          tz.transition 2048, 11, :o6, 19755055, 8
-          tz.transition 2049, 3, :o7, 29634179, 12
-          tz.transition 2049, 11, :o6, 19758023, 8
-          tz.transition 2050, 3, :o7, 29638547, 12
-          tz.transition 2050, 11, :o6, 19760935, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson_Creek.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson_Creek.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson_Creek.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dawson_Creek.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,79 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Dawson_Creek
-        include TimezoneDefinition
-        
-        timezone 'America/Dawson_Creek' do |tz|
-          tz.offset :o0, -28856, 0, :LMT
-          tz.offset :o1, -28800, 0, :PST
-          tz.offset :o2, -28800, 3600, :PDT
-          tz.offset :o3, -28800, 3600, :PWT
-          tz.offset :o4, -28800, 3600, :PPT
-          tz.offset :o5, -25200, 0, :MST
-          
-          tz.transition 1884, 1, :o1, 26019109807, 10800
-          tz.transition 1918, 4, :o2, 29060375, 12
-          tz.transition 1918, 10, :o1, 19375183, 8
-          tz.transition 1942, 2, :o3, 29164799, 12
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 19453831, 8
-          tz.transition 1947, 4, :o2, 29187635, 12
-          tz.transition 1947, 9, :o1, 19459655, 8
-          tz.transition 1948, 4, :o2, 29192003, 12
-          tz.transition 1948, 9, :o1, 19462567, 8
-          tz.transition 1949, 4, :o2, 29196371, 12
-          tz.transition 1949, 9, :o1, 19465479, 8
-          tz.transition 1950, 4, :o2, 29200823, 12
-          tz.transition 1950, 9, :o1, 19468391, 8
-          tz.transition 1951, 4, :o2, 29205191, 12
-          tz.transition 1951, 9, :o1, 19471359, 8
-          tz.transition 1952, 4, :o2, 29209559, 12
-          tz.transition 1952, 9, :o1, 19474271, 8
-          tz.transition 1953, 4, :o2, 29213927, 12
-          tz.transition 1953, 9, :o1, 19477183, 8
-          tz.transition 1954, 4, :o2, 29218295, 12
-          tz.transition 1954, 9, :o1, 19480095, 8
-          tz.transition 1955, 4, :o2, 29222663, 12
-          tz.transition 1955, 9, :o1, 19483007, 8
-          tz.transition 1956, 4, :o2, 29227115, 12
-          tz.transition 1956, 9, :o1, 19485975, 8
-          tz.transition 1957, 4, :o2, 29231483, 12
-          tz.transition 1957, 9, :o1, 19488887, 8
-          tz.transition 1958, 4, :o2, 29235851, 12
-          tz.transition 1958, 9, :o1, 19491799, 8
-          tz.transition 1959, 4, :o2, 29240219, 12
-          tz.transition 1959, 9, :o1, 19494711, 8
-          tz.transition 1960, 4, :o2, 29244587, 12
-          tz.transition 1960, 9, :o1, 19497623, 8
-          tz.transition 1961, 4, :o2, 29249039, 12
-          tz.transition 1961, 9, :o1, 19500535, 8
-          tz.transition 1962, 4, :o2, 29253407, 12
-          tz.transition 1962, 10, :o1, 19503727, 8
-          tz.transition 1963, 4, :o2, 29257775, 12
-          tz.transition 1963, 10, :o1, 19506639, 8
-          tz.transition 1964, 4, :o2, 29262143, 12
-          tz.transition 1964, 10, :o1, 19509551, 8
-          tz.transition 1965, 4, :o2, 29266511, 12
-          tz.transition 1965, 10, :o1, 19512519, 8
-          tz.transition 1966, 4, :o2, 29270879, 12
-          tz.transition 1966, 10, :o1, 19515431, 8
-          tz.transition 1967, 4, :o2, 29275331, 12
-          tz.transition 1967, 10, :o1, 19518343, 8
-          tz.transition 1968, 4, :o2, 29279699, 12
-          tz.transition 1968, 10, :o1, 19521255, 8
-          tz.transition 1969, 4, :o2, 29284067, 12
-          tz.transition 1969, 10, :o1, 19524167, 8
-          tz.transition 1970, 4, :o2, 9972000
-          tz.transition 1970, 10, :o1, 25693200
-          tz.transition 1971, 4, :o2, 41421600
-          tz.transition 1971, 10, :o1, 57747600
-          tz.transition 1972, 4, :o2, 73476000
-          tz.transition 1972, 8, :o5, 84013200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Denver.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Denver.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Denver.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Denver.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,204 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Denver
-        include TimezoneDefinition
-        
-        timezone 'America/Denver' do |tz|
-          tz.offset :o0, -25196, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          
-          tz.transition 1883, 11, :o1, 57819199, 24
-          tz.transition 1918, 3, :o2, 19373471, 8
-          tz.transition 1918, 10, :o1, 14531363, 6
-          tz.transition 1919, 3, :o2, 19376383, 8
-          tz.transition 1919, 10, :o1, 14533547, 6
-          tz.transition 1920, 3, :o2, 19379295, 8
-          tz.transition 1920, 10, :o1, 14535773, 6
-          tz.transition 1921, 3, :o2, 19382207, 8
-          tz.transition 1921, 5, :o1, 14536991, 6
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1965, 4, :o2, 19511007, 8
-          tz.transition 1965, 10, :o1, 14634389, 6
-          tz.transition 1966, 4, :o2, 19513919, 8
-          tz.transition 1966, 10, :o1, 14636573, 6
-          tz.transition 1967, 4, :o2, 19516887, 8
-          tz.transition 1967, 10, :o1, 14638757, 6
-          tz.transition 1968, 4, :o2, 19519799, 8
-          tz.transition 1968, 10, :o1, 14640941, 6
-          tz.transition 1969, 4, :o2, 19522711, 8
-          tz.transition 1969, 10, :o1, 14643125, 6
-          tz.transition 1970, 4, :o2, 9968400
-          tz.transition 1970, 10, :o1, 25689600
-          tz.transition 1971, 4, :o2, 41418000
-          tz.transition 1971, 10, :o1, 57744000
-          tz.transition 1972, 4, :o2, 73472400
-          tz.transition 1972, 10, :o1, 89193600
-          tz.transition 1973, 4, :o2, 104922000
-          tz.transition 1973, 10, :o1, 120643200
-          tz.transition 1974, 1, :o2, 126694800
-          tz.transition 1974, 10, :o1, 152092800
-          tz.transition 1975, 2, :o2, 162378000
-          tz.transition 1975, 10, :o1, 183542400
-          tz.transition 1976, 4, :o2, 199270800
-          tz.transition 1976, 10, :o1, 215596800
-          tz.transition 1977, 4, :o2, 230720400
-          tz.transition 1977, 10, :o1, 247046400
-          tz.transition 1978, 4, :o2, 262774800
-          tz.transition 1978, 10, :o1, 278496000
-          tz.transition 1979, 4, :o2, 294224400
-          tz.transition 1979, 10, :o1, 309945600
-          tz.transition 1980, 4, :o2, 325674000
-          tz.transition 1980, 10, :o1, 341395200
-          tz.transition 1981, 4, :o2, 357123600
-          tz.transition 1981, 10, :o1, 372844800
-          tz.transition 1982, 4, :o2, 388573200
-          tz.transition 1982, 10, :o1, 404899200
-          tz.transition 1983, 4, :o2, 420022800
-          tz.transition 1983, 10, :o1, 436348800
-          tz.transition 1984, 4, :o2, 452077200
-          tz.transition 1984, 10, :o1, 467798400
-          tz.transition 1985, 4, :o2, 483526800
-          tz.transition 1985, 10, :o1, 499248000
-          tz.transition 1986, 4, :o2, 514976400
-          tz.transition 1986, 10, :o1, 530697600
-          tz.transition 1987, 4, :o2, 544611600
-          tz.transition 1987, 10, :o1, 562147200
-          tz.transition 1988, 4, :o2, 576061200
-          tz.transition 1988, 10, :o1, 594201600
-          tz.transition 1989, 4, :o2, 607510800
-          tz.transition 1989, 10, :o1, 625651200
-          tz.transition 1990, 4, :o2, 638960400
-          tz.transition 1990, 10, :o1, 657100800
-          tz.transition 1991, 4, :o2, 671014800
-          tz.transition 1991, 10, :o1, 688550400
-          tz.transition 1992, 4, :o2, 702464400
-          tz.transition 1992, 10, :o1, 720000000
-          tz.transition 1993, 4, :o2, 733914000
-          tz.transition 1993, 10, :o1, 752054400
-          tz.transition 1994, 4, :o2, 765363600
-          tz.transition 1994, 10, :o1, 783504000
-          tz.transition 1995, 4, :o2, 796813200
-          tz.transition 1995, 10, :o1, 814953600
-          tz.transition 1996, 4, :o2, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o2, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o2, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o2, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o2, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 4, :o2, 986115600
-          tz.transition 2001, 10, :o1, 1004256000
-          tz.transition 2002, 4, :o2, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o2, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o2, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o2, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o2, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 3, :o2, 1173603600
-          tz.transition 2007, 11, :o1, 1194163200
-          tz.transition 2008, 3, :o2, 1205053200
-          tz.transition 2008, 11, :o1, 1225612800
-          tz.transition 2009, 3, :o2, 1236502800
-          tz.transition 2009, 11, :o1, 1257062400
-          tz.transition 2010, 3, :o2, 1268557200
-          tz.transition 2010, 11, :o1, 1289116800
-          tz.transition 2011, 3, :o2, 1300006800
-          tz.transition 2011, 11, :o1, 1320566400
-          tz.transition 2012, 3, :o2, 1331456400
-          tz.transition 2012, 11, :o1, 1352016000
-          tz.transition 2013, 3, :o2, 1362906000
-          tz.transition 2013, 11, :o1, 1383465600
-          tz.transition 2014, 3, :o2, 1394355600
-          tz.transition 2014, 11, :o1, 1414915200
-          tz.transition 2015, 3, :o2, 1425805200
-          tz.transition 2015, 11, :o1, 1446364800
-          tz.transition 2016, 3, :o2, 1457859600
-          tz.transition 2016, 11, :o1, 1478419200
-          tz.transition 2017, 3, :o2, 1489309200
-          tz.transition 2017, 11, :o1, 1509868800
-          tz.transition 2018, 3, :o2, 1520758800
-          tz.transition 2018, 11, :o1, 1541318400
-          tz.transition 2019, 3, :o2, 1552208400
-          tz.transition 2019, 11, :o1, 1572768000
-          tz.transition 2020, 3, :o2, 1583658000
-          tz.transition 2020, 11, :o1, 1604217600
-          tz.transition 2021, 3, :o2, 1615712400
-          tz.transition 2021, 11, :o1, 1636272000
-          tz.transition 2022, 3, :o2, 1647162000
-          tz.transition 2022, 11, :o1, 1667721600
-          tz.transition 2023, 3, :o2, 1678611600
-          tz.transition 2023, 11, :o1, 1699171200
-          tz.transition 2024, 3, :o2, 1710061200
-          tz.transition 2024, 11, :o1, 1730620800
-          tz.transition 2025, 3, :o2, 1741510800
-          tz.transition 2025, 11, :o1, 1762070400
-          tz.transition 2026, 3, :o2, 1772960400
-          tz.transition 2026, 11, :o1, 1793520000
-          tz.transition 2027, 3, :o2, 1805014800
-          tz.transition 2027, 11, :o1, 1825574400
-          tz.transition 2028, 3, :o2, 1836464400
-          tz.transition 2028, 11, :o1, 1857024000
-          tz.transition 2029, 3, :o2, 1867914000
-          tz.transition 2029, 11, :o1, 1888473600
-          tz.transition 2030, 3, :o2, 1899363600
-          tz.transition 2030, 11, :o1, 1919923200
-          tz.transition 2031, 3, :o2, 1930813200
-          tz.transition 2031, 11, :o1, 1951372800
-          tz.transition 2032, 3, :o2, 1962867600
-          tz.transition 2032, 11, :o1, 1983427200
-          tz.transition 2033, 3, :o2, 1994317200
-          tz.transition 2033, 11, :o1, 2014876800
-          tz.transition 2034, 3, :o2, 2025766800
-          tz.transition 2034, 11, :o1, 2046326400
-          tz.transition 2035, 3, :o2, 2057216400
-          tz.transition 2035, 11, :o1, 2077776000
-          tz.transition 2036, 3, :o2, 2088666000
-          tz.transition 2036, 11, :o1, 2109225600
-          tz.transition 2037, 3, :o2, 2120115600
-          tz.transition 2037, 11, :o1, 2140675200
-          tz.transition 2038, 3, :o2, 19723975, 8
-          tz.transition 2038, 11, :o1, 14794409, 6
-          tz.transition 2039, 3, :o2, 19726887, 8
-          tz.transition 2039, 11, :o1, 14796593, 6
-          tz.transition 2040, 3, :o2, 19729799, 8
-          tz.transition 2040, 11, :o1, 14798777, 6
-          tz.transition 2041, 3, :o2, 19732711, 8
-          tz.transition 2041, 11, :o1, 14800961, 6
-          tz.transition 2042, 3, :o2, 19735623, 8
-          tz.transition 2042, 11, :o1, 14803145, 6
-          tz.transition 2043, 3, :o2, 19738535, 8
-          tz.transition 2043, 11, :o1, 14805329, 6
-          tz.transition 2044, 3, :o2, 19741503, 8
-          tz.transition 2044, 11, :o1, 14807555, 6
-          tz.transition 2045, 3, :o2, 19744415, 8
-          tz.transition 2045, 11, :o1, 14809739, 6
-          tz.transition 2046, 3, :o2, 19747327, 8
-          tz.transition 2046, 11, :o1, 14811923, 6
-          tz.transition 2047, 3, :o2, 19750239, 8
-          tz.transition 2047, 11, :o1, 14814107, 6
-          tz.transition 2048, 3, :o2, 19753151, 8
-          tz.transition 2048, 11, :o1, 14816291, 6
-          tz.transition 2049, 3, :o2, 19756119, 8
-          tz.transition 2049, 11, :o1, 14818517, 6
-          tz.transition 2050, 3, :o2, 19759031, 8
-          tz.transition 2050, 11, :o1, 14820701, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Detroit.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Detroit.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Detroit.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Detroit.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,186 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Detroit
-        include TimezoneDefinition
-        
-        timezone 'America/Detroit' do |tz|
-          tz.offset :o0, -19931, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          tz.offset :o5, -18000, 3600, :EDT
-          
-          tz.transition 1905, 1, :o1, 208815557531, 86400
-          tz.transition 1915, 5, :o2, 14523797, 6
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 9726915, 4
-          tz.transition 1948, 4, :o5, 58384003, 24
-          tz.transition 1948, 9, :o2, 9731283, 4
-          tz.transition 1967, 6, :o5, 58551739, 24
-          tz.transition 1967, 10, :o2, 9759171, 4
-          tz.transition 1973, 4, :o5, 104914800
-          tz.transition 1973, 10, :o2, 120636000
-          tz.transition 1974, 1, :o5, 126687600
-          tz.transition 1974, 10, :o2, 152085600
-          tz.transition 1975, 4, :o5, 167814000
-          tz.transition 1975, 10, :o2, 183535200
-          tz.transition 1976, 4, :o5, 199263600
-          tz.transition 1976, 10, :o2, 215589600
-          tz.transition 1977, 4, :o5, 230713200
-          tz.transition 1977, 10, :o2, 247039200
-          tz.transition 1978, 4, :o5, 262767600
-          tz.transition 1978, 10, :o2, 278488800
-          tz.transition 1979, 4, :o5, 294217200
-          tz.transition 1979, 10, :o2, 309938400
-          tz.transition 1980, 4, :o5, 325666800
-          tz.transition 1980, 10, :o2, 341388000
-          tz.transition 1981, 4, :o5, 357116400
-          tz.transition 1981, 10, :o2, 372837600
-          tz.transition 1982, 4, :o5, 388566000
-          tz.transition 1982, 10, :o2, 404892000
-          tz.transition 1983, 4, :o5, 420015600
-          tz.transition 1983, 10, :o2, 436341600
-          tz.transition 1984, 4, :o5, 452070000
-          tz.transition 1984, 10, :o2, 467791200
-          tz.transition 1985, 4, :o5, 483519600
-          tz.transition 1985, 10, :o2, 499240800
-          tz.transition 1986, 4, :o5, 514969200
-          tz.transition 1986, 10, :o2, 530690400
-          tz.transition 1987, 4, :o5, 544604400
-          tz.transition 1987, 10, :o2, 562140000
-          tz.transition 1988, 4, :o5, 576054000
-          tz.transition 1988, 10, :o2, 594194400
-          tz.transition 1989, 4, :o5, 607503600
-          tz.transition 1989, 10, :o2, 625644000
-          tz.transition 1990, 4, :o5, 638953200
-          tz.transition 1990, 10, :o2, 657093600
-          tz.transition 1991, 4, :o5, 671007600
-          tz.transition 1991, 10, :o2, 688543200
-          tz.transition 1992, 4, :o5, 702457200
-          tz.transition 1992, 10, :o2, 719992800
-          tz.transition 1993, 4, :o5, 733906800
-          tz.transition 1993, 10, :o2, 752047200
-          tz.transition 1994, 4, :o5, 765356400
-          tz.transition 1994, 10, :o2, 783496800
-          tz.transition 1995, 4, :o5, 796806000
-          tz.transition 1995, 10, :o2, 814946400
-          tz.transition 1996, 4, :o5, 828860400
-          tz.transition 1996, 10, :o2, 846396000
-          tz.transition 1997, 4, :o5, 860310000
-          tz.transition 1997, 10, :o2, 877845600
-          tz.transition 1998, 4, :o5, 891759600
-          tz.transition 1998, 10, :o2, 909295200
-          tz.transition 1999, 4, :o5, 923209200
-          tz.transition 1999, 10, :o2, 941349600
-          tz.transition 2000, 4, :o5, 954658800
-          tz.transition 2000, 10, :o2, 972799200
-          tz.transition 2001, 4, :o5, 986108400
-          tz.transition 2001, 10, :o2, 1004248800
-          tz.transition 2002, 4, :o5, 1018162800
-          tz.transition 2002, 10, :o2, 1035698400
-          tz.transition 2003, 4, :o5, 1049612400
-          tz.transition 2003, 10, :o2, 1067148000
-          tz.transition 2004, 4, :o5, 1081062000
-          tz.transition 2004, 10, :o2, 1099202400
-          tz.transition 2005, 4, :o5, 1112511600
-          tz.transition 2005, 10, :o2, 1130652000
-          tz.transition 2006, 4, :o5, 1143961200
-          tz.transition 2006, 10, :o2, 1162101600
-          tz.transition 2007, 3, :o5, 1173596400
-          tz.transition 2007, 11, :o2, 1194156000
-          tz.transition 2008, 3, :o5, 1205046000
-          tz.transition 2008, 11, :o2, 1225605600
-          tz.transition 2009, 3, :o5, 1236495600
-          tz.transition 2009, 11, :o2, 1257055200
-          tz.transition 2010, 3, :o5, 1268550000
-          tz.transition 2010, 11, :o2, 1289109600
-          tz.transition 2011, 3, :o5, 1299999600
-          tz.transition 2011, 11, :o2, 1320559200
-          tz.transition 2012, 3, :o5, 1331449200
-          tz.transition 2012, 11, :o2, 1352008800
-          tz.transition 2013, 3, :o5, 1362898800
-          tz.transition 2013, 11, :o2, 1383458400
-          tz.transition 2014, 3, :o5, 1394348400
-          tz.transition 2014, 11, :o2, 1414908000
-          tz.transition 2015, 3, :o5, 1425798000
-          tz.transition 2015, 11, :o2, 1446357600
-          tz.transition 2016, 3, :o5, 1457852400
-          tz.transition 2016, 11, :o2, 1478412000
-          tz.transition 2017, 3, :o5, 1489302000
-          tz.transition 2017, 11, :o2, 1509861600
-          tz.transition 2018, 3, :o5, 1520751600
-          tz.transition 2018, 11, :o2, 1541311200
-          tz.transition 2019, 3, :o5, 1552201200
-          tz.transition 2019, 11, :o2, 1572760800
-          tz.transition 2020, 3, :o5, 1583650800
-          tz.transition 2020, 11, :o2, 1604210400
-          tz.transition 2021, 3, :o5, 1615705200
-          tz.transition 2021, 11, :o2, 1636264800
-          tz.transition 2022, 3, :o5, 1647154800
-          tz.transition 2022, 11, :o2, 1667714400
-          tz.transition 2023, 3, :o5, 1678604400
-          tz.transition 2023, 11, :o2, 1699164000
-          tz.transition 2024, 3, :o5, 1710054000
-          tz.transition 2024, 11, :o2, 1730613600
-          tz.transition 2025, 3, :o5, 1741503600
-          tz.transition 2025, 11, :o2, 1762063200
-          tz.transition 2026, 3, :o5, 1772953200
-          tz.transition 2026, 11, :o2, 1793512800
-          tz.transition 2027, 3, :o5, 1805007600
-          tz.transition 2027, 11, :o2, 1825567200
-          tz.transition 2028, 3, :o5, 1836457200
-          tz.transition 2028, 11, :o2, 1857016800
-          tz.transition 2029, 3, :o5, 1867906800
-          tz.transition 2029, 11, :o2, 1888466400
-          tz.transition 2030, 3, :o5, 1899356400
-          tz.transition 2030, 11, :o2, 1919916000
-          tz.transition 2031, 3, :o5, 1930806000
-          tz.transition 2031, 11, :o2, 1951365600
-          tz.transition 2032, 3, :o5, 1962860400
-          tz.transition 2032, 11, :o2, 1983420000
-          tz.transition 2033, 3, :o5, 1994310000
-          tz.transition 2033, 11, :o2, 2014869600
-          tz.transition 2034, 3, :o5, 2025759600
-          tz.transition 2034, 11, :o2, 2046319200
-          tz.transition 2035, 3, :o5, 2057209200
-          tz.transition 2035, 11, :o2, 2077768800
-          tz.transition 2036, 3, :o5, 2088658800
-          tz.transition 2036, 11, :o2, 2109218400
-          tz.transition 2037, 3, :o5, 2120108400
-          tz.transition 2037, 11, :o2, 2140668000
-          tz.transition 2038, 3, :o5, 59171923, 24
-          tz.transition 2038, 11, :o2, 9862939, 4
-          tz.transition 2039, 3, :o5, 59180659, 24
-          tz.transition 2039, 11, :o2, 9864395, 4
-          tz.transition 2040, 3, :o5, 59189395, 24
-          tz.transition 2040, 11, :o2, 9865851, 4
-          tz.transition 2041, 3, :o5, 59198131, 24
-          tz.transition 2041, 11, :o2, 9867307, 4
-          tz.transition 2042, 3, :o5, 59206867, 24
-          tz.transition 2042, 11, :o2, 9868763, 4
-          tz.transition 2043, 3, :o5, 59215603, 24
-          tz.transition 2043, 11, :o2, 9870219, 4
-          tz.transition 2044, 3, :o5, 59224507, 24
-          tz.transition 2044, 11, :o2, 9871703, 4
-          tz.transition 2045, 3, :o5, 59233243, 24
-          tz.transition 2045, 11, :o2, 9873159, 4
-          tz.transition 2046, 3, :o5, 59241979, 24
-          tz.transition 2046, 11, :o2, 9874615, 4
-          tz.transition 2047, 3, :o5, 59250715, 24
-          tz.transition 2047, 11, :o2, 9876071, 4
-          tz.transition 2048, 3, :o5, 59259451, 24
-          tz.transition 2048, 11, :o2, 9877527, 4
-          tz.transition 2049, 3, :o5, 59268355, 24
-          tz.transition 2049, 11, :o2, 9879011, 4
-          tz.transition 2050, 3, :o5, 59277091, 24
-          tz.transition 2050, 11, :o2, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dominica.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dominica.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dominica.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Dominica.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Dominica
-        include TimezoneDefinition
-        
-        timezone 'America/Dominica' do |tz|
-          tz.offset :o0, -14736, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1911, 7, :o1, 1935374937, 800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Edmonton.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Edmonton.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Edmonton.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Edmonton.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,200 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Edmonton
-        include TimezoneDefinition
-        
-        timezone 'America/Edmonton' do |tz|
-          tz.offset :o0, -27232, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          
-          tz.transition 1906, 9, :o1, 6527128001, 2700
-          tz.transition 1918, 4, :o2, 19373583, 8
-          tz.transition 1918, 10, :o1, 14531387, 6
-          tz.transition 1919, 4, :o2, 19376495, 8
-          tz.transition 1919, 5, :o1, 14532635, 6
-          tz.transition 1920, 4, :o2, 19379519, 8
-          tz.transition 1920, 10, :o1, 14535773, 6
-          tz.transition 1921, 4, :o2, 19382431, 8
-          tz.transition 1921, 9, :o1, 14537747, 6
-          tz.transition 1922, 4, :o2, 19385399, 8
-          tz.transition 1922, 9, :o1, 14539931, 6
-          tz.transition 1923, 4, :o2, 19388311, 8
-          tz.transition 1923, 9, :o1, 14542157, 6
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1947, 4, :o2, 19458423, 8
-          tz.transition 1947, 9, :o1, 14594741, 6
-          tz.transition 1967, 4, :o2, 19516887, 8
-          tz.transition 1967, 10, :o1, 14638757, 6
-          tz.transition 1969, 4, :o2, 19522711, 8
-          tz.transition 1969, 10, :o1, 14643125, 6
-          tz.transition 1972, 4, :o2, 73472400
-          tz.transition 1972, 10, :o1, 89193600
-          tz.transition 1973, 4, :o2, 104922000
-          tz.transition 1973, 10, :o1, 120643200
-          tz.transition 1974, 4, :o2, 136371600
-          tz.transition 1974, 10, :o1, 152092800
-          tz.transition 1975, 4, :o2, 167821200
-          tz.transition 1975, 10, :o1, 183542400
-          tz.transition 1976, 4, :o2, 199270800
-          tz.transition 1976, 10, :o1, 215596800
-          tz.transition 1977, 4, :o2, 230720400
-          tz.transition 1977, 10, :o1, 247046400
-          tz.transition 1978, 4, :o2, 262774800
-          tz.transition 1978, 10, :o1, 278496000
-          tz.transition 1979, 4, :o2, 294224400
-          tz.transition 1979, 10, :o1, 309945600
-          tz.transition 1980, 4, :o2, 325674000
-          tz.transition 1980, 10, :o1, 341395200
-          tz.transition 1981, 4, :o2, 357123600
-          tz.transition 1981, 10, :o1, 372844800
-          tz.transition 1982, 4, :o2, 388573200
-          tz.transition 1982, 10, :o1, 404899200
-          tz.transition 1983, 4, :o2, 420022800
-          tz.transition 1983, 10, :o1, 436348800
-          tz.transition 1984, 4, :o2, 452077200
-          tz.transition 1984, 10, :o1, 467798400
-          tz.transition 1985, 4, :o2, 483526800
-          tz.transition 1985, 10, :o1, 499248000
-          tz.transition 1986, 4, :o2, 514976400
-          tz.transition 1986, 10, :o1, 530697600
-          tz.transition 1987, 4, :o2, 544611600
-          tz.transition 1987, 10, :o1, 562147200
-          tz.transition 1988, 4, :o2, 576061200
-          tz.transition 1988, 10, :o1, 594201600
-          tz.transition 1989, 4, :o2, 607510800
-          tz.transition 1989, 10, :o1, 625651200
-          tz.transition 1990, 4, :o2, 638960400
-          tz.transition 1990, 10, :o1, 657100800
-          tz.transition 1991, 4, :o2, 671014800
-          tz.transition 1991, 10, :o1, 688550400
-          tz.transition 1992, 4, :o2, 702464400
-          tz.transition 1992, 10, :o1, 720000000
-          tz.transition 1993, 4, :o2, 733914000
-          tz.transition 1993, 10, :o1, 752054400
-          tz.transition 1994, 4, :o2, 765363600
-          tz.transition 1994, 10, :o1, 783504000
-          tz.transition 1995, 4, :o2, 796813200
-          tz.transition 1995, 10, :o1, 814953600
-          tz.transition 1996, 4, :o2, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o2, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o2, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o2, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o2, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 4, :o2, 986115600
-          tz.transition 2001, 10, :o1, 1004256000
-          tz.transition 2002, 4, :o2, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o2, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o2, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o2, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o2, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 3, :o2, 1173603600
-          tz.transition 2007, 11, :o1, 1194163200
-          tz.transition 2008, 3, :o2, 1205053200
-          tz.transition 2008, 11, :o1, 1225612800
-          tz.transition 2009, 3, :o2, 1236502800
-          tz.transition 2009, 11, :o1, 1257062400
-          tz.transition 2010, 3, :o2, 1268557200
-          tz.transition 2010, 11, :o1, 1289116800
-          tz.transition 2011, 3, :o2, 1300006800
-          tz.transition 2011, 11, :o1, 1320566400
-          tz.transition 2012, 3, :o2, 1331456400
-          tz.transition 2012, 11, :o1, 1352016000
-          tz.transition 2013, 3, :o2, 1362906000
-          tz.transition 2013, 11, :o1, 1383465600
-          tz.transition 2014, 3, :o2, 1394355600
-          tz.transition 2014, 11, :o1, 1414915200
-          tz.transition 2015, 3, :o2, 1425805200
-          tz.transition 2015, 11, :o1, 1446364800
-          tz.transition 2016, 3, :o2, 1457859600
-          tz.transition 2016, 11, :o1, 1478419200
-          tz.transition 2017, 3, :o2, 1489309200
-          tz.transition 2017, 11, :o1, 1509868800
-          tz.transition 2018, 3, :o2, 1520758800
-          tz.transition 2018, 11, :o1, 1541318400
-          tz.transition 2019, 3, :o2, 1552208400
-          tz.transition 2019, 11, :o1, 1572768000
-          tz.transition 2020, 3, :o2, 1583658000
-          tz.transition 2020, 11, :o1, 1604217600
-          tz.transition 2021, 3, :o2, 1615712400
-          tz.transition 2021, 11, :o1, 1636272000
-          tz.transition 2022, 3, :o2, 1647162000
-          tz.transition 2022, 11, :o1, 1667721600
-          tz.transition 2023, 3, :o2, 1678611600
-          tz.transition 2023, 11, :o1, 1699171200
-          tz.transition 2024, 3, :o2, 1710061200
-          tz.transition 2024, 11, :o1, 1730620800
-          tz.transition 2025, 3, :o2, 1741510800
-          tz.transition 2025, 11, :o1, 1762070400
-          tz.transition 2026, 3, :o2, 1772960400
-          tz.transition 2026, 11, :o1, 1793520000
-          tz.transition 2027, 3, :o2, 1805014800
-          tz.transition 2027, 11, :o1, 1825574400
-          tz.transition 2028, 3, :o2, 1836464400
-          tz.transition 2028, 11, :o1, 1857024000
-          tz.transition 2029, 3, :o2, 1867914000
-          tz.transition 2029, 11, :o1, 1888473600
-          tz.transition 2030, 3, :o2, 1899363600
-          tz.transition 2030, 11, :o1, 1919923200
-          tz.transition 2031, 3, :o2, 1930813200
-          tz.transition 2031, 11, :o1, 1951372800
-          tz.transition 2032, 3, :o2, 1962867600
-          tz.transition 2032, 11, :o1, 1983427200
-          tz.transition 2033, 3, :o2, 1994317200
-          tz.transition 2033, 11, :o1, 2014876800
-          tz.transition 2034, 3, :o2, 2025766800
-          tz.transition 2034, 11, :o1, 2046326400
-          tz.transition 2035, 3, :o2, 2057216400
-          tz.transition 2035, 11, :o1, 2077776000
-          tz.transition 2036, 3, :o2, 2088666000
-          tz.transition 2036, 11, :o1, 2109225600
-          tz.transition 2037, 3, :o2, 2120115600
-          tz.transition 2037, 11, :o1, 2140675200
-          tz.transition 2038, 3, :o2, 19723975, 8
-          tz.transition 2038, 11, :o1, 14794409, 6
-          tz.transition 2039, 3, :o2, 19726887, 8
-          tz.transition 2039, 11, :o1, 14796593, 6
-          tz.transition 2040, 3, :o2, 19729799, 8
-          tz.transition 2040, 11, :o1, 14798777, 6
-          tz.transition 2041, 3, :o2, 19732711, 8
-          tz.transition 2041, 11, :o1, 14800961, 6
-          tz.transition 2042, 3, :o2, 19735623, 8
-          tz.transition 2042, 11, :o1, 14803145, 6
-          tz.transition 2043, 3, :o2, 19738535, 8
-          tz.transition 2043, 11, :o1, 14805329, 6
-          tz.transition 2044, 3, :o2, 19741503, 8
-          tz.transition 2044, 11, :o1, 14807555, 6
-          tz.transition 2045, 3, :o2, 19744415, 8
-          tz.transition 2045, 11, :o1, 14809739, 6
-          tz.transition 2046, 3, :o2, 19747327, 8
-          tz.transition 2046, 11, :o1, 14811923, 6
-          tz.transition 2047, 3, :o2, 19750239, 8
-          tz.transition 2047, 11, :o1, 14814107, 6
-          tz.transition 2048, 3, :o2, 19753151, 8
-          tz.transition 2048, 11, :o1, 14816291, 6
-          tz.transition 2049, 3, :o2, 19756119, 8
-          tz.transition 2049, 11, :o1, 14818517, 6
-          tz.transition 2050, 3, :o2, 19759031, 8
-          tz.transition 2050, 11, :o1, 14820701, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Eirunepe.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Eirunepe.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Eirunepe.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Eirunepe.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,49 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Eirunepe
-        include TimezoneDefinition
-        
-        timezone 'America/Eirunepe' do |tz|
-          tz.offset :o0, -16768, 0, :LMT
-          tz.offset :o1, -18000, 0, :ACT
-          tz.offset :o2, -18000, 3600, :ACST
-          
-          tz.transition 1914, 1, :o1, 3267180487, 1350
-          tz.transition 1931, 10, :o2, 14559709, 6
-          tz.transition 1932, 4, :o1, 7280396, 3
-          tz.transition 1932, 10, :o2, 58247609, 24
-          tz.transition 1933, 4, :o1, 7281491, 3
-          tz.transition 1949, 12, :o2, 58398041, 24
-          tz.transition 1950, 4, :o1, 58401305, 24
-          tz.transition 1950, 12, :o2, 58406801, 24
-          tz.transition 1951, 4, :o1, 7301213, 3
-          tz.transition 1951, 12, :o2, 58415561, 24
-          tz.transition 1952, 4, :o1, 7302311, 3
-          tz.transition 1952, 12, :o2, 58424345, 24
-          tz.transition 1953, 3, :o1, 7303313, 3
-          tz.transition 1963, 12, :o2, 58520945, 24
-          tz.transition 1964, 3, :o1, 7315367, 3
-          tz.transition 1965, 1, :o2, 58531001, 24
-          tz.transition 1965, 3, :o1, 7316552, 3
-          tz.transition 1965, 12, :o2, 58538297, 24
-          tz.transition 1966, 3, :o1, 7317557, 3
-          tz.transition 1966, 11, :o2, 58546337, 24
-          tz.transition 1967, 3, :o1, 7318652, 3
-          tz.transition 1967, 11, :o2, 58555097, 24
-          tz.transition 1968, 3, :o1, 7319750, 3
-          tz.transition 1985, 11, :o2, 499755600
-          tz.transition 1986, 3, :o1, 511243200
-          tz.transition 1986, 10, :o2, 530600400
-          tz.transition 1987, 2, :o1, 540273600
-          tz.transition 1987, 10, :o2, 562136400
-          tz.transition 1988, 2, :o1, 571204800
-          tz.transition 1993, 10, :o2, 750834000
-          tz.transition 1994, 2, :o1, 761716800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/El_Salvador.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/El_Salvador.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/El_Salvador.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/El_Salvador.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module El_Salvador
-        include TimezoneDefinition
-        
-        timezone 'America/El_Salvador' do |tz|
-          tz.offset :o0, -21408, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          
-          tz.transition 1921, 1, :o1, 2180421673, 900
-          tz.transition 1987, 5, :o2, 547020000
-          tz.transition 1987, 9, :o1, 559717200
-          tz.transition 1988, 5, :o2, 578469600
-          tz.transition 1988, 9, :o1, 591166800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Ensenada.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Ensenada.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Ensenada.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Ensenada.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Ensenada
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Ensenada', 'America/Tijuana'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fort_Wayne.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fort_Wayne.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fort_Wayne.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fort_Wayne.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Fort_Wayne
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Fort_Wayne', 'America/Indiana/Indianapolis'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fortaleza.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fortaleza.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fortaleza.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Fortaleza.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,57 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Fortaleza
-        include TimezoneDefinition
-        
-        timezone 'America/Fortaleza' do |tz|
-          tz.offset :o0, -9240, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 1742496197, 720
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 12, :o2, 19506981, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-          tz.transition 1988, 10, :o2, 592974000
-          tz.transition 1989, 1, :o1, 602042400
-          tz.transition 1989, 10, :o2, 624423600
-          tz.transition 1990, 2, :o1, 634701600
-          tz.transition 1999, 10, :o2, 938919600
-          tz.transition 2000, 2, :o1, 951616800
-          tz.transition 2000, 10, :o2, 970974000
-          tz.transition 2000, 10, :o1, 972180000
-          tz.transition 2001, 10, :o2, 1003028400
-          tz.transition 2002, 2, :o1, 1013911200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Glace_Bay.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Glace_Bay.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Glace_Bay.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Glace_Bay.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,186 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Glace_Bay
-        include TimezoneDefinition
-        
-        timezone 'America/Glace_Bay' do |tz|
-          tz.offset :o0, -14388, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          tz.offset :o3, -14400, 3600, :AWT
-          tz.offset :o4, -14400, 3600, :APT
-          
-          tz.transition 1902, 6, :o1, 17394592799, 7200
-          tz.transition 1918, 4, :o2, 9686791, 4
-          tz.transition 1918, 10, :o1, 58125545, 24
-          tz.transition 1942, 2, :o3, 9721599, 4
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361489, 24
-          tz.transition 1953, 4, :o2, 9737975, 4
-          tz.transition 1953, 9, :o1, 58431545, 24
-          tz.transition 1972, 4, :o2, 73461600
-          tz.transition 1972, 10, :o1, 89182800
-          tz.transition 1973, 4, :o2, 104911200
-          tz.transition 1973, 10, :o1, 120632400
-          tz.transition 1974, 4, :o2, 136360800
-          tz.transition 1974, 10, :o1, 152082000
-          tz.transition 1975, 4, :o2, 167810400
-          tz.transition 1975, 10, :o1, 183531600
-          tz.transition 1976, 4, :o2, 199260000
-          tz.transition 1976, 10, :o1, 215586000
-          tz.transition 1977, 4, :o2, 230709600
-          tz.transition 1977, 10, :o1, 247035600
-          tz.transition 1978, 4, :o2, 262764000
-          tz.transition 1978, 10, :o1, 278485200
-          tz.transition 1979, 4, :o2, 294213600
-          tz.transition 1979, 10, :o1, 309934800
-          tz.transition 1980, 4, :o2, 325663200
-          tz.transition 1980, 10, :o1, 341384400
-          tz.transition 1981, 4, :o2, 357112800
-          tz.transition 1981, 10, :o1, 372834000
-          tz.transition 1982, 4, :o2, 388562400
-          tz.transition 1982, 10, :o1, 404888400
-          tz.transition 1983, 4, :o2, 420012000
-          tz.transition 1983, 10, :o1, 436338000
-          tz.transition 1984, 4, :o2, 452066400
-          tz.transition 1984, 10, :o1, 467787600
-          tz.transition 1985, 4, :o2, 483516000
-          tz.transition 1985, 10, :o1, 499237200
-          tz.transition 1986, 4, :o2, 514965600
-          tz.transition 1986, 10, :o1, 530686800
-          tz.transition 1987, 4, :o2, 544600800
-          tz.transition 1987, 10, :o1, 562136400
-          tz.transition 1988, 4, :o2, 576050400
-          tz.transition 1988, 10, :o1, 594190800
-          tz.transition 1989, 4, :o2, 607500000
-          tz.transition 1989, 10, :o1, 625640400
-          tz.transition 1990, 4, :o2, 638949600
-          tz.transition 1990, 10, :o1, 657090000
-          tz.transition 1991, 4, :o2, 671004000
-          tz.transition 1991, 10, :o1, 688539600
-          tz.transition 1992, 4, :o2, 702453600
-          tz.transition 1992, 10, :o1, 719989200
-          tz.transition 1993, 4, :o2, 733903200
-          tz.transition 1993, 10, :o1, 752043600
-          tz.transition 1994, 4, :o2, 765352800
-          tz.transition 1994, 10, :o1, 783493200
-          tz.transition 1995, 4, :o2, 796802400
-          tz.transition 1995, 10, :o1, 814942800
-          tz.transition 1996, 4, :o2, 828856800
-          tz.transition 1996, 10, :o1, 846392400
-          tz.transition 1997, 4, :o2, 860306400
-          tz.transition 1997, 10, :o1, 877842000
-          tz.transition 1998, 4, :o2, 891756000
-          tz.transition 1998, 10, :o1, 909291600
-          tz.transition 1999, 4, :o2, 923205600
-          tz.transition 1999, 10, :o1, 941346000
-          tz.transition 2000, 4, :o2, 954655200
-          tz.transition 2000, 10, :o1, 972795600
-          tz.transition 2001, 4, :o2, 986104800
-          tz.transition 2001, 10, :o1, 1004245200
-          tz.transition 2002, 4, :o2, 1018159200
-          tz.transition 2002, 10, :o1, 1035694800
-          tz.transition 2003, 4, :o2, 1049608800
-          tz.transition 2003, 10, :o1, 1067144400
-          tz.transition 2004, 4, :o2, 1081058400
-          tz.transition 2004, 10, :o1, 1099198800
-          tz.transition 2005, 4, :o2, 1112508000
-          tz.transition 2005, 10, :o1, 1130648400
-          tz.transition 2006, 4, :o2, 1143957600
-          tz.transition 2006, 10, :o1, 1162098000
-          tz.transition 2007, 3, :o2, 1173592800
-          tz.transition 2007, 11, :o1, 1194152400
-          tz.transition 2008, 3, :o2, 1205042400
-          tz.transition 2008, 11, :o1, 1225602000
-          tz.transition 2009, 3, :o2, 1236492000
-          tz.transition 2009, 11, :o1, 1257051600
-          tz.transition 2010, 3, :o2, 1268546400
-          tz.transition 2010, 11, :o1, 1289106000
-          tz.transition 2011, 3, :o2, 1299996000
-          tz.transition 2011, 11, :o1, 1320555600
-          tz.transition 2012, 3, :o2, 1331445600
-          tz.transition 2012, 11, :o1, 1352005200
-          tz.transition 2013, 3, :o2, 1362895200
-          tz.transition 2013, 11, :o1, 1383454800
-          tz.transition 2014, 3, :o2, 1394344800
-          tz.transition 2014, 11, :o1, 1414904400
-          tz.transition 2015, 3, :o2, 1425794400
-          tz.transition 2015, 11, :o1, 1446354000
-          tz.transition 2016, 3, :o2, 1457848800
-          tz.transition 2016, 11, :o1, 1478408400
-          tz.transition 2017, 3, :o2, 1489298400
-          tz.transition 2017, 11, :o1, 1509858000
-          tz.transition 2018, 3, :o2, 1520748000
-          tz.transition 2018, 11, :o1, 1541307600
-          tz.transition 2019, 3, :o2, 1552197600
-          tz.transition 2019, 11, :o1, 1572757200
-          tz.transition 2020, 3, :o2, 1583647200
-          tz.transition 2020, 11, :o1, 1604206800
-          tz.transition 2021, 3, :o2, 1615701600
-          tz.transition 2021, 11, :o1, 1636261200
-          tz.transition 2022, 3, :o2, 1647151200
-          tz.transition 2022, 11, :o1, 1667710800
-          tz.transition 2023, 3, :o2, 1678600800
-          tz.transition 2023, 11, :o1, 1699160400
-          tz.transition 2024, 3, :o2, 1710050400
-          tz.transition 2024, 11, :o1, 1730610000
-          tz.transition 2025, 3, :o2, 1741500000
-          tz.transition 2025, 11, :o1, 1762059600
-          tz.transition 2026, 3, :o2, 1772949600
-          tz.transition 2026, 11, :o1, 1793509200
-          tz.transition 2027, 3, :o2, 1805004000
-          tz.transition 2027, 11, :o1, 1825563600
-          tz.transition 2028, 3, :o2, 1836453600
-          tz.transition 2028, 11, :o1, 1857013200
-          tz.transition 2029, 3, :o2, 1867903200
-          tz.transition 2029, 11, :o1, 1888462800
-          tz.transition 2030, 3, :o2, 1899352800
-          tz.transition 2030, 11, :o1, 1919912400
-          tz.transition 2031, 3, :o2, 1930802400
-          tz.transition 2031, 11, :o1, 1951362000
-          tz.transition 2032, 3, :o2, 1962856800
-          tz.transition 2032, 11, :o1, 1983416400
-          tz.transition 2033, 3, :o2, 1994306400
-          tz.transition 2033, 11, :o1, 2014866000
-          tz.transition 2034, 3, :o2, 2025756000
-          tz.transition 2034, 11, :o1, 2046315600
-          tz.transition 2035, 3, :o2, 2057205600
-          tz.transition 2035, 11, :o1, 2077765200
-          tz.transition 2036, 3, :o2, 2088655200
-          tz.transition 2036, 11, :o1, 2109214800
-          tz.transition 2037, 3, :o2, 2120104800
-          tz.transition 2037, 11, :o1, 2140664400
-          tz.transition 2038, 3, :o2, 9861987, 4
-          tz.transition 2038, 11, :o1, 59177633, 24
-          tz.transition 2039, 3, :o2, 9863443, 4
-          tz.transition 2039, 11, :o1, 59186369, 24
-          tz.transition 2040, 3, :o2, 9864899, 4
-          tz.transition 2040, 11, :o1, 59195105, 24
-          tz.transition 2041, 3, :o2, 9866355, 4
-          tz.transition 2041, 11, :o1, 59203841, 24
-          tz.transition 2042, 3, :o2, 9867811, 4
-          tz.transition 2042, 11, :o1, 59212577, 24
-          tz.transition 2043, 3, :o2, 9869267, 4
-          tz.transition 2043, 11, :o1, 59221313, 24
-          tz.transition 2044, 3, :o2, 9870751, 4
-          tz.transition 2044, 11, :o1, 59230217, 24
-          tz.transition 2045, 3, :o2, 9872207, 4
-          tz.transition 2045, 11, :o1, 59238953, 24
-          tz.transition 2046, 3, :o2, 9873663, 4
-          tz.transition 2046, 11, :o1, 59247689, 24
-          tz.transition 2047, 3, :o2, 9875119, 4
-          tz.transition 2047, 11, :o1, 59256425, 24
-          tz.transition 2048, 3, :o2, 9876575, 4
-          tz.transition 2048, 11, :o1, 59265161, 24
-          tz.transition 2049, 3, :o2, 9878059, 4
-          tz.transition 2049, 11, :o1, 59274065, 24
-          tz.transition 2050, 3, :o2, 9879515, 4
-          tz.transition 2050, 11, :o1, 59282801, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Godthab.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Godthab.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Godthab.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Godthab.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,161 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Godthab
-        include TimezoneDefinition
-        
-        timezone 'America/Godthab' do |tz|
-          tz.offset :o0, -12416, 0, :LMT
-          tz.offset :o1, -10800, 0, :WGT
-          tz.offset :o2, -10800, 3600, :WGST
-          
-          tz.transition 1916, 7, :o1, 3268448069, 1350
-          tz.transition 1980, 4, :o2, 323845200
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Goose_Bay.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Goose_Bay.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Goose_Bay.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Goose_Bay.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,255 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Goose_Bay
-        include TimezoneDefinition
-        
-        timezone 'America/Goose_Bay' do |tz|
-          tz.offset :o0, -14500, 0, :LMT
-          tz.offset :o1, -12652, 0, :NST
-          tz.offset :o2, -12652, 3600, :NDT
-          tz.offset :o3, -12600, 0, :NST
-          tz.offset :o4, -12600, 3600, :NDT
-          tz.offset :o5, -12600, 3600, :NWT
-          tz.offset :o6, -12600, 3600, :NPT
-          tz.offset :o7, -14400, 0, :AST
-          tz.offset :o8, -14400, 3600, :ADT
-          tz.offset :o9, -14400, 7200, :ADDT
-          
-          tz.transition 1884, 1, :o1, 2081528641, 864
-          tz.transition 1918, 4, :o2, 52308670963, 21600
-          tz.transition 1918, 10, :o1, 52312990063, 21600
-          tz.transition 1935, 3, :o3, 52442459563, 21600
-          tz.transition 1936, 5, :o4, 116558383, 48
-          tz.transition 1936, 10, :o3, 116565437, 48
-          tz.transition 1937, 5, :o4, 116575855, 48
-          tz.transition 1937, 10, :o3, 116582909, 48
-          tz.transition 1938, 5, :o4, 116593327, 48
-          tz.transition 1938, 10, :o3, 116600381, 48
-          tz.transition 1939, 5, :o4, 116611135, 48
-          tz.transition 1939, 10, :o3, 116617853, 48
-          tz.transition 1940, 5, :o4, 116628607, 48
-          tz.transition 1940, 10, :o3, 116635661, 48
-          tz.transition 1941, 5, :o4, 116646079, 48
-          tz.transition 1941, 10, :o3, 116653133, 48
-          tz.transition 1942, 5, :o5, 116663551, 48
-          tz.transition 1945, 8, :o6, 58360379, 24
-          tz.transition 1945, 9, :o3, 38907659, 16
-          tz.transition 1946, 5, :o4, 116733731, 48
-          tz.transition 1946, 10, :o3, 38913595, 16
-          tz.transition 1947, 5, :o4, 116751203, 48
-          tz.transition 1947, 10, :o3, 38919419, 16
-          tz.transition 1948, 5, :o4, 116768675, 48
-          tz.transition 1948, 10, :o3, 38925243, 16
-          tz.transition 1949, 5, :o4, 116786147, 48
-          tz.transition 1949, 10, :o3, 38931067, 16
-          tz.transition 1950, 5, :o4, 116803955, 48
-          tz.transition 1950, 10, :o3, 38937003, 16
-          tz.transition 1951, 4, :o4, 116820755, 48
-          tz.transition 1951, 9, :o3, 38942715, 16
-          tz.transition 1952, 4, :o4, 116838227, 48
-          tz.transition 1952, 9, :o3, 38948539, 16
-          tz.transition 1953, 4, :o4, 116855699, 48
-          tz.transition 1953, 9, :o3, 38954363, 16
-          tz.transition 1954, 4, :o4, 116873171, 48
-          tz.transition 1954, 9, :o3, 38960187, 16
-          tz.transition 1955, 4, :o4, 116890643, 48
-          tz.transition 1955, 9, :o3, 38966011, 16
-          tz.transition 1956, 4, :o4, 116908451, 48
-          tz.transition 1956, 9, :o3, 38971947, 16
-          tz.transition 1957, 4, :o4, 116925923, 48
-          tz.transition 1957, 9, :o3, 38977771, 16
-          tz.transition 1958, 4, :o4, 116943395, 48
-          tz.transition 1958, 9, :o3, 38983595, 16
-          tz.transition 1959, 4, :o4, 116960867, 48
-          tz.transition 1959, 9, :o3, 38989419, 16
-          tz.transition 1960, 4, :o4, 116978339, 48
-          tz.transition 1960, 10, :o3, 38995803, 16
-          tz.transition 1961, 4, :o4, 116996147, 48
-          tz.transition 1961, 10, :o3, 39001627, 16
-          tz.transition 1962, 4, :o4, 117013619, 48
-          tz.transition 1962, 10, :o3, 39007451, 16
-          tz.transition 1963, 4, :o4, 117031091, 48
-          tz.transition 1963, 10, :o3, 39013275, 16
-          tz.transition 1964, 4, :o4, 117048563, 48
-          tz.transition 1964, 10, :o3, 39019099, 16
-          tz.transition 1965, 4, :o4, 117066035, 48
-          tz.transition 1965, 10, :o3, 39025035, 16
-          tz.transition 1966, 3, :o7, 117081587, 48
-          tz.transition 1966, 4, :o8, 9756959, 4
-          tz.transition 1966, 10, :o7, 58546289, 24
-          tz.transition 1967, 4, :o8, 9758443, 4
-          tz.transition 1967, 10, :o7, 58555025, 24
-          tz.transition 1968, 4, :o8, 9759899, 4
-          tz.transition 1968, 10, :o7, 58563761, 24
-          tz.transition 1969, 4, :o8, 9761355, 4
-          tz.transition 1969, 10, :o7, 58572497, 24
-          tz.transition 1970, 4, :o8, 9957600
-          tz.transition 1970, 10, :o7, 25678800
-          tz.transition 1971, 4, :o8, 41407200
-          tz.transition 1971, 10, :o7, 57733200
-          tz.transition 1972, 4, :o8, 73461600
-          tz.transition 1972, 10, :o7, 89182800
-          tz.transition 1973, 4, :o8, 104911200
-          tz.transition 1973, 10, :o7, 120632400
-          tz.transition 1974, 4, :o8, 136360800
-          tz.transition 1974, 10, :o7, 152082000
-          tz.transition 1975, 4, :o8, 167810400
-          tz.transition 1975, 10, :o7, 183531600
-          tz.transition 1976, 4, :o8, 199260000
-          tz.transition 1976, 10, :o7, 215586000
-          tz.transition 1977, 4, :o8, 230709600
-          tz.transition 1977, 10, :o7, 247035600
-          tz.transition 1978, 4, :o8, 262764000
-          tz.transition 1978, 10, :o7, 278485200
-          tz.transition 1979, 4, :o8, 294213600
-          tz.transition 1979, 10, :o7, 309934800
-          tz.transition 1980, 4, :o8, 325663200
-          tz.transition 1980, 10, :o7, 341384400
-          tz.transition 1981, 4, :o8, 357112800
-          tz.transition 1981, 10, :o7, 372834000
-          tz.transition 1982, 4, :o8, 388562400
-          tz.transition 1982, 10, :o7, 404888400
-          tz.transition 1983, 4, :o8, 420012000
-          tz.transition 1983, 10, :o7, 436338000
-          tz.transition 1984, 4, :o8, 452066400
-          tz.transition 1984, 10, :o7, 467787600
-          tz.transition 1985, 4, :o8, 483516000
-          tz.transition 1985, 10, :o7, 499237200
-          tz.transition 1986, 4, :o8, 514965600
-          tz.transition 1986, 10, :o7, 530686800
-          tz.transition 1987, 4, :o8, 544593660
-          tz.transition 1987, 10, :o7, 562129260
-          tz.transition 1988, 4, :o9, 576043260
-          tz.transition 1988, 10, :o7, 594180060
-          tz.transition 1989, 4, :o8, 607492860
-          tz.transition 1989, 10, :o7, 625633260
-          tz.transition 1990, 4, :o8, 638942460
-          tz.transition 1990, 10, :o7, 657082860
-          tz.transition 1991, 4, :o8, 670996860
-          tz.transition 1991, 10, :o7, 688532460
-          tz.transition 1992, 4, :o8, 702446460
-          tz.transition 1992, 10, :o7, 719982060
-          tz.transition 1993, 4, :o8, 733896060
-          tz.transition 1993, 10, :o7, 752036460
-          tz.transition 1994, 4, :o8, 765345660
-          tz.transition 1994, 10, :o7, 783486060
-          tz.transition 1995, 4, :o8, 796795260
-          tz.transition 1995, 10, :o7, 814935660
-          tz.transition 1996, 4, :o8, 828849660
-          tz.transition 1996, 10, :o7, 846385260
-          tz.transition 1997, 4, :o8, 860299260
-          tz.transition 1997, 10, :o7, 877834860
-          tz.transition 1998, 4, :o8, 891748860
-          tz.transition 1998, 10, :o7, 909284460
-          tz.transition 1999, 4, :o8, 923198460
-          tz.transition 1999, 10, :o7, 941338860
-          tz.transition 2000, 4, :o8, 954648060
-          tz.transition 2000, 10, :o7, 972788460
-          tz.transition 2001, 4, :o8, 986097660
-          tz.transition 2001, 10, :o7, 1004238060
-          tz.transition 2002, 4, :o8, 1018152060
-          tz.transition 2002, 10, :o7, 1035687660
-          tz.transition 2003, 4, :o8, 1049601660
-          tz.transition 2003, 10, :o7, 1067137260
-          tz.transition 2004, 4, :o8, 1081051260
-          tz.transition 2004, 10, :o7, 1099191660
-          tz.transition 2005, 4, :o8, 1112500860
-          tz.transition 2005, 10, :o7, 1130641260
-          tz.transition 2006, 4, :o8, 1143950460
-          tz.transition 2006, 10, :o7, 1162090860
-          tz.transition 2007, 3, :o8, 1173585660
-          tz.transition 2007, 11, :o7, 1194145260
-          tz.transition 2008, 3, :o8, 1205035260
-          tz.transition 2008, 11, :o7, 1225594860
-          tz.transition 2009, 3, :o8, 1236484860
-          tz.transition 2009, 11, :o7, 1257044460
-          tz.transition 2010, 3, :o8, 1268539260
-          tz.transition 2010, 11, :o7, 1289098860
-          tz.transition 2011, 3, :o8, 1299988860
-          tz.transition 2011, 11, :o7, 1320548460
-          tz.transition 2012, 3, :o8, 1331438460
-          tz.transition 2012, 11, :o7, 1351998060
-          tz.transition 2013, 3, :o8, 1362888060
-          tz.transition 2013, 11, :o7, 1383447660
-          tz.transition 2014, 3, :o8, 1394337660
-          tz.transition 2014, 11, :o7, 1414897260
-          tz.transition 2015, 3, :o8, 1425787260
-          tz.transition 2015, 11, :o7, 1446346860
-          tz.transition 2016, 3, :o8, 1457841660
-          tz.transition 2016, 11, :o7, 1478401260
-          tz.transition 2017, 3, :o8, 1489291260
-          tz.transition 2017, 11, :o7, 1509850860
-          tz.transition 2018, 3, :o8, 1520740860
-          tz.transition 2018, 11, :o7, 1541300460
-          tz.transition 2019, 3, :o8, 1552190460
-          tz.transition 2019, 11, :o7, 1572750060
-          tz.transition 2020, 3, :o8, 1583640060
-          tz.transition 2020, 11, :o7, 1604199660
-          tz.transition 2021, 3, :o8, 1615694460
-          tz.transition 2021, 11, :o7, 1636254060
-          tz.transition 2022, 3, :o8, 1647144060
-          tz.transition 2022, 11, :o7, 1667703660
-          tz.transition 2023, 3, :o8, 1678593660
-          tz.transition 2023, 11, :o7, 1699153260
-          tz.transition 2024, 3, :o8, 1710043260
-          tz.transition 2024, 11, :o7, 1730602860
-          tz.transition 2025, 3, :o8, 1741492860
-          tz.transition 2025, 11, :o7, 1762052460
-          tz.transition 2026, 3, :o8, 1772942460
-          tz.transition 2026, 11, :o7, 1793502060
-          tz.transition 2027, 3, :o8, 1804996860
-          tz.transition 2027, 11, :o7, 1825556460
-          tz.transition 2028, 3, :o8, 1836446460
-          tz.transition 2028, 11, :o7, 1857006060
-          tz.transition 2029, 3, :o8, 1867896060
-          tz.transition 2029, 11, :o7, 1888455660
-          tz.transition 2030, 3, :o8, 1899345660
-          tz.transition 2030, 11, :o7, 1919905260
-          tz.transition 2031, 3, :o8, 1930795260
-          tz.transition 2031, 11, :o7, 1951354860
-          tz.transition 2032, 3, :o8, 1962849660
-          tz.transition 2032, 11, :o7, 1983409260
-          tz.transition 2033, 3, :o8, 1994299260
-          tz.transition 2033, 11, :o7, 2014858860
-          tz.transition 2034, 3, :o8, 2025748860
-          tz.transition 2034, 11, :o7, 2046308460
-          tz.transition 2035, 3, :o8, 2057198460
-          tz.transition 2035, 11, :o7, 2077758060
-          tz.transition 2036, 3, :o8, 2088648060
-          tz.transition 2036, 11, :o7, 2109207660
-          tz.transition 2037, 3, :o8, 2120097660
-          tz.transition 2037, 11, :o7, 2140657260
-          tz.transition 2038, 3, :o8, 3550315201, 1440
-          tz.transition 2038, 11, :o7, 3550657861, 1440
-          tz.transition 2039, 3, :o8, 3550839361, 1440
-          tz.transition 2039, 11, :o7, 3551182021, 1440
-          tz.transition 2040, 3, :o8, 3551363521, 1440
-          tz.transition 2040, 11, :o7, 3551706181, 1440
-          tz.transition 2041, 3, :o8, 3551887681, 1440
-          tz.transition 2041, 11, :o7, 3552230341, 1440
-          tz.transition 2042, 3, :o8, 3552411841, 1440
-          tz.transition 2042, 11, :o7, 3552754501, 1440
-          tz.transition 2043, 3, :o8, 3552936001, 1440
-          tz.transition 2043, 11, :o7, 3553278661, 1440
-          tz.transition 2044, 3, :o8, 3553470241, 1440
-          tz.transition 2044, 11, :o7, 3553812901, 1440
-          tz.transition 2045, 3, :o8, 3553994401, 1440
-          tz.transition 2045, 11, :o7, 3554337061, 1440
-          tz.transition 2046, 3, :o8, 3554518561, 1440
-          tz.transition 2046, 11, :o7, 3554861221, 1440
-          tz.transition 2047, 3, :o8, 3555042721, 1440
-          tz.transition 2047, 11, :o7, 3555385381, 1440
-          tz.transition 2048, 3, :o8, 3555566881, 1440
-          tz.transition 2048, 11, :o7, 3555909541, 1440
-          tz.transition 2049, 3, :o8, 3556101121, 1440
-          tz.transition 2049, 11, :o7, 3556443781, 1440
-          tz.transition 2050, 3, :o8, 3556625281, 1440
-          tz.transition 2050, 11, :o7, 3556967941, 1440
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grand_Turk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grand_Turk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grand_Turk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grand_Turk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Grand_Turk
-        include TimezoneDefinition
-        
-        timezone 'America/Grand_Turk' do |tz|
-          tz.offset :o0, -17072, 0, :LMT
-          tz.offset :o1, -18432, 0, :KMT
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -18000, 3600, :EDT
-          
-          tz.transition 1890, 1, :o1, 13021390967, 5400
-          tz.transition 1912, 2, :o2, 362915057, 150
-          tz.transition 1979, 4, :o3, 294210000
-          tz.transition 1979, 10, :o2, 309931200
-          tz.transition 1980, 4, :o3, 325659600
-          tz.transition 1980, 10, :o2, 341380800
-          tz.transition 1981, 4, :o3, 357109200
-          tz.transition 1981, 10, :o2, 372830400
-          tz.transition 1982, 4, :o3, 388558800
-          tz.transition 1982, 10, :o2, 404884800
-          tz.transition 1983, 4, :o3, 420008400
-          tz.transition 1983, 10, :o2, 436334400
-          tz.transition 1984, 4, :o3, 452062800
-          tz.transition 1984, 10, :o2, 467784000
-          tz.transition 1985, 4, :o3, 483512400
-          tz.transition 1985, 10, :o2, 499233600
-          tz.transition 1986, 4, :o3, 514962000
-          tz.transition 1986, 10, :o2, 530683200
-          tz.transition 1987, 4, :o3, 544597200
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 4, :o3, 576046800
-          tz.transition 1988, 10, :o2, 594187200
-          tz.transition 1989, 4, :o3, 607496400
-          tz.transition 1989, 10, :o2, 625636800
-          tz.transition 1990, 4, :o3, 638946000
-          tz.transition 1990, 10, :o2, 657086400
-          tz.transition 1991, 4, :o3, 671000400
-          tz.transition 1991, 10, :o2, 688536000
-          tz.transition 1992, 4, :o3, 702450000
-          tz.transition 1992, 10, :o2, 719985600
-          tz.transition 1993, 4, :o3, 733899600
-          tz.transition 1993, 10, :o2, 752040000
-          tz.transition 1994, 4, :o3, 765349200
-          tz.transition 1994, 10, :o2, 783489600
-          tz.transition 1995, 4, :o3, 796798800
-          tz.transition 1995, 10, :o2, 814939200
-          tz.transition 1996, 4, :o3, 828853200
-          tz.transition 1996, 10, :o2, 846388800
-          tz.transition 1997, 4, :o3, 860302800
-          tz.transition 1997, 10, :o2, 877838400
-          tz.transition 1998, 4, :o3, 891752400
-          tz.transition 1998, 10, :o2, 909288000
-          tz.transition 1999, 4, :o3, 923202000
-          tz.transition 1999, 10, :o2, 941342400
-          tz.transition 2000, 4, :o3, 954651600
-          tz.transition 2000, 10, :o2, 972792000
-          tz.transition 2001, 4, :o3, 986101200
-          tz.transition 2001, 10, :o2, 1004241600
-          tz.transition 2002, 4, :o3, 1018155600
-          tz.transition 2002, 10, :o2, 1035691200
-          tz.transition 2003, 4, :o3, 1049605200
-          tz.transition 2003, 10, :o2, 1067140800
-          tz.transition 2004, 4, :o3, 1081054800
-          tz.transition 2004, 10, :o2, 1099195200
-          tz.transition 2005, 4, :o3, 1112504400
-          tz.transition 2005, 10, :o2, 1130644800
-          tz.transition 2006, 4, :o3, 1143954000
-          tz.transition 2006, 10, :o2, 1162094400
-          tz.transition 2007, 4, :o3, 1175403600
-          tz.transition 2007, 10, :o2, 1193544000
-          tz.transition 2008, 4, :o3, 1207458000
-          tz.transition 2008, 10, :o2, 1224993600
-          tz.transition 2009, 4, :o3, 1238907600
-          tz.transition 2009, 10, :o2, 1256443200
-          tz.transition 2010, 4, :o3, 1270357200
-          tz.transition 2010, 10, :o2, 1288497600
-          tz.transition 2011, 4, :o3, 1301806800
-          tz.transition 2011, 10, :o2, 1319947200
-          tz.transition 2012, 4, :o3, 1333256400
-          tz.transition 2012, 10, :o2, 1351396800
-          tz.transition 2013, 4, :o3, 1365310800
-          tz.transition 2013, 10, :o2, 1382846400
-          tz.transition 2014, 4, :o3, 1396760400
-          tz.transition 2014, 10, :o2, 1414296000
-          tz.transition 2015, 4, :o3, 1428210000
-          tz.transition 2015, 10, :o2, 1445745600
-          tz.transition 2016, 4, :o3, 1459659600
-          tz.transition 2016, 10, :o2, 1477800000
-          tz.transition 2017, 4, :o3, 1491109200
-          tz.transition 2017, 10, :o2, 1509249600
-          tz.transition 2018, 4, :o3, 1522558800
-          tz.transition 2018, 10, :o2, 1540699200
-          tz.transition 2019, 4, :o3, 1554613200
-          tz.transition 2019, 10, :o2, 1572148800
-          tz.transition 2020, 4, :o3, 1586062800
-          tz.transition 2020, 10, :o2, 1603598400
-          tz.transition 2021, 4, :o3, 1617512400
-          tz.transition 2021, 10, :o2, 1635652800
-          tz.transition 2022, 4, :o3, 1648962000
-          tz.transition 2022, 10, :o2, 1667102400
-          tz.transition 2023, 4, :o3, 1680411600
-          tz.transition 2023, 10, :o2, 1698552000
-          tz.transition 2024, 4, :o3, 1712466000
-          tz.transition 2024, 10, :o2, 1730001600
-          tz.transition 2025, 4, :o3, 1743915600
-          tz.transition 2025, 10, :o2, 1761451200
-          tz.transition 2026, 4, :o3, 1775365200
-          tz.transition 2026, 10, :o2, 1792900800
-          tz.transition 2027, 4, :o3, 1806814800
-          tz.transition 2027, 10, :o2, 1824955200
-          tz.transition 2028, 4, :o3, 1838264400
-          tz.transition 2028, 10, :o2, 1856404800
-          tz.transition 2029, 4, :o3, 1869714000
-          tz.transition 2029, 10, :o2, 1887854400
-          tz.transition 2030, 4, :o3, 1901768400
-          tz.transition 2030, 10, :o2, 1919304000
-          tz.transition 2031, 4, :o3, 1933218000
-          tz.transition 2031, 10, :o2, 1950753600
-          tz.transition 2032, 4, :o3, 1964667600
-          tz.transition 2032, 10, :o2, 1982808000
-          tz.transition 2033, 4, :o3, 1996117200
-          tz.transition 2033, 10, :o2, 2014257600
-          tz.transition 2034, 4, :o3, 2027566800
-          tz.transition 2034, 10, :o2, 2045707200
-          tz.transition 2035, 4, :o3, 2059016400
-          tz.transition 2035, 10, :o2, 2077156800
-          tz.transition 2036, 4, :o3, 2091070800
-          tz.transition 2036, 10, :o2, 2108606400
-          tz.transition 2037, 4, :o3, 2122520400
-          tz.transition 2037, 10, :o2, 2140056000
-          tz.transition 2038, 4, :o3, 59172425, 24
-          tz.transition 2038, 10, :o2, 7397183, 3
-          tz.transition 2039, 4, :o3, 59181161, 24
-          tz.transition 2039, 10, :o2, 7398275, 3
-          tz.transition 2040, 4, :o3, 59189897, 24
-          tz.transition 2040, 10, :o2, 7399367, 3
-          tz.transition 2041, 4, :o3, 59198801, 24
-          tz.transition 2041, 10, :o2, 7400459, 3
-          tz.transition 2042, 4, :o3, 59207537, 24
-          tz.transition 2042, 10, :o2, 7401551, 3
-          tz.transition 2043, 4, :o3, 59216273, 24
-          tz.transition 2043, 10, :o2, 7402643, 3
-          tz.transition 2044, 4, :o3, 59225009, 24
-          tz.transition 2044, 10, :o2, 7403756, 3
-          tz.transition 2045, 4, :o3, 59233745, 24
-          tz.transition 2045, 10, :o2, 7404848, 3
-          tz.transition 2046, 4, :o3, 59242481, 24
-          tz.transition 2046, 10, :o2, 7405940, 3
-          tz.transition 2047, 4, :o3, 59251385, 24
-          tz.transition 2047, 10, :o2, 7407032, 3
-          tz.transition 2048, 4, :o3, 59260121, 24
-          tz.transition 2048, 10, :o2, 7408124, 3
-          tz.transition 2049, 4, :o3, 59268857, 24
-          tz.transition 2049, 10, :o2, 7409237, 3
-          tz.transition 2050, 4, :o3, 59277593, 24
-          tz.transition 2050, 10, :o2, 7410329, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grenada.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grenada.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grenada.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Grenada.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Grenada
-        include TimezoneDefinition
-        
-        timezone 'America/Grenada' do |tz|
-          tz.offset :o0, -14820, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1911, 7, :o1, 3483674887, 1440
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guadeloupe.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guadeloupe.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guadeloupe.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guadeloupe.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Guadeloupe
-        include TimezoneDefinition
-        
-        timezone 'America/Guadeloupe' do |tz|
-          tz.offset :o0, -14768, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1911, 6, :o1, 13063656623, 5400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guatemala.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guatemala.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guatemala.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guatemala.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,27 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Guatemala
-        include TimezoneDefinition
-        
-        timezone 'America/Guatemala' do |tz|
-          tz.offset :o0, -21724, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          
-          tz.transition 1918, 10, :o1, 52312429831, 21600
-          tz.transition 1973, 11, :o2, 123055200
-          tz.transition 1974, 2, :o1, 130914000
-          tz.transition 1983, 5, :o2, 422344800
-          tz.transition 1983, 9, :o1, 433054800
-          tz.transition 1991, 3, :o2, 669708000
-          tz.transition 1991, 9, :o1, 684219600
-          tz.transition 2006, 4, :o2, 1146376800
-          tz.transition 2006, 10, :o1, 1159678800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guayaquil.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guayaquil.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guayaquil.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guayaquil.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Guayaquil
-        include TimezoneDefinition
-        
-        timezone 'America/Guayaquil' do |tz|
-          tz.offset :o0, -19160, 0, :LMT
-          tz.offset :o1, -18840, 0, :QMT
-          tz.offset :o2, -18000, 0, :ECT
-          
-          tz.transition 1890, 1, :o1, 5208556439, 2160
-          tz.transition 1931, 1, :o2, 1746966757, 720
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guyana.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guyana.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guyana.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Guyana.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,24 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Guyana
-        include TimezoneDefinition
-        
-        timezone 'America/Guyana' do |tz|
-          tz.offset :o0, -13960, 0, :LMT
-          tz.offset :o1, -13500, 0, :GBGT
-          tz.offset :o2, -13500, 0, :GYT
-          tz.offset :o3, -10800, 0, :GYT
-          tz.offset :o4, -14400, 0, :GYT
-          
-          tz.transition 1915, 3, :o1, 5228404549, 2160
-          tz.transition 1966, 5, :o2, 78056693, 32
-          tz.transition 1975, 7, :o3, 176010300
-          tz.transition 1991, 1, :o4, 662698800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Halifax.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Halifax.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Halifax.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Halifax.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,274 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Halifax
-        include TimezoneDefinition
-        
-        timezone 'America/Halifax' do |tz|
-          tz.offset :o0, -15264, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          tz.offset :o3, -14400, 3600, :AWT
-          tz.offset :o4, -14400, 3600, :APT
-          
-          tz.transition 1902, 6, :o1, 724774703, 300
-          tz.transition 1916, 4, :o2, 7262864, 3
-          tz.transition 1916, 10, :o1, 19369101, 8
-          tz.transition 1918, 4, :o2, 9686791, 4
-          tz.transition 1918, 10, :o1, 58125545, 24
-          tz.transition 1920, 5, :o2, 7267361, 3
-          tz.transition 1920, 8, :o1, 19380525, 8
-          tz.transition 1921, 5, :o2, 7268447, 3
-          tz.transition 1921, 9, :o1, 19383501, 8
-          tz.transition 1922, 4, :o2, 7269524, 3
-          tz.transition 1922, 9, :o1, 19386421, 8
-          tz.transition 1923, 5, :o2, 7270637, 3
-          tz.transition 1923, 9, :o1, 19389333, 8
-          tz.transition 1924, 5, :o2, 7271729, 3
-          tz.transition 1924, 9, :o1, 19392349, 8
-          tz.transition 1925, 5, :o2, 7272821, 3
-          tz.transition 1925, 9, :o1, 19395373, 8
-          tz.transition 1926, 5, :o2, 7273955, 3
-          tz.transition 1926, 9, :o1, 19398173, 8
-          tz.transition 1927, 5, :o2, 7275005, 3
-          tz.transition 1927, 9, :o1, 19401197, 8
-          tz.transition 1928, 5, :o2, 7276139, 3
-          tz.transition 1928, 9, :o1, 19403989, 8
-          tz.transition 1929, 5, :o2, 7277231, 3
-          tz.transition 1929, 9, :o1, 19406861, 8
-          tz.transition 1930, 5, :o2, 7278323, 3
-          tz.transition 1930, 9, :o1, 19409877, 8
-          tz.transition 1931, 5, :o2, 7279415, 3
-          tz.transition 1931, 9, :o1, 19412901, 8
-          tz.transition 1932, 5, :o2, 7280486, 3
-          tz.transition 1932, 9, :o1, 19415813, 8
-          tz.transition 1933, 4, :o2, 7281578, 3
-          tz.transition 1933, 10, :o1, 19418781, 8
-          tz.transition 1934, 5, :o2, 7282733, 3
-          tz.transition 1934, 9, :o1, 19421573, 8
-          tz.transition 1935, 6, :o2, 7283867, 3
-          tz.transition 1935, 9, :o1, 19424605, 8
-          tz.transition 1936, 6, :o2, 7284962, 3
-          tz.transition 1936, 9, :o1, 19427405, 8
-          tz.transition 1937, 5, :o2, 7285967, 3
-          tz.transition 1937, 9, :o1, 19430429, 8
-          tz.transition 1938, 5, :o2, 7287059, 3
-          tz.transition 1938, 9, :o1, 19433341, 8
-          tz.transition 1939, 5, :o2, 7288235, 3
-          tz.transition 1939, 9, :o1, 19436253, 8
-          tz.transition 1940, 5, :o2, 7289264, 3
-          tz.transition 1940, 9, :o1, 19439221, 8
-          tz.transition 1941, 5, :o2, 7290356, 3
-          tz.transition 1941, 9, :o1, 19442133, 8
-          tz.transition 1942, 2, :o3, 9721599, 4
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361489, 24
-          tz.transition 1946, 4, :o2, 9727755, 4
-          tz.transition 1946, 9, :o1, 58370225, 24
-          tz.transition 1947, 4, :o2, 9729211, 4
-          tz.transition 1947, 9, :o1, 58378961, 24
-          tz.transition 1948, 4, :o2, 9730667, 4
-          tz.transition 1948, 9, :o1, 58387697, 24
-          tz.transition 1949, 4, :o2, 9732123, 4
-          tz.transition 1949, 9, :o1, 58396433, 24
-          tz.transition 1951, 4, :o2, 9735063, 4
-          tz.transition 1951, 9, :o1, 58414073, 24
-          tz.transition 1952, 4, :o2, 9736519, 4
-          tz.transition 1952, 9, :o1, 58422809, 24
-          tz.transition 1953, 4, :o2, 9737975, 4
-          tz.transition 1953, 9, :o1, 58431545, 24
-          tz.transition 1954, 4, :o2, 9739431, 4
-          tz.transition 1954, 9, :o1, 58440281, 24
-          tz.transition 1956, 4, :o2, 9742371, 4
-          tz.transition 1956, 9, :o1, 58457921, 24
-          tz.transition 1957, 4, :o2, 9743827, 4
-          tz.transition 1957, 9, :o1, 58466657, 24
-          tz.transition 1958, 4, :o2, 9745283, 4
-          tz.transition 1958, 9, :o1, 58475393, 24
-          tz.transition 1959, 4, :o2, 9746739, 4
-          tz.transition 1959, 9, :o1, 58484129, 24
-          tz.transition 1962, 4, :o2, 9751135, 4
-          tz.transition 1962, 10, :o1, 58511177, 24
-          tz.transition 1963, 4, :o2, 9752591, 4
-          tz.transition 1963, 10, :o1, 58519913, 24
-          tz.transition 1964, 4, :o2, 9754047, 4
-          tz.transition 1964, 10, :o1, 58528649, 24
-          tz.transition 1965, 4, :o2, 9755503, 4
-          tz.transition 1965, 10, :o1, 58537553, 24
-          tz.transition 1966, 4, :o2, 9756959, 4
-          tz.transition 1966, 10, :o1, 58546289, 24
-          tz.transition 1967, 4, :o2, 9758443, 4
-          tz.transition 1967, 10, :o1, 58555025, 24
-          tz.transition 1968, 4, :o2, 9759899, 4
-          tz.transition 1968, 10, :o1, 58563761, 24
-          tz.transition 1969, 4, :o2, 9761355, 4
-          tz.transition 1969, 10, :o1, 58572497, 24
-          tz.transition 1970, 4, :o2, 9957600
-          tz.transition 1970, 10, :o1, 25678800
-          tz.transition 1971, 4, :o2, 41407200
-          tz.transition 1971, 10, :o1, 57733200
-          tz.transition 1972, 4, :o2, 73461600
-          tz.transition 1972, 10, :o1, 89182800
-          tz.transition 1973, 4, :o2, 104911200
-          tz.transition 1973, 10, :o1, 120632400
-          tz.transition 1974, 4, :o2, 136360800
-          tz.transition 1974, 10, :o1, 152082000
-          tz.transition 1975, 4, :o2, 167810400
-          tz.transition 1975, 10, :o1, 183531600
-          tz.transition 1976, 4, :o2, 199260000
-          tz.transition 1976, 10, :o1, 215586000
-          tz.transition 1977, 4, :o2, 230709600
-          tz.transition 1977, 10, :o1, 247035600
-          tz.transition 1978, 4, :o2, 262764000
-          tz.transition 1978, 10, :o1, 278485200
-          tz.transition 1979, 4, :o2, 294213600
-          tz.transition 1979, 10, :o1, 309934800
-          tz.transition 1980, 4, :o2, 325663200
-          tz.transition 1980, 10, :o1, 341384400
-          tz.transition 1981, 4, :o2, 357112800
-          tz.transition 1981, 10, :o1, 372834000
-          tz.transition 1982, 4, :o2, 388562400
-          tz.transition 1982, 10, :o1, 404888400
-          tz.transition 1983, 4, :o2, 420012000
-          tz.transition 1983, 10, :o1, 436338000
-          tz.transition 1984, 4, :o2, 452066400
-          tz.transition 1984, 10, :o1, 467787600
-          tz.transition 1985, 4, :o2, 483516000
-          tz.transition 1985, 10, :o1, 499237200
-          tz.transition 1986, 4, :o2, 514965600
-          tz.transition 1986, 10, :o1, 530686800
-          tz.transition 1987, 4, :o2, 544600800
-          tz.transition 1987, 10, :o1, 562136400
-          tz.transition 1988, 4, :o2, 576050400
-          tz.transition 1988, 10, :o1, 594190800
-          tz.transition 1989, 4, :o2, 607500000
-          tz.transition 1989, 10, :o1, 625640400
-          tz.transition 1990, 4, :o2, 638949600
-          tz.transition 1990, 10, :o1, 657090000
-          tz.transition 1991, 4, :o2, 671004000
-          tz.transition 1991, 10, :o1, 688539600
-          tz.transition 1992, 4, :o2, 702453600
-          tz.transition 1992, 10, :o1, 719989200
-          tz.transition 1993, 4, :o2, 733903200
-          tz.transition 1993, 10, :o1, 752043600
-          tz.transition 1994, 4, :o2, 765352800
-          tz.transition 1994, 10, :o1, 783493200
-          tz.transition 1995, 4, :o2, 796802400
-          tz.transition 1995, 10, :o1, 814942800
-          tz.transition 1996, 4, :o2, 828856800
-          tz.transition 1996, 10, :o1, 846392400
-          tz.transition 1997, 4, :o2, 860306400
-          tz.transition 1997, 10, :o1, 877842000
-          tz.transition 1998, 4, :o2, 891756000
-          tz.transition 1998, 10, :o1, 909291600
-          tz.transition 1999, 4, :o2, 923205600
-          tz.transition 1999, 10, :o1, 941346000
-          tz.transition 2000, 4, :o2, 954655200
-          tz.transition 2000, 10, :o1, 972795600
-          tz.transition 2001, 4, :o2, 986104800
-          tz.transition 2001, 10, :o1, 1004245200
-          tz.transition 2002, 4, :o2, 1018159200
-          tz.transition 2002, 10, :o1, 1035694800
-          tz.transition 2003, 4, :o2, 1049608800
-          tz.transition 2003, 10, :o1, 1067144400
-          tz.transition 2004, 4, :o2, 1081058400
-          tz.transition 2004, 10, :o1, 1099198800
-          tz.transition 2005, 4, :o2, 1112508000
-          tz.transition 2005, 10, :o1, 1130648400
-          tz.transition 2006, 4, :o2, 1143957600
-          tz.transition 2006, 10, :o1, 1162098000
-          tz.transition 2007, 3, :o2, 1173592800
-          tz.transition 2007, 11, :o1, 1194152400
-          tz.transition 2008, 3, :o2, 1205042400
-          tz.transition 2008, 11, :o1, 1225602000
-          tz.transition 2009, 3, :o2, 1236492000
-          tz.transition 2009, 11, :o1, 1257051600
-          tz.transition 2010, 3, :o2, 1268546400
-          tz.transition 2010, 11, :o1, 1289106000
-          tz.transition 2011, 3, :o2, 1299996000
-          tz.transition 2011, 11, :o1, 1320555600
-          tz.transition 2012, 3, :o2, 1331445600
-          tz.transition 2012, 11, :o1, 1352005200
-          tz.transition 2013, 3, :o2, 1362895200
-          tz.transition 2013, 11, :o1, 1383454800
-          tz.transition 2014, 3, :o2, 1394344800
-          tz.transition 2014, 11, :o1, 1414904400
-          tz.transition 2015, 3, :o2, 1425794400
-          tz.transition 2015, 11, :o1, 1446354000
-          tz.transition 2016, 3, :o2, 1457848800
-          tz.transition 2016, 11, :o1, 1478408400
-          tz.transition 2017, 3, :o2, 1489298400
-          tz.transition 2017, 11, :o1, 1509858000
-          tz.transition 2018, 3, :o2, 1520748000
-          tz.transition 2018, 11, :o1, 1541307600
-          tz.transition 2019, 3, :o2, 1552197600
-          tz.transition 2019, 11, :o1, 1572757200
-          tz.transition 2020, 3, :o2, 1583647200
-          tz.transition 2020, 11, :o1, 1604206800
-          tz.transition 2021, 3, :o2, 1615701600
-          tz.transition 2021, 11, :o1, 1636261200
-          tz.transition 2022, 3, :o2, 1647151200
-          tz.transition 2022, 11, :o1, 1667710800
-          tz.transition 2023, 3, :o2, 1678600800
-          tz.transition 2023, 11, :o1, 1699160400
-          tz.transition 2024, 3, :o2, 1710050400
-          tz.transition 2024, 11, :o1, 1730610000
-          tz.transition 2025, 3, :o2, 1741500000
-          tz.transition 2025, 11, :o1, 1762059600
-          tz.transition 2026, 3, :o2, 1772949600
-          tz.transition 2026, 11, :o1, 1793509200
-          tz.transition 2027, 3, :o2, 1805004000
-          tz.transition 2027, 11, :o1, 1825563600
-          tz.transition 2028, 3, :o2, 1836453600
-          tz.transition 2028, 11, :o1, 1857013200
-          tz.transition 2029, 3, :o2, 1867903200
-          tz.transition 2029, 11, :o1, 1888462800
-          tz.transition 2030, 3, :o2, 1899352800
-          tz.transition 2030, 11, :o1, 1919912400
-          tz.transition 2031, 3, :o2, 1930802400
-          tz.transition 2031, 11, :o1, 1951362000
-          tz.transition 2032, 3, :o2, 1962856800
-          tz.transition 2032, 11, :o1, 1983416400
-          tz.transition 2033, 3, :o2, 1994306400
-          tz.transition 2033, 11, :o1, 2014866000
-          tz.transition 2034, 3, :o2, 2025756000
-          tz.transition 2034, 11, :o1, 2046315600
-          tz.transition 2035, 3, :o2, 2057205600
-          tz.transition 2035, 11, :o1, 2077765200
-          tz.transition 2036, 3, :o2, 2088655200
-          tz.transition 2036, 11, :o1, 2109214800
-          tz.transition 2037, 3, :o2, 2120104800
-          tz.transition 2037, 11, :o1, 2140664400
-          tz.transition 2038, 3, :o2, 9861987, 4
-          tz.transition 2038, 11, :o1, 59177633, 24
-          tz.transition 2039, 3, :o2, 9863443, 4
-          tz.transition 2039, 11, :o1, 59186369, 24
-          tz.transition 2040, 3, :o2, 9864899, 4
-          tz.transition 2040, 11, :o1, 59195105, 24
-          tz.transition 2041, 3, :o2, 9866355, 4
-          tz.transition 2041, 11, :o1, 59203841, 24
-          tz.transition 2042, 3, :o2, 9867811, 4
-          tz.transition 2042, 11, :o1, 59212577, 24
-          tz.transition 2043, 3, :o2, 9869267, 4
-          tz.transition 2043, 11, :o1, 59221313, 24
-          tz.transition 2044, 3, :o2, 9870751, 4
-          tz.transition 2044, 11, :o1, 59230217, 24
-          tz.transition 2045, 3, :o2, 9872207, 4
-          tz.transition 2045, 11, :o1, 59238953, 24
-          tz.transition 2046, 3, :o2, 9873663, 4
-          tz.transition 2046, 11, :o1, 59247689, 24
-          tz.transition 2047, 3, :o2, 9875119, 4
-          tz.transition 2047, 11, :o1, 59256425, 24
-          tz.transition 2048, 3, :o2, 9876575, 4
-          tz.transition 2048, 11, :o1, 59265161, 24
-          tz.transition 2049, 3, :o2, 9878059, 4
-          tz.transition 2049, 11, :o1, 59274065, 24
-          tz.transition 2050, 3, :o2, 9879515, 4
-          tz.transition 2050, 11, :o1, 59282801, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Havana.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Havana.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Havana.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Havana.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,199 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Havana
-        include TimezoneDefinition
-        
-        timezone 'America/Havana' do |tz|
-          tz.offset :o0, -19768, 0, :LMT
-          tz.offset :o1, -19776, 0, :HMT
-          tz.offset :o2, -18000, 0, :CST
-          tz.offset :o3, -18000, 3600, :CDT
-          
-          tz.transition 1890, 1, :o1, 26042782271, 10800
-          tz.transition 1925, 7, :o2, 1090958053, 450
-          tz.transition 1928, 6, :o3, 58209785, 24
-          tz.transition 1928, 10, :o2, 7276589, 3
-          tz.transition 1940, 6, :o3, 58314785, 24
-          tz.transition 1940, 9, :o2, 7289621, 3
-          tz.transition 1941, 6, :o3, 58323521, 24
-          tz.transition 1941, 9, :o2, 7290734, 3
-          tz.transition 1942, 6, :o3, 58332425, 24
-          tz.transition 1942, 9, :o2, 7291826, 3
-          tz.transition 1945, 6, :o3, 58358633, 24
-          tz.transition 1945, 9, :o2, 7295102, 3
-          tz.transition 1946, 6, :o3, 58367369, 24
-          tz.transition 1946, 9, :o2, 7296194, 3
-          tz.transition 1965, 6, :o3, 58533905, 24
-          tz.transition 1965, 9, :o2, 7317101, 3
-          tz.transition 1966, 5, :o3, 58542593, 24
-          tz.transition 1966, 10, :o2, 7318202, 3
-          tz.transition 1967, 4, :o3, 58550129, 24
-          tz.transition 1967, 9, :o2, 7319231, 3
-          tz.transition 1968, 4, :o3, 58559057, 24
-          tz.transition 1968, 9, :o2, 7320323, 3
-          tz.transition 1969, 4, :o3, 58568129, 24
-          tz.transition 1969, 10, :o2, 7321562, 3
-          tz.transition 1970, 4, :o3, 9954000
-          tz.transition 1970, 10, :o2, 25675200
-          tz.transition 1971, 4, :o3, 41403600
-          tz.transition 1971, 10, :o2, 57729600
-          tz.transition 1972, 4, :o3, 73458000
-          tz.transition 1972, 10, :o2, 87364800
-          tz.transition 1973, 4, :o3, 104907600
-          tz.transition 1973, 10, :o2, 118900800
-          tz.transition 1974, 4, :o3, 136357200
-          tz.transition 1974, 10, :o2, 150436800
-          tz.transition 1975, 4, :o3, 167806800
-          tz.transition 1975, 10, :o2, 183528000
-          tz.transition 1976, 4, :o3, 199256400
-          tz.transition 1976, 10, :o2, 215582400
-          tz.transition 1977, 4, :o3, 230706000
-          tz.transition 1977, 10, :o2, 247032000
-          tz.transition 1978, 5, :o3, 263365200
-          tz.transition 1978, 10, :o2, 276667200
-          tz.transition 1979, 3, :o3, 290581200
-          tz.transition 1979, 10, :o2, 308721600
-          tz.transition 1980, 3, :o3, 322030800
-          tz.transition 1980, 10, :o2, 340171200
-          tz.transition 1981, 5, :o3, 358318800
-          tz.transition 1981, 10, :o2, 371620800
-          tz.transition 1982, 5, :o3, 389768400
-          tz.transition 1982, 10, :o2, 403070400
-          tz.transition 1983, 5, :o3, 421218000
-          tz.transition 1983, 10, :o2, 434520000
-          tz.transition 1984, 5, :o3, 452667600
-          tz.transition 1984, 10, :o2, 466574400
-          tz.transition 1985, 5, :o3, 484117200
-          tz.transition 1985, 10, :o2, 498024000
-          tz.transition 1986, 3, :o3, 511333200
-          tz.transition 1986, 10, :o2, 529473600
-          tz.transition 1987, 3, :o3, 542782800
-          tz.transition 1987, 10, :o2, 560923200
-          tz.transition 1988, 3, :o3, 574837200
-          tz.transition 1988, 10, :o2, 592372800
-          tz.transition 1989, 3, :o3, 606286800
-          tz.transition 1989, 10, :o2, 623822400
-          tz.transition 1990, 4, :o3, 638946000
-          tz.transition 1990, 10, :o2, 655876800
-          tz.transition 1991, 4, :o3, 671000400
-          tz.transition 1991, 10, :o2, 687330000
-          tz.transition 1992, 4, :o3, 702450000
-          tz.transition 1992, 10, :o2, 718779600
-          tz.transition 1993, 4, :o3, 733899600
-          tz.transition 1993, 10, :o2, 750229200
-          tz.transition 1994, 4, :o3, 765349200
-          tz.transition 1994, 10, :o2, 781678800
-          tz.transition 1995, 4, :o3, 796798800
-          tz.transition 1995, 10, :o2, 813128400
-          tz.transition 1996, 4, :o3, 828853200
-          tz.transition 1996, 10, :o2, 844578000
-          tz.transition 1997, 4, :o3, 860302800
-          tz.transition 1997, 10, :o2, 876632400
-          tz.transition 1998, 3, :o3, 891147600
-          tz.transition 1998, 10, :o2, 909291600
-          tz.transition 1999, 3, :o3, 922597200
-          tz.transition 1999, 10, :o2, 941346000
-          tz.transition 2000, 4, :o3, 954651600
-          tz.transition 2000, 10, :o2, 972795600
-          tz.transition 2001, 4, :o3, 986101200
-          tz.transition 2001, 10, :o2, 1004245200
-          tz.transition 2002, 4, :o3, 1018155600
-          tz.transition 2002, 10, :o2, 1035694800
-          tz.transition 2003, 4, :o3, 1049605200
-          tz.transition 2003, 10, :o2, 1067144400
-          tz.transition 2004, 4, :o3, 1081054800
-          tz.transition 2007, 10, :o2, 1193547600
-          tz.transition 2008, 4, :o3, 1207458000
-          tz.transition 2008, 10, :o2, 1224997200
-          tz.transition 2009, 4, :o3, 1238907600
-          tz.transition 2009, 10, :o2, 1256446800
-          tz.transition 2010, 4, :o3, 1270357200
-          tz.transition 2010, 10, :o2, 1288501200
-          tz.transition 2011, 4, :o3, 1301806800
-          tz.transition 2011, 10, :o2, 1319950800
-          tz.transition 2012, 4, :o3, 1333256400
-          tz.transition 2012, 10, :o2, 1351400400
-          tz.transition 2013, 4, :o3, 1365310800
-          tz.transition 2013, 10, :o2, 1382850000
-          tz.transition 2014, 4, :o3, 1396760400
-          tz.transition 2014, 10, :o2, 1414299600
-          tz.transition 2015, 4, :o3, 1428210000
-          tz.transition 2015, 10, :o2, 1445749200
-          tz.transition 2016, 4, :o3, 1459659600
-          tz.transition 2016, 10, :o2, 1477803600
-          tz.transition 2017, 4, :o3, 1491109200
-          tz.transition 2017, 10, :o2, 1509253200
-          tz.transition 2018, 4, :o3, 1522558800
-          tz.transition 2018, 10, :o2, 1540702800
-          tz.transition 2019, 4, :o3, 1554613200
-          tz.transition 2019, 10, :o2, 1572152400
-          tz.transition 2020, 4, :o3, 1586062800
-          tz.transition 2020, 10, :o2, 1603602000
-          tz.transition 2021, 4, :o3, 1617512400
-          tz.transition 2021, 10, :o2, 1635656400
-          tz.transition 2022, 4, :o3, 1648962000
-          tz.transition 2022, 10, :o2, 1667106000
-          tz.transition 2023, 4, :o3, 1680411600
-          tz.transition 2023, 10, :o2, 1698555600
-          tz.transition 2024, 4, :o3, 1712466000
-          tz.transition 2024, 10, :o2, 1730005200
-          tz.transition 2025, 4, :o3, 1743915600
-          tz.transition 2025, 10, :o2, 1761454800
-          tz.transition 2026, 4, :o3, 1775365200
-          tz.transition 2026, 10, :o2, 1792904400
-          tz.transition 2027, 4, :o3, 1806814800
-          tz.transition 2027, 10, :o2, 1824958800
-          tz.transition 2028, 4, :o3, 1838264400
-          tz.transition 2028, 10, :o2, 1856408400
-          tz.transition 2029, 4, :o3, 1869714000
-          tz.transition 2029, 10, :o2, 1887858000
-          tz.transition 2030, 4, :o3, 1901768400
-          tz.transition 2030, 10, :o2, 1919307600
-          tz.transition 2031, 4, :o3, 1933218000
-          tz.transition 2031, 10, :o2, 1950757200
-          tz.transition 2032, 4, :o3, 1964667600
-          tz.transition 2032, 10, :o2, 1982811600
-          tz.transition 2033, 4, :o3, 1996117200
-          tz.transition 2033, 10, :o2, 2014261200
-          tz.transition 2034, 4, :o3, 2027566800
-          tz.transition 2034, 10, :o2, 2045710800
-          tz.transition 2035, 4, :o3, 2059016400
-          tz.transition 2035, 10, :o2, 2077160400
-          tz.transition 2036, 4, :o3, 2091070800
-          tz.transition 2036, 10, :o2, 2108610000
-          tz.transition 2037, 4, :o3, 2122520400
-          tz.transition 2037, 10, :o2, 2140059600
-          tz.transition 2038, 4, :o3, 59172425, 24
-          tz.transition 2038, 10, :o2, 59177465, 24
-          tz.transition 2039, 4, :o3, 59181161, 24
-          tz.transition 2039, 10, :o2, 59186201, 24
-          tz.transition 2040, 4, :o3, 59189897, 24
-          tz.transition 2040, 10, :o2, 59194937, 24
-          tz.transition 2041, 4, :o3, 59198801, 24
-          tz.transition 2041, 10, :o2, 59203673, 24
-          tz.transition 2042, 4, :o3, 59207537, 24
-          tz.transition 2042, 10, :o2, 59212409, 24
-          tz.transition 2043, 4, :o3, 59216273, 24
-          tz.transition 2043, 10, :o2, 59221145, 24
-          tz.transition 2044, 4, :o3, 59225009, 24
-          tz.transition 2044, 10, :o2, 59230049, 24
-          tz.transition 2045, 4, :o3, 59233745, 24
-          tz.transition 2045, 10, :o2, 59238785, 24
-          tz.transition 2046, 4, :o3, 59242481, 24
-          tz.transition 2046, 10, :o2, 59247521, 24
-          tz.transition 2047, 4, :o3, 59251385, 24
-          tz.transition 2047, 10, :o2, 59256257, 24
-          tz.transition 2048, 4, :o3, 59260121, 24
-          tz.transition 2048, 10, :o2, 59264993, 24
-          tz.transition 2049, 4, :o3, 59268857, 24
-          tz.transition 2049, 10, :o2, 59273897, 24
-          tz.transition 2050, 4, :o3, 59277593, 24
-          tz.transition 2050, 10, :o2, 59282633, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Hermosillo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Hermosillo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Hermosillo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Hermosillo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Hermosillo
-        include TimezoneDefinition
-        
-        timezone 'America/Hermosillo' do |tz|
-          tz.offset :o0, -26632, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -28800, 0, :PST
-          tz.offset :o4, -25200, 3600, :MDT
-          
-          tz.transition 1922, 1, :o1, 58153339, 24
-          tz.transition 1927, 6, :o2, 9700171, 4
-          tz.transition 1930, 11, :o1, 9705183, 4
-          tz.transition 1931, 5, :o2, 9705855, 4
-          tz.transition 1931, 10, :o1, 9706463, 4
-          tz.transition 1932, 4, :o2, 58243171, 24
-          tz.transition 1942, 4, :o1, 9721895, 4
-          tz.transition 1949, 1, :o3, 58390339, 24
-          tz.transition 1970, 1, :o1, 28800
-          tz.transition 1996, 4, :o4, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o4, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o4, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,149 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indiana
-        module Indianapolis
-          include TimezoneDefinition
-          
-          timezone 'America/Indiana/Indianapolis' do |tz|
-            tz.offset :o0, -20678, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            tz.offset :o6, -18000, 3600, :EDT
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1941, 6, :o2, 14581007, 6
-            tz.transition 1941, 9, :o1, 58326379, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1946, 4, :o2, 14591633, 6
-            tz.transition 1946, 9, :o1, 58370227, 24
-            tz.transition 1947, 4, :o2, 14593817, 6
-            tz.transition 1947, 9, :o1, 58378963, 24
-            tz.transition 1948, 4, :o2, 14596001, 6
-            tz.transition 1948, 9, :o1, 58387699, 24
-            tz.transition 1949, 4, :o2, 14598185, 6
-            tz.transition 1949, 9, :o1, 58396435, 24
-            tz.transition 1950, 4, :o2, 14600411, 6
-            tz.transition 1950, 9, :o1, 58405171, 24
-            tz.transition 1951, 4, :o2, 14602595, 6
-            tz.transition 1951, 9, :o1, 58414075, 24
-            tz.transition 1952, 4, :o2, 14604779, 6
-            tz.transition 1952, 9, :o1, 58422811, 24
-            tz.transition 1953, 4, :o2, 14606963, 6
-            tz.transition 1953, 9, :o1, 58431547, 24
-            tz.transition 1954, 4, :o2, 14609147, 6
-            tz.transition 1954, 9, :o1, 58440283, 24
-            tz.transition 1955, 4, :o5, 14611331, 6
-            tz.transition 1957, 9, :o1, 58466659, 24
-            tz.transition 1958, 4, :o5, 14617925, 6
-            tz.transition 1969, 4, :o6, 58568131, 24
-            tz.transition 1969, 10, :o5, 9762083, 4
-            tz.transition 1970, 4, :o6, 9961200
-            tz.transition 1970, 10, :o5, 25682400
-            tz.transition 2006, 4, :o6, 1143961200
-            tz.transition 2006, 10, :o5, 1162101600
-            tz.transition 2007, 3, :o6, 1173596400
-            tz.transition 2007, 11, :o5, 1194156000
-            tz.transition 2008, 3, :o6, 1205046000
-            tz.transition 2008, 11, :o5, 1225605600
-            tz.transition 2009, 3, :o6, 1236495600
-            tz.transition 2009, 11, :o5, 1257055200
-            tz.transition 2010, 3, :o6, 1268550000
-            tz.transition 2010, 11, :o5, 1289109600
-            tz.transition 2011, 3, :o6, 1299999600
-            tz.transition 2011, 11, :o5, 1320559200
-            tz.transition 2012, 3, :o6, 1331449200
-            tz.transition 2012, 11, :o5, 1352008800
-            tz.transition 2013, 3, :o6, 1362898800
-            tz.transition 2013, 11, :o5, 1383458400
-            tz.transition 2014, 3, :o6, 1394348400
-            tz.transition 2014, 11, :o5, 1414908000
-            tz.transition 2015, 3, :o6, 1425798000
-            tz.transition 2015, 11, :o5, 1446357600
-            tz.transition 2016, 3, :o6, 1457852400
-            tz.transition 2016, 11, :o5, 1478412000
-            tz.transition 2017, 3, :o6, 1489302000
-            tz.transition 2017, 11, :o5, 1509861600
-            tz.transition 2018, 3, :o6, 1520751600
-            tz.transition 2018, 11, :o5, 1541311200
-            tz.transition 2019, 3, :o6, 1552201200
-            tz.transition 2019, 11, :o5, 1572760800
-            tz.transition 2020, 3, :o6, 1583650800
-            tz.transition 2020, 11, :o5, 1604210400
-            tz.transition 2021, 3, :o6, 1615705200
-            tz.transition 2021, 11, :o5, 1636264800
-            tz.transition 2022, 3, :o6, 1647154800
-            tz.transition 2022, 11, :o5, 1667714400
-            tz.transition 2023, 3, :o6, 1678604400
-            tz.transition 2023, 11, :o5, 1699164000
-            tz.transition 2024, 3, :o6, 1710054000
-            tz.transition 2024, 11, :o5, 1730613600
-            tz.transition 2025, 3, :o6, 1741503600
-            tz.transition 2025, 11, :o5, 1762063200
-            tz.transition 2026, 3, :o6, 1772953200
-            tz.transition 2026, 11, :o5, 1793512800
-            tz.transition 2027, 3, :o6, 1805007600
-            tz.transition 2027, 11, :o5, 1825567200
-            tz.transition 2028, 3, :o6, 1836457200
-            tz.transition 2028, 11, :o5, 1857016800
-            tz.transition 2029, 3, :o6, 1867906800
-            tz.transition 2029, 11, :o5, 1888466400
-            tz.transition 2030, 3, :o6, 1899356400
-            tz.transition 2030, 11, :o5, 1919916000
-            tz.transition 2031, 3, :o6, 1930806000
-            tz.transition 2031, 11, :o5, 1951365600
-            tz.transition 2032, 3, :o6, 1962860400
-            tz.transition 2032, 11, :o5, 1983420000
-            tz.transition 2033, 3, :o6, 1994310000
-            tz.transition 2033, 11, :o5, 2014869600
-            tz.transition 2034, 3, :o6, 2025759600
-            tz.transition 2034, 11, :o5, 2046319200
-            tz.transition 2035, 3, :o6, 2057209200
-            tz.transition 2035, 11, :o5, 2077768800
-            tz.transition 2036, 3, :o6, 2088658800
-            tz.transition 2036, 11, :o5, 2109218400
-            tz.transition 2037, 3, :o6, 2120108400
-            tz.transition 2037, 11, :o5, 2140668000
-            tz.transition 2038, 3, :o6, 59171923, 24
-            tz.transition 2038, 11, :o5, 9862939, 4
-            tz.transition 2039, 3, :o6, 59180659, 24
-            tz.transition 2039, 11, :o5, 9864395, 4
-            tz.transition 2040, 3, :o6, 59189395, 24
-            tz.transition 2040, 11, :o5, 9865851, 4
-            tz.transition 2041, 3, :o6, 59198131, 24
-            tz.transition 2041, 11, :o5, 9867307, 4
-            tz.transition 2042, 3, :o6, 59206867, 24
-            tz.transition 2042, 11, :o5, 9868763, 4
-            tz.transition 2043, 3, :o6, 59215603, 24
-            tz.transition 2043, 11, :o5, 9870219, 4
-            tz.transition 2044, 3, :o6, 59224507, 24
-            tz.transition 2044, 11, :o5, 9871703, 4
-            tz.transition 2045, 3, :o6, 59233243, 24
-            tz.transition 2045, 11, :o5, 9873159, 4
-            tz.transition 2046, 3, :o6, 59241979, 24
-            tz.transition 2046, 11, :o5, 9874615, 4
-            tz.transition 2047, 3, :o6, 59250715, 24
-            tz.transition 2047, 11, :o5, 9876071, 4
-            tz.transition 2048, 3, :o6, 59259451, 24
-            tz.transition 2048, 11, :o5, 9877527, 4
-            tz.transition 2049, 3, :o6, 59268355, 24
-            tz.transition 2049, 11, :o5, 9879011, 4
-            tz.transition 2050, 3, :o6, 59277091, 24
-            tz.transition 2050, 11, :o5, 9880467, 4
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Knox.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Knox.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Knox.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Knox.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,203 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indiana
-        module Knox
-          include TimezoneDefinition
-          
-          timezone 'America/Indiana/Knox' do |tz|
-            tz.offset :o0, -20790, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1947, 4, :o2, 14593817, 6
-            tz.transition 1947, 9, :o1, 58378963, 24
-            tz.transition 1948, 4, :o2, 14596001, 6
-            tz.transition 1948, 9, :o1, 58387699, 24
-            tz.transition 1949, 4, :o2, 14598185, 6
-            tz.transition 1949, 9, :o1, 58396435, 24
-            tz.transition 1950, 4, :o2, 14600411, 6
-            tz.transition 1950, 9, :o1, 58405171, 24
-            tz.transition 1951, 4, :o2, 14602595, 6
-            tz.transition 1951, 9, :o1, 58414075, 24
-            tz.transition 1952, 4, :o2, 14604779, 6
-            tz.transition 1952, 9, :o1, 58422811, 24
-            tz.transition 1953, 4, :o2, 14606963, 6
-            tz.transition 1953, 9, :o1, 58431547, 24
-            tz.transition 1954, 4, :o2, 14609147, 6
-            tz.transition 1954, 9, :o1, 58440283, 24
-            tz.transition 1955, 4, :o2, 14611331, 6
-            tz.transition 1955, 10, :o1, 58449859, 24
-            tz.transition 1956, 4, :o2, 14613557, 6
-            tz.transition 1956, 10, :o1, 58458595, 24
-            tz.transition 1957, 4, :o2, 14615741, 6
-            tz.transition 1957, 9, :o1, 58466659, 24
-            tz.transition 1958, 4, :o2, 14617925, 6
-            tz.transition 1958, 9, :o1, 58475395, 24
-            tz.transition 1959, 4, :o2, 14620109, 6
-            tz.transition 1959, 10, :o1, 58484803, 24
-            tz.transition 1960, 4, :o2, 14622293, 6
-            tz.transition 1960, 10, :o1, 58493707, 24
-            tz.transition 1961, 4, :o2, 14624519, 6
-            tz.transition 1961, 10, :o1, 58502443, 24
-            tz.transition 1962, 4, :o5, 14626703, 6
-            tz.transition 1963, 10, :o1, 58519915, 24
-            tz.transition 1967, 4, :o2, 14637665, 6
-            tz.transition 1967, 10, :o1, 58555027, 24
-            tz.transition 1968, 4, :o2, 14639849, 6
-            tz.transition 1968, 10, :o1, 58563763, 24
-            tz.transition 1969, 4, :o2, 14642033, 6
-            tz.transition 1969, 10, :o1, 58572499, 24
-            tz.transition 1970, 4, :o2, 9964800
-            tz.transition 1970, 10, :o1, 25686000
-            tz.transition 1971, 4, :o2, 41414400
-            tz.transition 1971, 10, :o1, 57740400
-            tz.transition 1972, 4, :o2, 73468800
-            tz.transition 1972, 10, :o1, 89190000
-            tz.transition 1973, 4, :o2, 104918400
-            tz.transition 1973, 10, :o1, 120639600
-            tz.transition 1974, 1, :o2, 126691200
-            tz.transition 1974, 10, :o1, 152089200
-            tz.transition 1975, 2, :o2, 162374400
-            tz.transition 1975, 10, :o1, 183538800
-            tz.transition 1976, 4, :o2, 199267200
-            tz.transition 1976, 10, :o1, 215593200
-            tz.transition 1977, 4, :o2, 230716800
-            tz.transition 1977, 10, :o1, 247042800
-            tz.transition 1978, 4, :o2, 262771200
-            tz.transition 1978, 10, :o1, 278492400
-            tz.transition 1979, 4, :o2, 294220800
-            tz.transition 1979, 10, :o1, 309942000
-            tz.transition 1980, 4, :o2, 325670400
-            tz.transition 1980, 10, :o1, 341391600
-            tz.transition 1981, 4, :o2, 357120000
-            tz.transition 1981, 10, :o1, 372841200
-            tz.transition 1982, 4, :o2, 388569600
-            tz.transition 1982, 10, :o1, 404895600
-            tz.transition 1983, 4, :o2, 420019200
-            tz.transition 1983, 10, :o1, 436345200
-            tz.transition 1984, 4, :o2, 452073600
-            tz.transition 1984, 10, :o1, 467794800
-            tz.transition 1985, 4, :o2, 483523200
-            tz.transition 1985, 10, :o1, 499244400
-            tz.transition 1986, 4, :o2, 514972800
-            tz.transition 1986, 10, :o1, 530694000
-            tz.transition 1987, 4, :o2, 544608000
-            tz.transition 1987, 10, :o1, 562143600
-            tz.transition 1988, 4, :o2, 576057600
-            tz.transition 1988, 10, :o1, 594198000
-            tz.transition 1989, 4, :o2, 607507200
-            tz.transition 1989, 10, :o1, 625647600
-            tz.transition 1990, 4, :o2, 638956800
-            tz.transition 1990, 10, :o1, 657097200
-            tz.transition 1991, 4, :o2, 671011200
-            tz.transition 1991, 10, :o5, 688546800
-            tz.transition 2006, 4, :o2, 1143961200
-            tz.transition 2006, 10, :o1, 1162105200
-            tz.transition 2007, 3, :o2, 1173600000
-            tz.transition 2007, 11, :o1, 1194159600
-            tz.transition 2008, 3, :o2, 1205049600
-            tz.transition 2008, 11, :o1, 1225609200
-            tz.transition 2009, 3, :o2, 1236499200
-            tz.transition 2009, 11, :o1, 1257058800
-            tz.transition 2010, 3, :o2, 1268553600
-            tz.transition 2010, 11, :o1, 1289113200
-            tz.transition 2011, 3, :o2, 1300003200
-            tz.transition 2011, 11, :o1, 1320562800
-            tz.transition 2012, 3, :o2, 1331452800
-            tz.transition 2012, 11, :o1, 1352012400
-            tz.transition 2013, 3, :o2, 1362902400
-            tz.transition 2013, 11, :o1, 1383462000
-            tz.transition 2014, 3, :o2, 1394352000
-            tz.transition 2014, 11, :o1, 1414911600
-            tz.transition 2015, 3, :o2, 1425801600
-            tz.transition 2015, 11, :o1, 1446361200
-            tz.transition 2016, 3, :o2, 1457856000
-            tz.transition 2016, 11, :o1, 1478415600
-            tz.transition 2017, 3, :o2, 1489305600
-            tz.transition 2017, 11, :o1, 1509865200
-            tz.transition 2018, 3, :o2, 1520755200
-            tz.transition 2018, 11, :o1, 1541314800
-            tz.transition 2019, 3, :o2, 1552204800
-            tz.transition 2019, 11, :o1, 1572764400
-            tz.transition 2020, 3, :o2, 1583654400
-            tz.transition 2020, 11, :o1, 1604214000
-            tz.transition 2021, 3, :o2, 1615708800
-            tz.transition 2021, 11, :o1, 1636268400
-            tz.transition 2022, 3, :o2, 1647158400
-            tz.transition 2022, 11, :o1, 1667718000
-            tz.transition 2023, 3, :o2, 1678608000
-            tz.transition 2023, 11, :o1, 1699167600
-            tz.transition 2024, 3, :o2, 1710057600
-            tz.transition 2024, 11, :o1, 1730617200
-            tz.transition 2025, 3, :o2, 1741507200
-            tz.transition 2025, 11, :o1, 1762066800
-            tz.transition 2026, 3, :o2, 1772956800
-            tz.transition 2026, 11, :o1, 1793516400
-            tz.transition 2027, 3, :o2, 1805011200
-            tz.transition 2027, 11, :o1, 1825570800
-            tz.transition 2028, 3, :o2, 1836460800
-            tz.transition 2028, 11, :o1, 1857020400
-            tz.transition 2029, 3, :o2, 1867910400
-            tz.transition 2029, 11, :o1, 1888470000
-            tz.transition 2030, 3, :o2, 1899360000
-            tz.transition 2030, 11, :o1, 1919919600
-            tz.transition 2031, 3, :o2, 1930809600
-            tz.transition 2031, 11, :o1, 1951369200
-            tz.transition 2032, 3, :o2, 1962864000
-            tz.transition 2032, 11, :o1, 1983423600
-            tz.transition 2033, 3, :o2, 1994313600
-            tz.transition 2033, 11, :o1, 2014873200
-            tz.transition 2034, 3, :o2, 2025763200
-            tz.transition 2034, 11, :o1, 2046322800
-            tz.transition 2035, 3, :o2, 2057212800
-            tz.transition 2035, 11, :o1, 2077772400
-            tz.transition 2036, 3, :o2, 2088662400
-            tz.transition 2036, 11, :o1, 2109222000
-            tz.transition 2037, 3, :o2, 2120112000
-            tz.transition 2037, 11, :o1, 2140671600
-            tz.transition 2038, 3, :o2, 14792981, 6
-            tz.transition 2038, 11, :o1, 59177635, 24
-            tz.transition 2039, 3, :o2, 14795165, 6
-            tz.transition 2039, 11, :o1, 59186371, 24
-            tz.transition 2040, 3, :o2, 14797349, 6
-            tz.transition 2040, 11, :o1, 59195107, 24
-            tz.transition 2041, 3, :o2, 14799533, 6
-            tz.transition 2041, 11, :o1, 59203843, 24
-            tz.transition 2042, 3, :o2, 14801717, 6
-            tz.transition 2042, 11, :o1, 59212579, 24
-            tz.transition 2043, 3, :o2, 14803901, 6
-            tz.transition 2043, 11, :o1, 59221315, 24
-            tz.transition 2044, 3, :o2, 14806127, 6
-            tz.transition 2044, 11, :o1, 59230219, 24
-            tz.transition 2045, 3, :o2, 14808311, 6
-            tz.transition 2045, 11, :o1, 59238955, 24
-            tz.transition 2046, 3, :o2, 14810495, 6
-            tz.transition 2046, 11, :o1, 59247691, 24
-            tz.transition 2047, 3, :o2, 14812679, 6
-            tz.transition 2047, 11, :o1, 59256427, 24
-            tz.transition 2048, 3, :o2, 14814863, 6
-            tz.transition 2048, 11, :o1, 59265163, 24
-            tz.transition 2049, 3, :o2, 14817089, 6
-            tz.transition 2049, 11, :o1, 59274067, 24
-            tz.transition 2050, 3, :o2, 14819273, 6
-            tz.transition 2050, 11, :o1, 59282803, 24
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Marengo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Marengo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Marengo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Marengo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,153 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indiana
-        module Marengo
-          include TimezoneDefinition
-          
-          timezone 'America/Indiana/Marengo' do |tz|
-            tz.offset :o0, -20723, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            tz.offset :o6, -18000, 3600, :EDT
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1951, 4, :o2, 14602595, 6
-            tz.transition 1951, 9, :o1, 58414075, 24
-            tz.transition 1954, 4, :o2, 14609147, 6
-            tz.transition 1954, 9, :o1, 58440283, 24
-            tz.transition 1955, 4, :o2, 14611331, 6
-            tz.transition 1955, 9, :o1, 58449019, 24
-            tz.transition 1956, 4, :o2, 14613557, 6
-            tz.transition 1956, 9, :o1, 58457923, 24
-            tz.transition 1957, 4, :o2, 14615741, 6
-            tz.transition 1957, 9, :o1, 58466659, 24
-            tz.transition 1958, 4, :o2, 14617925, 6
-            tz.transition 1958, 9, :o1, 58475395, 24
-            tz.transition 1959, 4, :o2, 14620109, 6
-            tz.transition 1959, 9, :o1, 58484131, 24
-            tz.transition 1960, 4, :o2, 14622293, 6
-            tz.transition 1960, 9, :o1, 58492867, 24
-            tz.transition 1961, 4, :o5, 14624519, 6
-            tz.transition 1969, 4, :o6, 58568131, 24
-            tz.transition 1969, 10, :o5, 9762083, 4
-            tz.transition 1970, 4, :o6, 9961200
-            tz.transition 1970, 10, :o5, 25682400
-            tz.transition 1971, 4, :o6, 41410800
-            tz.transition 1971, 10, :o5, 57736800
-            tz.transition 1972, 4, :o6, 73465200
-            tz.transition 1972, 10, :o5, 89186400
-            tz.transition 1973, 4, :o6, 104914800
-            tz.transition 1973, 10, :o5, 120636000
-            tz.transition 1974, 1, :o2, 126687600
-            tz.transition 1974, 10, :o5, 152089200
-            tz.transition 1975, 2, :o6, 162370800
-            tz.transition 1975, 10, :o5, 183535200
-            tz.transition 2006, 4, :o6, 1143961200
-            tz.transition 2006, 10, :o5, 1162101600
-            tz.transition 2007, 3, :o6, 1173596400
-            tz.transition 2007, 11, :o5, 1194156000
-            tz.transition 2008, 3, :o6, 1205046000
-            tz.transition 2008, 11, :o5, 1225605600
-            tz.transition 2009, 3, :o6, 1236495600
-            tz.transition 2009, 11, :o5, 1257055200
-            tz.transition 2010, 3, :o6, 1268550000
-            tz.transition 2010, 11, :o5, 1289109600
-            tz.transition 2011, 3, :o6, 1299999600
-            tz.transition 2011, 11, :o5, 1320559200
-            tz.transition 2012, 3, :o6, 1331449200
-            tz.transition 2012, 11, :o5, 1352008800
-            tz.transition 2013, 3, :o6, 1362898800
-            tz.transition 2013, 11, :o5, 1383458400
-            tz.transition 2014, 3, :o6, 1394348400
-            tz.transition 2014, 11, :o5, 1414908000
-            tz.transition 2015, 3, :o6, 1425798000
-            tz.transition 2015, 11, :o5, 1446357600
-            tz.transition 2016, 3, :o6, 1457852400
-            tz.transition 2016, 11, :o5, 1478412000
-            tz.transition 2017, 3, :o6, 1489302000
-            tz.transition 2017, 11, :o5, 1509861600
-            tz.transition 2018, 3, :o6, 1520751600
-            tz.transition 2018, 11, :o5, 1541311200
-            tz.transition 2019, 3, :o6, 1552201200
-            tz.transition 2019, 11, :o5, 1572760800
-            tz.transition 2020, 3, :o6, 1583650800
-            tz.transition 2020, 11, :o5, 1604210400
-            tz.transition 2021, 3, :o6, 1615705200
-            tz.transition 2021, 11, :o5, 1636264800
-            tz.transition 2022, 3, :o6, 1647154800
-            tz.transition 2022, 11, :o5, 1667714400
-            tz.transition 2023, 3, :o6, 1678604400
-            tz.transition 2023, 11, :o5, 1699164000
-            tz.transition 2024, 3, :o6, 1710054000
-            tz.transition 2024, 11, :o5, 1730613600
-            tz.transition 2025, 3, :o6, 1741503600
-            tz.transition 2025, 11, :o5, 1762063200
-            tz.transition 2026, 3, :o6, 1772953200
-            tz.transition 2026, 11, :o5, 1793512800
-            tz.transition 2027, 3, :o6, 1805007600
-            tz.transition 2027, 11, :o5, 1825567200
-            tz.transition 2028, 3, :o6, 1836457200
-            tz.transition 2028, 11, :o5, 1857016800
-            tz.transition 2029, 3, :o6, 1867906800
-            tz.transition 2029, 11, :o5, 1888466400
-            tz.transition 2030, 3, :o6, 1899356400
-            tz.transition 2030, 11, :o5, 1919916000
-            tz.transition 2031, 3, :o6, 1930806000
-            tz.transition 2031, 11, :o5, 1951365600
-            tz.transition 2032, 3, :o6, 1962860400
-            tz.transition 2032, 11, :o5, 1983420000
-            tz.transition 2033, 3, :o6, 1994310000
-            tz.transition 2033, 11, :o5, 2014869600
-            tz.transition 2034, 3, :o6, 2025759600
-            tz.transition 2034, 11, :o5, 2046319200
-            tz.transition 2035, 3, :o6, 2057209200
-            tz.transition 2035, 11, :o5, 2077768800
-            tz.transition 2036, 3, :o6, 2088658800
-            tz.transition 2036, 11, :o5, 2109218400
-            tz.transition 2037, 3, :o6, 2120108400
-            tz.transition 2037, 11, :o5, 2140668000
-            tz.transition 2038, 3, :o6, 59171923, 24
-            tz.transition 2038, 11, :o5, 9862939, 4
-            tz.transition 2039, 3, :o6, 59180659, 24
-            tz.transition 2039, 11, :o5, 9864395, 4
-            tz.transition 2040, 3, :o6, 59189395, 24
-            tz.transition 2040, 11, :o5, 9865851, 4
-            tz.transition 2041, 3, :o6, 59198131, 24
-            tz.transition 2041, 11, :o5, 9867307, 4
-            tz.transition 2042, 3, :o6, 59206867, 24
-            tz.transition 2042, 11, :o5, 9868763, 4
-            tz.transition 2043, 3, :o6, 59215603, 24
-            tz.transition 2043, 11, :o5, 9870219, 4
-            tz.transition 2044, 3, :o6, 59224507, 24
-            tz.transition 2044, 11, :o5, 9871703, 4
-            tz.transition 2045, 3, :o6, 59233243, 24
-            tz.transition 2045, 11, :o5, 9873159, 4
-            tz.transition 2046, 3, :o6, 59241979, 24
-            tz.transition 2046, 11, :o5, 9874615, 4
-            tz.transition 2047, 3, :o6, 59250715, 24
-            tz.transition 2047, 11, :o5, 9876071, 4
-            tz.transition 2048, 3, :o6, 59259451, 24
-            tz.transition 2048, 11, :o5, 9877527, 4
-            tz.transition 2049, 3, :o6, 59268355, 24
-            tz.transition 2049, 11, :o5, 9879011, 4
-            tz.transition 2050, 3, :o6, 59277091, 24
-            tz.transition 2050, 11, :o5, 9880467, 4
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Petersburg.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Petersburg.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Petersburg.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Petersburg.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indiana
-        module Petersburg
-          include TimezoneDefinition
-          
-          timezone 'America/Indiana/Petersburg' do |tz|
-            tz.offset :o0, -20947, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1955, 5, :o2, 9740915, 4
-            tz.transition 1955, 9, :o1, 58449019, 24
-            tz.transition 1956, 4, :o2, 14613557, 6
-            tz.transition 1956, 9, :o1, 58457923, 24
-            tz.transition 1957, 4, :o2, 14615741, 6
-            tz.transition 1957, 9, :o1, 58466659, 24
-            tz.transition 1958, 4, :o2, 14617925, 6
-            tz.transition 1958, 9, :o1, 58475395, 24
-            tz.transition 1959, 4, :o2, 14620109, 6
-            tz.transition 1959, 9, :o1, 58484131, 24
-            tz.transition 1960, 4, :o2, 14622293, 6
-            tz.transition 1960, 9, :o1, 58492867, 24
-            tz.transition 1961, 4, :o2, 14624519, 6
-            tz.transition 1961, 10, :o1, 58502443, 24
-            tz.transition 1962, 4, :o2, 14626703, 6
-            tz.transition 1962, 10, :o1, 58511179, 24
-            tz.transition 1963, 4, :o2, 14628887, 6
-            tz.transition 1963, 10, :o1, 58519915, 24
-            tz.transition 1964, 4, :o2, 14631071, 6
-            tz.transition 1964, 10, :o1, 58528651, 24
-            tz.transition 1965, 4, :o5, 14633255, 6
-            tz.transition 1966, 10, :o1, 58546291, 24
-            tz.transition 1967, 4, :o2, 14637665, 6
-            tz.transition 1967, 10, :o1, 58555027, 24
-            tz.transition 1968, 4, :o2, 14639849, 6
-            tz.transition 1968, 10, :o1, 58563763, 24
-            tz.transition 1969, 4, :o2, 14642033, 6
-            tz.transition 1969, 10, :o1, 58572499, 24
-            tz.transition 1970, 4, :o2, 9964800
-            tz.transition 1970, 10, :o1, 25686000
-            tz.transition 1971, 4, :o2, 41414400
-            tz.transition 1971, 10, :o1, 57740400
-            tz.transition 1972, 4, :o2, 73468800
-            tz.transition 1972, 10, :o1, 89190000
-            tz.transition 1973, 4, :o2, 104918400
-            tz.transition 1973, 10, :o1, 120639600
-            tz.transition 1974, 1, :o2, 126691200
-            tz.transition 1974, 10, :o1, 152089200
-            tz.transition 1975, 2, :o2, 162374400
-            tz.transition 1975, 10, :o1, 183538800
-            tz.transition 1976, 4, :o2, 199267200
-            tz.transition 1976, 10, :o1, 215593200
-            tz.transition 1977, 4, :o2, 230716800
-            tz.transition 1977, 10, :o5, 247042800
-            tz.transition 2006, 4, :o2, 1143961200
-            tz.transition 2006, 10, :o1, 1162105200
-            tz.transition 2007, 3, :o2, 1173600000
-            tz.transition 2007, 11, :o1, 1194159600
-            tz.transition 2008, 3, :o2, 1205049600
-            tz.transition 2008, 11, :o1, 1225609200
-            tz.transition 2009, 3, :o2, 1236499200
-            tz.transition 2009, 11, :o1, 1257058800
-            tz.transition 2010, 3, :o2, 1268553600
-            tz.transition 2010, 11, :o1, 1289113200
-            tz.transition 2011, 3, :o2, 1300003200
-            tz.transition 2011, 11, :o1, 1320562800
-            tz.transition 2012, 3, :o2, 1331452800
-            tz.transition 2012, 11, :o1, 1352012400
-            tz.transition 2013, 3, :o2, 1362902400
-            tz.transition 2013, 11, :o1, 1383462000
-            tz.transition 2014, 3, :o2, 1394352000
-            tz.transition 2014, 11, :o1, 1414911600
-            tz.transition 2015, 3, :o2, 1425801600
-            tz.transition 2015, 11, :o1, 1446361200
-            tz.transition 2016, 3, :o2, 1457856000
-            tz.transition 2016, 11, :o1, 1478415600
-            tz.transition 2017, 3, :o2, 1489305600
-            tz.transition 2017, 11, :o1, 1509865200
-            tz.transition 2018, 3, :o2, 1520755200
-            tz.transition 2018, 11, :o1, 1541314800
-            tz.transition 2019, 3, :o2, 1552204800
-            tz.transition 2019, 11, :o1, 1572764400
-            tz.transition 2020, 3, :o2, 1583654400
-            tz.transition 2020, 11, :o1, 1604214000
-            tz.transition 2021, 3, :o2, 1615708800
-            tz.transition 2021, 11, :o1, 1636268400
-            tz.transition 2022, 3, :o2, 1647158400
-            tz.transition 2022, 11, :o1, 1667718000
-            tz.transition 2023, 3, :o2, 1678608000
-            tz.transition 2023, 11, :o1, 1699167600
-            tz.transition 2024, 3, :o2, 1710057600
-            tz.transition 2024, 11, :o1, 1730617200
-            tz.transition 2025, 3, :o2, 1741507200
-            tz.transition 2025, 11, :o1, 1762066800
-            tz.transition 2026, 3, :o2, 1772956800
-            tz.transition 2026, 11, :o1, 1793516400
-            tz.transition 2027, 3, :o2, 1805011200
-            tz.transition 2027, 11, :o1, 1825570800
-            tz.transition 2028, 3, :o2, 1836460800
-            tz.transition 2028, 11, :o1, 1857020400
-            tz.transition 2029, 3, :o2, 1867910400
-            tz.transition 2029, 11, :o1, 1888470000
-            tz.transition 2030, 3, :o2, 1899360000
-            tz.transition 2030, 11, :o1, 1919919600
-            tz.transition 2031, 3, :o2, 1930809600
-            tz.transition 2031, 11, :o1, 1951369200
-            tz.transition 2032, 3, :o2, 1962864000
-            tz.transition 2032, 11, :o1, 1983423600
-            tz.transition 2033, 3, :o2, 1994313600
-            tz.transition 2033, 11, :o1, 2014873200
-            tz.transition 2034, 3, :o2, 2025763200
-            tz.transition 2034, 11, :o1, 2046322800
-            tz.transition 2035, 3, :o2, 2057212800
-            tz.transition 2035, 11, :o1, 2077772400
-            tz.transition 2036, 3, :o2, 2088662400
-            tz.transition 2036, 11, :o1, 2109222000
-            tz.transition 2037, 3, :o2, 2120112000
-            tz.transition 2037, 11, :o1, 2140671600
-            tz.transition 2038, 3, :o2, 14792981, 6
-            tz.transition 2038, 11, :o1, 59177635, 24
-            tz.transition 2039, 3, :o2, 14795165, 6
-            tz.transition 2039, 11, :o1, 59186371, 24
-            tz.transition 2040, 3, :o2, 14797349, 6
-            tz.transition 2040, 11, :o1, 59195107, 24
-            tz.transition 2041, 3, :o2, 14799533, 6
-            tz.transition 2041, 11, :o1, 59203843, 24
-            tz.transition 2042, 3, :o2, 14801717, 6
-            tz.transition 2042, 11, :o1, 59212579, 24
-            tz.transition 2043, 3, :o2, 14803901, 6
-            tz.transition 2043, 11, :o1, 59221315, 24
-            tz.transition 2044, 3, :o2, 14806127, 6
-            tz.transition 2044, 11, :o1, 59230219, 24
-            tz.transition 2045, 3, :o2, 14808311, 6
-            tz.transition 2045, 11, :o1, 59238955, 24
-            tz.transition 2046, 3, :o2, 14810495, 6
-            tz.transition 2046, 11, :o1, 59247691, 24
-            tz.transition 2047, 3, :o2, 14812679, 6
-            tz.transition 2047, 11, :o1, 59256427, 24
-            tz.transition 2048, 3, :o2, 14814863, 6
-            tz.transition 2048, 11, :o1, 59265163, 24
-            tz.transition 2049, 3, :o2, 14817089, 6
-            tz.transition 2049, 11, :o1, 59274067, 24
-            tz.transition 2050, 3, :o2, 14819273, 6
-            tz.transition 2050, 11, :o1, 59282803, 24
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vevay.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vevay.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vevay.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vevay.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,131 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indiana
-        module Vevay
-          include TimezoneDefinition
-          
-          timezone 'America/Indiana/Vevay' do |tz|
-            tz.offset :o0, -20416, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            tz.offset :o6, -18000, 3600, :EDT
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1954, 4, :o5, 14609147, 6
-            tz.transition 1969, 4, :o6, 58568131, 24
-            tz.transition 1969, 10, :o5, 9762083, 4
-            tz.transition 1970, 4, :o6, 9961200
-            tz.transition 1970, 10, :o5, 25682400
-            tz.transition 1971, 4, :o6, 41410800
-            tz.transition 1971, 10, :o5, 57736800
-            tz.transition 1972, 4, :o6, 73465200
-            tz.transition 1972, 10, :o5, 89186400
-            tz.transition 2006, 4, :o6, 1143961200
-            tz.transition 2006, 10, :o5, 1162101600
-            tz.transition 2007, 3, :o6, 1173596400
-            tz.transition 2007, 11, :o5, 1194156000
-            tz.transition 2008, 3, :o6, 1205046000
-            tz.transition 2008, 11, :o5, 1225605600
-            tz.transition 2009, 3, :o6, 1236495600
-            tz.transition 2009, 11, :o5, 1257055200
-            tz.transition 2010, 3, :o6, 1268550000
-            tz.transition 2010, 11, :o5, 1289109600
-            tz.transition 2011, 3, :o6, 1299999600
-            tz.transition 2011, 11, :o5, 1320559200
-            tz.transition 2012, 3, :o6, 1331449200
-            tz.transition 2012, 11, :o5, 1352008800
-            tz.transition 2013, 3, :o6, 1362898800
-            tz.transition 2013, 11, :o5, 1383458400
-            tz.transition 2014, 3, :o6, 1394348400
-            tz.transition 2014, 11, :o5, 1414908000
-            tz.transition 2015, 3, :o6, 1425798000
-            tz.transition 2015, 11, :o5, 1446357600
-            tz.transition 2016, 3, :o6, 1457852400
-            tz.transition 2016, 11, :o5, 1478412000
-            tz.transition 2017, 3, :o6, 1489302000
-            tz.transition 2017, 11, :o5, 1509861600
-            tz.transition 2018, 3, :o6, 1520751600
-            tz.transition 2018, 11, :o5, 1541311200
-            tz.transition 2019, 3, :o6, 1552201200
-            tz.transition 2019, 11, :o5, 1572760800
-            tz.transition 2020, 3, :o6, 1583650800
-            tz.transition 2020, 11, :o5, 1604210400
-            tz.transition 2021, 3, :o6, 1615705200
-            tz.transition 2021, 11, :o5, 1636264800
-            tz.transition 2022, 3, :o6, 1647154800
-            tz.transition 2022, 11, :o5, 1667714400
-            tz.transition 2023, 3, :o6, 1678604400
-            tz.transition 2023, 11, :o5, 1699164000
-            tz.transition 2024, 3, :o6, 1710054000
-            tz.transition 2024, 11, :o5, 1730613600
-            tz.transition 2025, 3, :o6, 1741503600
-            tz.transition 2025, 11, :o5, 1762063200
-            tz.transition 2026, 3, :o6, 1772953200
-            tz.transition 2026, 11, :o5, 1793512800
-            tz.transition 2027, 3, :o6, 1805007600
-            tz.transition 2027, 11, :o5, 1825567200
-            tz.transition 2028, 3, :o6, 1836457200
-            tz.transition 2028, 11, :o5, 1857016800
-            tz.transition 2029, 3, :o6, 1867906800
-            tz.transition 2029, 11, :o5, 1888466400
-            tz.transition 2030, 3, :o6, 1899356400
-            tz.transition 2030, 11, :o5, 1919916000
-            tz.transition 2031, 3, :o6, 1930806000
-            tz.transition 2031, 11, :o5, 1951365600
-            tz.transition 2032, 3, :o6, 1962860400
-            tz.transition 2032, 11, :o5, 1983420000
-            tz.transition 2033, 3, :o6, 1994310000
-            tz.transition 2033, 11, :o5, 2014869600
-            tz.transition 2034, 3, :o6, 2025759600
-            tz.transition 2034, 11, :o5, 2046319200
-            tz.transition 2035, 3, :o6, 2057209200
-            tz.transition 2035, 11, :o5, 2077768800
-            tz.transition 2036, 3, :o6, 2088658800
-            tz.transition 2036, 11, :o5, 2109218400
-            tz.transition 2037, 3, :o6, 2120108400
-            tz.transition 2037, 11, :o5, 2140668000
-            tz.transition 2038, 3, :o6, 59171923, 24
-            tz.transition 2038, 11, :o5, 9862939, 4
-            tz.transition 2039, 3, :o6, 59180659, 24
-            tz.transition 2039, 11, :o5, 9864395, 4
-            tz.transition 2040, 3, :o6, 59189395, 24
-            tz.transition 2040, 11, :o5, 9865851, 4
-            tz.transition 2041, 3, :o6, 59198131, 24
-            tz.transition 2041, 11, :o5, 9867307, 4
-            tz.transition 2042, 3, :o6, 59206867, 24
-            tz.transition 2042, 11, :o5, 9868763, 4
-            tz.transition 2043, 3, :o6, 59215603, 24
-            tz.transition 2043, 11, :o5, 9870219, 4
-            tz.transition 2044, 3, :o6, 59224507, 24
-            tz.transition 2044, 11, :o5, 9871703, 4
-            tz.transition 2045, 3, :o6, 59233243, 24
-            tz.transition 2045, 11, :o5, 9873159, 4
-            tz.transition 2046, 3, :o6, 59241979, 24
-            tz.transition 2046, 11, :o5, 9874615, 4
-            tz.transition 2047, 3, :o6, 59250715, 24
-            tz.transition 2047, 11, :o5, 9876071, 4
-            tz.transition 2048, 3, :o6, 59259451, 24
-            tz.transition 2048, 11, :o5, 9877527, 4
-            tz.transition 2049, 3, :o6, 59268355, 24
-            tz.transition 2049, 11, :o5, 9879011, 4
-            tz.transition 2050, 3, :o6, 59277091, 24
-            tz.transition 2050, 11, :o5, 9880467, 4
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vincennes.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vincennes.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vincennes.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indiana/Vincennes.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,151 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indiana
-        module Vincennes
-          include TimezoneDefinition
-          
-          timezone 'America/Indiana/Vincennes' do |tz|
-            tz.offset :o0, -21007, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            tz.offset :o6, -18000, 3600, :EDT
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1946, 4, :o2, 14591633, 6
-            tz.transition 1946, 9, :o1, 58370227, 24
-            tz.transition 1953, 4, :o2, 14606963, 6
-            tz.transition 1953, 9, :o1, 58431547, 24
-            tz.transition 1954, 4, :o2, 14609147, 6
-            tz.transition 1954, 9, :o1, 58440283, 24
-            tz.transition 1955, 5, :o2, 9740915, 4
-            tz.transition 1955, 9, :o1, 58449019, 24
-            tz.transition 1956, 4, :o2, 14613557, 6
-            tz.transition 1956, 9, :o1, 58457923, 24
-            tz.transition 1957, 4, :o2, 14615741, 6
-            tz.transition 1957, 9, :o1, 58466659, 24
-            tz.transition 1958, 4, :o2, 14617925, 6
-            tz.transition 1958, 9, :o1, 58475395, 24
-            tz.transition 1959, 4, :o2, 14620109, 6
-            tz.transition 1959, 9, :o1, 58484131, 24
-            tz.transition 1960, 4, :o2, 14622293, 6
-            tz.transition 1960, 10, :o1, 58493707, 24
-            tz.transition 1961, 4, :o2, 14624519, 6
-            tz.transition 1961, 9, :o1, 58501603, 24
-            tz.transition 1962, 4, :o2, 14626703, 6
-            tz.transition 1962, 10, :o1, 58511179, 24
-            tz.transition 1963, 4, :o2, 14628887, 6
-            tz.transition 1963, 10, :o1, 58519915, 24
-            tz.transition 1964, 4, :o5, 14631071, 6
-            tz.transition 1969, 4, :o6, 58568131, 24
-            tz.transition 1969, 10, :o5, 9762083, 4
-            tz.transition 1970, 4, :o6, 9961200
-            tz.transition 1970, 10, :o5, 25682400
-            tz.transition 2006, 4, :o2, 1143961200
-            tz.transition 2006, 10, :o1, 1162105200
-            tz.transition 2007, 3, :o2, 1173600000
-            tz.transition 2007, 11, :o1, 1194159600
-            tz.transition 2008, 3, :o2, 1205049600
-            tz.transition 2008, 11, :o1, 1225609200
-            tz.transition 2009, 3, :o2, 1236499200
-            tz.transition 2009, 11, :o1, 1257058800
-            tz.transition 2010, 3, :o2, 1268553600
-            tz.transition 2010, 11, :o1, 1289113200
-            tz.transition 2011, 3, :o2, 1300003200
-            tz.transition 2011, 11, :o1, 1320562800
-            tz.transition 2012, 3, :o2, 1331452800
-            tz.transition 2012, 11, :o1, 1352012400
-            tz.transition 2013, 3, :o2, 1362902400
-            tz.transition 2013, 11, :o1, 1383462000
-            tz.transition 2014, 3, :o2, 1394352000
-            tz.transition 2014, 11, :o1, 1414911600
-            tz.transition 2015, 3, :o2, 1425801600
-            tz.transition 2015, 11, :o1, 1446361200
-            tz.transition 2016, 3, :o2, 1457856000
-            tz.transition 2016, 11, :o1, 1478415600
-            tz.transition 2017, 3, :o2, 1489305600
-            tz.transition 2017, 11, :o1, 1509865200
-            tz.transition 2018, 3, :o2, 1520755200
-            tz.transition 2018, 11, :o1, 1541314800
-            tz.transition 2019, 3, :o2, 1552204800
-            tz.transition 2019, 11, :o1, 1572764400
-            tz.transition 2020, 3, :o2, 1583654400
-            tz.transition 2020, 11, :o1, 1604214000
-            tz.transition 2021, 3, :o2, 1615708800
-            tz.transition 2021, 11, :o1, 1636268400
-            tz.transition 2022, 3, :o2, 1647158400
-            tz.transition 2022, 11, :o1, 1667718000
-            tz.transition 2023, 3, :o2, 1678608000
-            tz.transition 2023, 11, :o1, 1699167600
-            tz.transition 2024, 3, :o2, 1710057600
-            tz.transition 2024, 11, :o1, 1730617200
-            tz.transition 2025, 3, :o2, 1741507200
-            tz.transition 2025, 11, :o1, 1762066800
-            tz.transition 2026, 3, :o2, 1772956800
-            tz.transition 2026, 11, :o1, 1793516400
-            tz.transition 2027, 3, :o2, 1805011200
-            tz.transition 2027, 11, :o1, 1825570800
-            tz.transition 2028, 3, :o2, 1836460800
-            tz.transition 2028, 11, :o1, 1857020400
-            tz.transition 2029, 3, :o2, 1867910400
-            tz.transition 2029, 11, :o1, 1888470000
-            tz.transition 2030, 3, :o2, 1899360000
-            tz.transition 2030, 11, :o1, 1919919600
-            tz.transition 2031, 3, :o2, 1930809600
-            tz.transition 2031, 11, :o1, 1951369200
-            tz.transition 2032, 3, :o2, 1962864000
-            tz.transition 2032, 11, :o1, 1983423600
-            tz.transition 2033, 3, :o2, 1994313600
-            tz.transition 2033, 11, :o1, 2014873200
-            tz.transition 2034, 3, :o2, 2025763200
-            tz.transition 2034, 11, :o1, 2046322800
-            tz.transition 2035, 3, :o2, 2057212800
-            tz.transition 2035, 11, :o1, 2077772400
-            tz.transition 2036, 3, :o2, 2088662400
-            tz.transition 2036, 11, :o1, 2109222000
-            tz.transition 2037, 3, :o2, 2120112000
-            tz.transition 2037, 11, :o1, 2140671600
-            tz.transition 2038, 3, :o2, 14792981, 6
-            tz.transition 2038, 11, :o1, 59177635, 24
-            tz.transition 2039, 3, :o2, 14795165, 6
-            tz.transition 2039, 11, :o1, 59186371, 24
-            tz.transition 2040, 3, :o2, 14797349, 6
-            tz.transition 2040, 11, :o1, 59195107, 24
-            tz.transition 2041, 3, :o2, 14799533, 6
-            tz.transition 2041, 11, :o1, 59203843, 24
-            tz.transition 2042, 3, :o2, 14801717, 6
-            tz.transition 2042, 11, :o1, 59212579, 24
-            tz.transition 2043, 3, :o2, 14803901, 6
-            tz.transition 2043, 11, :o1, 59221315, 24
-            tz.transition 2044, 3, :o2, 14806127, 6
-            tz.transition 2044, 11, :o1, 59230219, 24
-            tz.transition 2045, 3, :o2, 14808311, 6
-            tz.transition 2045, 11, :o1, 59238955, 24
-            tz.transition 2046, 3, :o2, 14810495, 6
-            tz.transition 2046, 11, :o1, 59247691, 24
-            tz.transition 2047, 3, :o2, 14812679, 6
-            tz.transition 2047, 11, :o1, 59256427, 24
-            tz.transition 2048, 3, :o2, 14814863, 6
-            tz.transition 2048, 11, :o1, 59265163, 24
-            tz.transition 2049, 3, :o2, 14817089, 6
-            tz.transition 2049, 11, :o1, 59274067, 24
-            tz.transition 2050, 3, :o2, 14819273, 6
-            tz.transition 2050, 11, :o1, 59282803, 24
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indianapolis.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indianapolis.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indianapolis.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Indianapolis.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indianapolis
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Indianapolis', 'America/Indiana/Indianapolis'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Inuvik.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Inuvik.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Inuvik.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Inuvik.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,176 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Inuvik
-        include TimezoneDefinition
-        
-        timezone 'America/Inuvik' do |tz|
-          tz.offset :o0, -32092, 0, :LMT
-          tz.offset :o1, -28800, 0, :PST
-          tz.offset :o2, -28800, 3600, :PDT
-          tz.offset :o3, -28800, 3600, :PWT
-          tz.offset :o4, -28800, 3600, :PPT
-          tz.offset :o5, -28800, 7200, :PDDT
-          tz.offset :o6, -25200, 0, :MST
-          tz.offset :o7, -25200, 3600, :MDT
-          
-          tz.transition 1884, 1, :o1, 52038220423, 21600
-          tz.transition 1918, 4, :o2, 29060375, 12
-          tz.transition 1918, 10, :o1, 19375151, 8
-          tz.transition 1919, 5, :o2, 29065247, 12
-          tz.transition 1919, 11, :o1, 58134331, 24
-          tz.transition 1942, 2, :o3, 29164799, 12
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 19453831, 8
-          tz.transition 1965, 4, :o5, 14633255, 6
-          tz.transition 1965, 10, :o1, 14634389, 6
-          tz.transition 1979, 4, :o6, 294228000
-          tz.transition 1980, 4, :o7, 325674000
-          tz.transition 1980, 10, :o6, 341395200
-          tz.transition 1981, 4, :o7, 357123600
-          tz.transition 1981, 10, :o6, 372844800
-          tz.transition 1982, 4, :o7, 388573200
-          tz.transition 1982, 10, :o6, 404899200
-          tz.transition 1983, 4, :o7, 420022800
-          tz.transition 1983, 10, :o6, 436348800
-          tz.transition 1984, 4, :o7, 452077200
-          tz.transition 1984, 10, :o6, 467798400
-          tz.transition 1985, 4, :o7, 483526800
-          tz.transition 1985, 10, :o6, 499248000
-          tz.transition 1986, 4, :o7, 514976400
-          tz.transition 1986, 10, :o6, 530697600
-          tz.transition 1987, 4, :o7, 544611600
-          tz.transition 1987, 10, :o6, 562147200
-          tz.transition 1988, 4, :o7, 576061200
-          tz.transition 1988, 10, :o6, 594201600
-          tz.transition 1989, 4, :o7, 607510800
-          tz.transition 1989, 10, :o6, 625651200
-          tz.transition 1990, 4, :o7, 638960400
-          tz.transition 1990, 10, :o6, 657100800
-          tz.transition 1991, 4, :o7, 671014800
-          tz.transition 1991, 10, :o6, 688550400
-          tz.transition 1992, 4, :o7, 702464400
-          tz.transition 1992, 10, :o6, 720000000
-          tz.transition 1993, 4, :o7, 733914000
-          tz.transition 1993, 10, :o6, 752054400
-          tz.transition 1994, 4, :o7, 765363600
-          tz.transition 1994, 10, :o6, 783504000
-          tz.transition 1995, 4, :o7, 796813200
-          tz.transition 1995, 10, :o6, 814953600
-          tz.transition 1996, 4, :o7, 828867600
-          tz.transition 1996, 10, :o6, 846403200
-          tz.transition 1997, 4, :o7, 860317200
-          tz.transition 1997, 10, :o6, 877852800
-          tz.transition 1998, 4, :o7, 891766800
-          tz.transition 1998, 10, :o6, 909302400
-          tz.transition 1999, 4, :o7, 923216400
-          tz.transition 1999, 10, :o6, 941356800
-          tz.transition 2000, 4, :o7, 954666000
-          tz.transition 2000, 10, :o6, 972806400
-          tz.transition 2001, 4, :o7, 986115600
-          tz.transition 2001, 10, :o6, 1004256000
-          tz.transition 2002, 4, :o7, 1018170000
-          tz.transition 2002, 10, :o6, 1035705600
-          tz.transition 2003, 4, :o7, 1049619600
-          tz.transition 2003, 10, :o6, 1067155200
-          tz.transition 2004, 4, :o7, 1081069200
-          tz.transition 2004, 10, :o6, 1099209600
-          tz.transition 2005, 4, :o7, 1112518800
-          tz.transition 2005, 10, :o6, 1130659200
-          tz.transition 2006, 4, :o7, 1143968400
-          tz.transition 2006, 10, :o6, 1162108800
-          tz.transition 2007, 3, :o7, 1173603600
-          tz.transition 2007, 11, :o6, 1194163200
-          tz.transition 2008, 3, :o7, 1205053200
-          tz.transition 2008, 11, :o6, 1225612800
-          tz.transition 2009, 3, :o7, 1236502800
-          tz.transition 2009, 11, :o6, 1257062400
-          tz.transition 2010, 3, :o7, 1268557200
-          tz.transition 2010, 11, :o6, 1289116800
-          tz.transition 2011, 3, :o7, 1300006800
-          tz.transition 2011, 11, :o6, 1320566400
-          tz.transition 2012, 3, :o7, 1331456400
-          tz.transition 2012, 11, :o6, 1352016000
-          tz.transition 2013, 3, :o7, 1362906000
-          tz.transition 2013, 11, :o6, 1383465600
-          tz.transition 2014, 3, :o7, 1394355600
-          tz.transition 2014, 11, :o6, 1414915200
-          tz.transition 2015, 3, :o7, 1425805200
-          tz.transition 2015, 11, :o6, 1446364800
-          tz.transition 2016, 3, :o7, 1457859600
-          tz.transition 2016, 11, :o6, 1478419200
-          tz.transition 2017, 3, :o7, 1489309200
-          tz.transition 2017, 11, :o6, 1509868800
-          tz.transition 2018, 3, :o7, 1520758800
-          tz.transition 2018, 11, :o6, 1541318400
-          tz.transition 2019, 3, :o7, 1552208400
-          tz.transition 2019, 11, :o6, 1572768000
-          tz.transition 2020, 3, :o7, 1583658000
-          tz.transition 2020, 11, :o6, 1604217600
-          tz.transition 2021, 3, :o7, 1615712400
-          tz.transition 2021, 11, :o6, 1636272000
-          tz.transition 2022, 3, :o7, 1647162000
-          tz.transition 2022, 11, :o6, 1667721600
-          tz.transition 2023, 3, :o7, 1678611600
-          tz.transition 2023, 11, :o6, 1699171200
-          tz.transition 2024, 3, :o7, 1710061200
-          tz.transition 2024, 11, :o6, 1730620800
-          tz.transition 2025, 3, :o7, 1741510800
-          tz.transition 2025, 11, :o6, 1762070400
-          tz.transition 2026, 3, :o7, 1772960400
-          tz.transition 2026, 11, :o6, 1793520000
-          tz.transition 2027, 3, :o7, 1805014800
-          tz.transition 2027, 11, :o6, 1825574400
-          tz.transition 2028, 3, :o7, 1836464400
-          tz.transition 2028, 11, :o6, 1857024000
-          tz.transition 2029, 3, :o7, 1867914000
-          tz.transition 2029, 11, :o6, 1888473600
-          tz.transition 2030, 3, :o7, 1899363600
-          tz.transition 2030, 11, :o6, 1919923200
-          tz.transition 2031, 3, :o7, 1930813200
-          tz.transition 2031, 11, :o6, 1951372800
-          tz.transition 2032, 3, :o7, 1962867600
-          tz.transition 2032, 11, :o6, 1983427200
-          tz.transition 2033, 3, :o7, 1994317200
-          tz.transition 2033, 11, :o6, 2014876800
-          tz.transition 2034, 3, :o7, 2025766800
-          tz.transition 2034, 11, :o6, 2046326400
-          tz.transition 2035, 3, :o7, 2057216400
-          tz.transition 2035, 11, :o6, 2077776000
-          tz.transition 2036, 3, :o7, 2088666000
-          tz.transition 2036, 11, :o6, 2109225600
-          tz.transition 2037, 3, :o7, 2120115600
-          tz.transition 2037, 11, :o6, 2140675200
-          tz.transition 2038, 3, :o7, 19723975, 8
-          tz.transition 2038, 11, :o6, 14794409, 6
-          tz.transition 2039, 3, :o7, 19726887, 8
-          tz.transition 2039, 11, :o6, 14796593, 6
-          tz.transition 2040, 3, :o7, 19729799, 8
-          tz.transition 2040, 11, :o6, 14798777, 6
-          tz.transition 2041, 3, :o7, 19732711, 8
-          tz.transition 2041, 11, :o6, 14800961, 6
-          tz.transition 2042, 3, :o7, 19735623, 8
-          tz.transition 2042, 11, :o6, 14803145, 6
-          tz.transition 2043, 3, :o7, 19738535, 8
-          tz.transition 2043, 11, :o6, 14805329, 6
-          tz.transition 2044, 3, :o7, 19741503, 8
-          tz.transition 2044, 11, :o6, 14807555, 6
-          tz.transition 2045, 3, :o7, 19744415, 8
-          tz.transition 2045, 11, :o6, 14809739, 6
-          tz.transition 2046, 3, :o7, 19747327, 8
-          tz.transition 2046, 11, :o6, 14811923, 6
-          tz.transition 2047, 3, :o7, 19750239, 8
-          tz.transition 2047, 11, :o6, 14814107, 6
-          tz.transition 2048, 3, :o7, 19753151, 8
-          tz.transition 2048, 11, :o6, 14816291, 6
-          tz.transition 2049, 3, :o7, 19756119, 8
-          tz.transition 2049, 11, :o6, 14818517, 6
-          tz.transition 2050, 3, :o7, 19759031, 8
-          tz.transition 2050, 11, :o6, 14820701, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Iqaluit.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Iqaluit.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Iqaluit.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Iqaluit.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,175 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Iqaluit
-        include TimezoneDefinition
-        
-        timezone 'America/Iqaluit' do |tz|
-          tz.offset :o0, -16432, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EDT
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          tz.offset :o5, -18000, 7200, :EDDT
-          tz.offset :o6, -21600, 0, :CST
-          tz.offset :o7, -21600, 3600, :CDT
-          
-          tz.transition 1884, 1, :o1, 13009554127, 5400
-          tz.transition 1918, 4, :o2, 58120747, 24
-          tz.transition 1918, 10, :o1, 9687575, 4
-          tz.transition 1919, 5, :o2, 58130491, 24
-          tz.transition 1919, 11, :o1, 7266791, 3
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 9726915, 4
-          tz.transition 1965, 4, :o5, 58533017, 24
-          tz.transition 1965, 10, :o1, 58537553, 24
-          tz.transition 1980, 4, :o2, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o2, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o2, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o2, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o2, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o2, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o2, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o2, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o2, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o2, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o2, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o2, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o2, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o2, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o2, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o2, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o2, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o2, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o2, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o2, 923209200
-          tz.transition 1999, 10, :o6, 941349600
-          tz.transition 2000, 4, :o7, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 4, :o2, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o2, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o2, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o2, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o2, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o2, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 3, :o2, 1173596400
-          tz.transition 2007, 11, :o1, 1194156000
-          tz.transition 2008, 3, :o2, 1205046000
-          tz.transition 2008, 11, :o1, 1225605600
-          tz.transition 2009, 3, :o2, 1236495600
-          tz.transition 2009, 11, :o1, 1257055200
-          tz.transition 2010, 3, :o2, 1268550000
-          tz.transition 2010, 11, :o1, 1289109600
-          tz.transition 2011, 3, :o2, 1299999600
-          tz.transition 2011, 11, :o1, 1320559200
-          tz.transition 2012, 3, :o2, 1331449200
-          tz.transition 2012, 11, :o1, 1352008800
-          tz.transition 2013, 3, :o2, 1362898800
-          tz.transition 2013, 11, :o1, 1383458400
-          tz.transition 2014, 3, :o2, 1394348400
-          tz.transition 2014, 11, :o1, 1414908000
-          tz.transition 2015, 3, :o2, 1425798000
-          tz.transition 2015, 11, :o1, 1446357600
-          tz.transition 2016, 3, :o2, 1457852400
-          tz.transition 2016, 11, :o1, 1478412000
-          tz.transition 2017, 3, :o2, 1489302000
-          tz.transition 2017, 11, :o1, 1509861600
-          tz.transition 2018, 3, :o2, 1520751600
-          tz.transition 2018, 11, :o1, 1541311200
-          tz.transition 2019, 3, :o2, 1552201200
-          tz.transition 2019, 11, :o1, 1572760800
-          tz.transition 2020, 3, :o2, 1583650800
-          tz.transition 2020, 11, :o1, 1604210400
-          tz.transition 2021, 3, :o2, 1615705200
-          tz.transition 2021, 11, :o1, 1636264800
-          tz.transition 2022, 3, :o2, 1647154800
-          tz.transition 2022, 11, :o1, 1667714400
-          tz.transition 2023, 3, :o2, 1678604400
-          tz.transition 2023, 11, :o1, 1699164000
-          tz.transition 2024, 3, :o2, 1710054000
-          tz.transition 2024, 11, :o1, 1730613600
-          tz.transition 2025, 3, :o2, 1741503600
-          tz.transition 2025, 11, :o1, 1762063200
-          tz.transition 2026, 3, :o2, 1772953200
-          tz.transition 2026, 11, :o1, 1793512800
-          tz.transition 2027, 3, :o2, 1805007600
-          tz.transition 2027, 11, :o1, 1825567200
-          tz.transition 2028, 3, :o2, 1836457200
-          tz.transition 2028, 11, :o1, 1857016800
-          tz.transition 2029, 3, :o2, 1867906800
-          tz.transition 2029, 11, :o1, 1888466400
-          tz.transition 2030, 3, :o2, 1899356400
-          tz.transition 2030, 11, :o1, 1919916000
-          tz.transition 2031, 3, :o2, 1930806000
-          tz.transition 2031, 11, :o1, 1951365600
-          tz.transition 2032, 3, :o2, 1962860400
-          tz.transition 2032, 11, :o1, 1983420000
-          tz.transition 2033, 3, :o2, 1994310000
-          tz.transition 2033, 11, :o1, 2014869600
-          tz.transition 2034, 3, :o2, 2025759600
-          tz.transition 2034, 11, :o1, 2046319200
-          tz.transition 2035, 3, :o2, 2057209200
-          tz.transition 2035, 11, :o1, 2077768800
-          tz.transition 2036, 3, :o2, 2088658800
-          tz.transition 2036, 11, :o1, 2109218400
-          tz.transition 2037, 3, :o2, 2120108400
-          tz.transition 2037, 11, :o1, 2140668000
-          tz.transition 2038, 3, :o2, 59171923, 24
-          tz.transition 2038, 11, :o1, 9862939, 4
-          tz.transition 2039, 3, :o2, 59180659, 24
-          tz.transition 2039, 11, :o1, 9864395, 4
-          tz.transition 2040, 3, :o2, 59189395, 24
-          tz.transition 2040, 11, :o1, 9865851, 4
-          tz.transition 2041, 3, :o2, 59198131, 24
-          tz.transition 2041, 11, :o1, 9867307, 4
-          tz.transition 2042, 3, :o2, 59206867, 24
-          tz.transition 2042, 11, :o1, 9868763, 4
-          tz.transition 2043, 3, :o2, 59215603, 24
-          tz.transition 2043, 11, :o1, 9870219, 4
-          tz.transition 2044, 3, :o2, 59224507, 24
-          tz.transition 2044, 11, :o1, 9871703, 4
-          tz.transition 2045, 3, :o2, 59233243, 24
-          tz.transition 2045, 11, :o1, 9873159, 4
-          tz.transition 2046, 3, :o2, 59241979, 24
-          tz.transition 2046, 11, :o1, 9874615, 4
-          tz.transition 2047, 3, :o2, 59250715, 24
-          tz.transition 2047, 11, :o1, 9876071, 4
-          tz.transition 2048, 3, :o2, 59259451, 24
-          tz.transition 2048, 11, :o1, 9877527, 4
-          tz.transition 2049, 3, :o2, 59268355, 24
-          tz.transition 2049, 11, :o1, 9879011, 4
-          tz.transition 2050, 3, :o2, 59277091, 24
-          tz.transition 2050, 11, :o1, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jamaica.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jamaica.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jamaica.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jamaica.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,41 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Jamaica
-        include TimezoneDefinition
-        
-        timezone 'America/Jamaica' do |tz|
-          tz.offset :o0, -18432, 0, :LMT
-          tz.offset :o1, -18432, 0, :KMT
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -18000, 3600, :EDT
-          
-          tz.transition 1890, 1, :o1, 361705307, 150
-          tz.transition 1912, 2, :o2, 362915057, 150
-          tz.transition 1974, 4, :o3, 136364400
-          tz.transition 1974, 10, :o2, 152085600
-          tz.transition 1975, 2, :o3, 162370800
-          tz.transition 1975, 10, :o2, 183535200
-          tz.transition 1976, 4, :o3, 199263600
-          tz.transition 1976, 10, :o2, 215589600
-          tz.transition 1977, 4, :o3, 230713200
-          tz.transition 1977, 10, :o2, 247039200
-          tz.transition 1978, 4, :o3, 262767600
-          tz.transition 1978, 10, :o2, 278488800
-          tz.transition 1979, 4, :o3, 294217200
-          tz.transition 1979, 10, :o2, 309938400
-          tz.transition 1980, 4, :o3, 325666800
-          tz.transition 1980, 10, :o2, 341388000
-          tz.transition 1981, 4, :o3, 357116400
-          tz.transition 1981, 10, :o2, 372837600
-          tz.transition 1982, 4, :o3, 388566000
-          tz.transition 1982, 10, :o2, 404892000
-          tz.transition 1983, 4, :o3, 420015600
-          tz.transition 1983, 10, :o2, 436341600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jujuy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jujuy.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jujuy.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Jujuy.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Jujuy
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Jujuy', 'America/Argentina/Jujuy'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Juneau.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Juneau.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Juneau.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Juneau.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,194 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Juneau
-        include TimezoneDefinition
-        
-        timezone 'America/Juneau' do |tz|
-          tz.offset :o0, 54139, 0, :LMT
-          tz.offset :o1, -32261, 0, :LMT
-          tz.offset :o2, -28800, 0, :PST
-          tz.offset :o3, -28800, 3600, :PWT
-          tz.offset :o4, -28800, 3600, :PPT
-          tz.offset :o5, -28800, 3600, :PDT
-          tz.offset :o6, -32400, 0, :YST
-          tz.offset :o7, -32400, 0, :AKST
-          tz.offset :o8, -32400, 3600, :AKDT
-          
-          tz.transition 1867, 10, :o1, 207641393861, 86400
-          tz.transition 1900, 8, :o2, 208677805061, 86400
-          tz.transition 1942, 2, :o3, 29164799, 12
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 19453831, 8
-          tz.transition 1969, 4, :o5, 29284067, 12
-          tz.transition 1969, 10, :o2, 19524167, 8
-          tz.transition 1970, 4, :o5, 9972000
-          tz.transition 1970, 10, :o2, 25693200
-          tz.transition 1971, 4, :o5, 41421600
-          tz.transition 1971, 10, :o2, 57747600
-          tz.transition 1972, 4, :o5, 73476000
-          tz.transition 1972, 10, :o2, 89197200
-          tz.transition 1973, 4, :o5, 104925600
-          tz.transition 1973, 10, :o2, 120646800
-          tz.transition 1974, 1, :o5, 126698400
-          tz.transition 1974, 10, :o2, 152096400
-          tz.transition 1975, 2, :o5, 162381600
-          tz.transition 1975, 10, :o2, 183546000
-          tz.transition 1976, 4, :o5, 199274400
-          tz.transition 1976, 10, :o2, 215600400
-          tz.transition 1977, 4, :o5, 230724000
-          tz.transition 1977, 10, :o2, 247050000
-          tz.transition 1978, 4, :o5, 262778400
-          tz.transition 1978, 10, :o2, 278499600
-          tz.transition 1979, 4, :o5, 294228000
-          tz.transition 1979, 10, :o2, 309949200
-          tz.transition 1980, 4, :o5, 325677600
-          tz.transition 1980, 10, :o2, 341398800
-          tz.transition 1981, 4, :o5, 357127200
-          tz.transition 1981, 10, :o2, 372848400
-          tz.transition 1982, 4, :o5, 388576800
-          tz.transition 1982, 10, :o2, 404902800
-          tz.transition 1983, 4, :o5, 420026400
-          tz.transition 1983, 10, :o6, 436352400
-          tz.transition 1983, 11, :o7, 439030800
-          tz.transition 1984, 4, :o8, 452084400
-          tz.transition 1984, 10, :o7, 467805600
-          tz.transition 1985, 4, :o8, 483534000
-          tz.transition 1985, 10, :o7, 499255200
-          tz.transition 1986, 4, :o8, 514983600
-          tz.transition 1986, 10, :o7, 530704800
-          tz.transition 1987, 4, :o8, 544618800
-          tz.transition 1987, 10, :o7, 562154400
-          tz.transition 1988, 4, :o8, 576068400
-          tz.transition 1988, 10, :o7, 594208800
-          tz.transition 1989, 4, :o8, 607518000
-          tz.transition 1989, 10, :o7, 625658400
-          tz.transition 1990, 4, :o8, 638967600
-          tz.transition 1990, 10, :o7, 657108000
-          tz.transition 1991, 4, :o8, 671022000
-          tz.transition 1991, 10, :o7, 688557600
-          tz.transition 1992, 4, :o8, 702471600
-          tz.transition 1992, 10, :o7, 720007200
-          tz.transition 1993, 4, :o8, 733921200
-          tz.transition 1993, 10, :o7, 752061600
-          tz.transition 1994, 4, :o8, 765370800
-          tz.transition 1994, 10, :o7, 783511200
-          tz.transition 1995, 4, :o8, 796820400
-          tz.transition 1995, 10, :o7, 814960800
-          tz.transition 1996, 4, :o8, 828874800
-          tz.transition 1996, 10, :o7, 846410400
-          tz.transition 1997, 4, :o8, 860324400
-          tz.transition 1997, 10, :o7, 877860000
-          tz.transition 1998, 4, :o8, 891774000
-          tz.transition 1998, 10, :o7, 909309600
-          tz.transition 1999, 4, :o8, 923223600
-          tz.transition 1999, 10, :o7, 941364000
-          tz.transition 2000, 4, :o8, 954673200
-          tz.transition 2000, 10, :o7, 972813600
-          tz.transition 2001, 4, :o8, 986122800
-          tz.transition 2001, 10, :o7, 1004263200
-          tz.transition 2002, 4, :o8, 1018177200
-          tz.transition 2002, 10, :o7, 1035712800
-          tz.transition 2003, 4, :o8, 1049626800
-          tz.transition 2003, 10, :o7, 1067162400
-          tz.transition 2004, 4, :o8, 1081076400
-          tz.transition 2004, 10, :o7, 1099216800
-          tz.transition 2005, 4, :o8, 1112526000
-          tz.transition 2005, 10, :o7, 1130666400
-          tz.transition 2006, 4, :o8, 1143975600
-          tz.transition 2006, 10, :o7, 1162116000
-          tz.transition 2007, 3, :o8, 1173610800
-          tz.transition 2007, 11, :o7, 1194170400
-          tz.transition 2008, 3, :o8, 1205060400
-          tz.transition 2008, 11, :o7, 1225620000
-          tz.transition 2009, 3, :o8, 1236510000
-          tz.transition 2009, 11, :o7, 1257069600
-          tz.transition 2010, 3, :o8, 1268564400
-          tz.transition 2010, 11, :o7, 1289124000
-          tz.transition 2011, 3, :o8, 1300014000
-          tz.transition 2011, 11, :o7, 1320573600
-          tz.transition 2012, 3, :o8, 1331463600
-          tz.transition 2012, 11, :o7, 1352023200
-          tz.transition 2013, 3, :o8, 1362913200
-          tz.transition 2013, 11, :o7, 1383472800
-          tz.transition 2014, 3, :o8, 1394362800
-          tz.transition 2014, 11, :o7, 1414922400
-          tz.transition 2015, 3, :o8, 1425812400
-          tz.transition 2015, 11, :o7, 1446372000
-          tz.transition 2016, 3, :o8, 1457866800
-          tz.transition 2016, 11, :o7, 1478426400
-          tz.transition 2017, 3, :o8, 1489316400
-          tz.transition 2017, 11, :o7, 1509876000
-          tz.transition 2018, 3, :o8, 1520766000
-          tz.transition 2018, 11, :o7, 1541325600
-          tz.transition 2019, 3, :o8, 1552215600
-          tz.transition 2019, 11, :o7, 1572775200
-          tz.transition 2020, 3, :o8, 1583665200
-          tz.transition 2020, 11, :o7, 1604224800
-          tz.transition 2021, 3, :o8, 1615719600
-          tz.transition 2021, 11, :o7, 1636279200
-          tz.transition 2022, 3, :o8, 1647169200
-          tz.transition 2022, 11, :o7, 1667728800
-          tz.transition 2023, 3, :o8, 1678618800
-          tz.transition 2023, 11, :o7, 1699178400
-          tz.transition 2024, 3, :o8, 1710068400
-          tz.transition 2024, 11, :o7, 1730628000
-          tz.transition 2025, 3, :o8, 1741518000
-          tz.transition 2025, 11, :o7, 1762077600
-          tz.transition 2026, 3, :o8, 1772967600
-          tz.transition 2026, 11, :o7, 1793527200
-          tz.transition 2027, 3, :o8, 1805022000
-          tz.transition 2027, 11, :o7, 1825581600
-          tz.transition 2028, 3, :o8, 1836471600
-          tz.transition 2028, 11, :o7, 1857031200
-          tz.transition 2029, 3, :o8, 1867921200
-          tz.transition 2029, 11, :o7, 1888480800
-          tz.transition 2030, 3, :o8, 1899370800
-          tz.transition 2030, 11, :o7, 1919930400
-          tz.transition 2031, 3, :o8, 1930820400
-          tz.transition 2031, 11, :o7, 1951380000
-          tz.transition 2032, 3, :o8, 1962874800
-          tz.transition 2032, 11, :o7, 1983434400
-          tz.transition 2033, 3, :o8, 1994324400
-          tz.transition 2033, 11, :o7, 2014884000
-          tz.transition 2034, 3, :o8, 2025774000
-          tz.transition 2034, 11, :o7, 2046333600
-          tz.transition 2035, 3, :o8, 2057223600
-          tz.transition 2035, 11, :o7, 2077783200
-          tz.transition 2036, 3, :o8, 2088673200
-          tz.transition 2036, 11, :o7, 2109232800
-          tz.transition 2037, 3, :o8, 2120122800
-          tz.transition 2037, 11, :o7, 2140682400
-          tz.transition 2038, 3, :o8, 59171927, 24
-          tz.transition 2038, 11, :o7, 29588819, 12
-          tz.transition 2039, 3, :o8, 59180663, 24
-          tz.transition 2039, 11, :o7, 29593187, 12
-          tz.transition 2040, 3, :o8, 59189399, 24
-          tz.transition 2040, 11, :o7, 29597555, 12
-          tz.transition 2041, 3, :o8, 59198135, 24
-          tz.transition 2041, 11, :o7, 29601923, 12
-          tz.transition 2042, 3, :o8, 59206871, 24
-          tz.transition 2042, 11, :o7, 29606291, 12
-          tz.transition 2043, 3, :o8, 59215607, 24
-          tz.transition 2043, 11, :o7, 29610659, 12
-          tz.transition 2044, 3, :o8, 59224511, 24
-          tz.transition 2044, 11, :o7, 29615111, 12
-          tz.transition 2045, 3, :o8, 59233247, 24
-          tz.transition 2045, 11, :o7, 29619479, 12
-          tz.transition 2046, 3, :o8, 59241983, 24
-          tz.transition 2046, 11, :o7, 29623847, 12
-          tz.transition 2047, 3, :o8, 59250719, 24
-          tz.transition 2047, 11, :o7, 29628215, 12
-          tz.transition 2048, 3, :o8, 59259455, 24
-          tz.transition 2048, 11, :o7, 29632583, 12
-          tz.transition 2049, 3, :o8, 59268359, 24
-          tz.transition 2049, 11, :o7, 29637035, 12
-          tz.transition 2050, 3, :o8, 59277095, 24
-          tz.transition 2050, 11, :o7, 29641403, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Louisville.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Louisville.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Louisville.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Louisville.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,228 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Kentucky
-        module Louisville
-          include TimezoneDefinition
-          
-          timezone 'America/Kentucky/Louisville' do |tz|
-            tz.offset :o0, -20582, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            tz.offset :o6, -18000, 3600, :EDT
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1921, 5, :o2, 14536865, 6
-            tz.transition 1921, 9, :o1, 58150411, 24
-            tz.transition 1941, 4, :o2, 14580671, 6
-            tz.transition 1941, 9, :o1, 58326379, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1946, 1, :o2, 9727287, 4
-            tz.transition 1946, 6, :o1, 58367371, 24
-            tz.transition 1947, 4, :o2, 14593817, 6
-            tz.transition 1950, 9, :o1, 58405171, 24
-            tz.transition 1951, 4, :o2, 14602595, 6
-            tz.transition 1951, 9, :o1, 58414075, 24
-            tz.transition 1952, 4, :o2, 14604779, 6
-            tz.transition 1952, 9, :o1, 58422811, 24
-            tz.transition 1953, 4, :o2, 14606963, 6
-            tz.transition 1953, 9, :o1, 58431547, 24
-            tz.transition 1954, 4, :o2, 14609147, 6
-            tz.transition 1954, 9, :o1, 58440283, 24
-            tz.transition 1955, 4, :o2, 14611331, 6
-            tz.transition 1955, 9, :o1, 58449019, 24
-            tz.transition 1956, 4, :o2, 14613557, 6
-            tz.transition 1956, 10, :o1, 58458595, 24
-            tz.transition 1957, 4, :o2, 14615741, 6
-            tz.transition 1957, 10, :o1, 58467331, 24
-            tz.transition 1958, 4, :o2, 14617925, 6
-            tz.transition 1958, 10, :o1, 58476067, 24
-            tz.transition 1959, 4, :o2, 14620109, 6
-            tz.transition 1959, 10, :o1, 58484803, 24
-            tz.transition 1960, 4, :o2, 14622293, 6
-            tz.transition 1960, 10, :o1, 58493707, 24
-            tz.transition 1961, 4, :o2, 14624519, 6
-            tz.transition 1961, 7, :o5, 58500091, 24
-            tz.transition 1968, 4, :o6, 58559395, 24
-            tz.transition 1968, 10, :o5, 9760627, 4
-            tz.transition 1969, 4, :o6, 58568131, 24
-            tz.transition 1969, 10, :o5, 9762083, 4
-            tz.transition 1970, 4, :o6, 9961200
-            tz.transition 1970, 10, :o5, 25682400
-            tz.transition 1971, 4, :o6, 41410800
-            tz.transition 1971, 10, :o5, 57736800
-            tz.transition 1972, 4, :o6, 73465200
-            tz.transition 1972, 10, :o5, 89186400
-            tz.transition 1973, 4, :o6, 104914800
-            tz.transition 1973, 10, :o5, 120636000
-            tz.transition 1974, 1, :o2, 126687600
-            tz.transition 1974, 10, :o5, 152089200
-            tz.transition 1975, 2, :o6, 162370800
-            tz.transition 1975, 10, :o5, 183535200
-            tz.transition 1976, 4, :o6, 199263600
-            tz.transition 1976, 10, :o5, 215589600
-            tz.transition 1977, 4, :o6, 230713200
-            tz.transition 1977, 10, :o5, 247039200
-            tz.transition 1978, 4, :o6, 262767600
-            tz.transition 1978, 10, :o5, 278488800
-            tz.transition 1979, 4, :o6, 294217200
-            tz.transition 1979, 10, :o5, 309938400
-            tz.transition 1980, 4, :o6, 325666800
-            tz.transition 1980, 10, :o5, 341388000
-            tz.transition 1981, 4, :o6, 357116400
-            tz.transition 1981, 10, :o5, 372837600
-            tz.transition 1982, 4, :o6, 388566000
-            tz.transition 1982, 10, :o5, 404892000
-            tz.transition 1983, 4, :o6, 420015600
-            tz.transition 1983, 10, :o5, 436341600
-            tz.transition 1984, 4, :o6, 452070000
-            tz.transition 1984, 10, :o5, 467791200
-            tz.transition 1985, 4, :o6, 483519600
-            tz.transition 1985, 10, :o5, 499240800
-            tz.transition 1986, 4, :o6, 514969200
-            tz.transition 1986, 10, :o5, 530690400
-            tz.transition 1987, 4, :o6, 544604400
-            tz.transition 1987, 10, :o5, 562140000
-            tz.transition 1988, 4, :o6, 576054000
-            tz.transition 1988, 10, :o5, 594194400
-            tz.transition 1989, 4, :o6, 607503600
-            tz.transition 1989, 10, :o5, 625644000
-            tz.transition 1990, 4, :o6, 638953200
-            tz.transition 1990, 10, :o5, 657093600
-            tz.transition 1991, 4, :o6, 671007600
-            tz.transition 1991, 10, :o5, 688543200
-            tz.transition 1992, 4, :o6, 702457200
-            tz.transition 1992, 10, :o5, 719992800
-            tz.transition 1993, 4, :o6, 733906800
-            tz.transition 1993, 10, :o5, 752047200
-            tz.transition 1994, 4, :o6, 765356400
-            tz.transition 1994, 10, :o5, 783496800
-            tz.transition 1995, 4, :o6, 796806000
-            tz.transition 1995, 10, :o5, 814946400
-            tz.transition 1996, 4, :o6, 828860400
-            tz.transition 1996, 10, :o5, 846396000
-            tz.transition 1997, 4, :o6, 860310000
-            tz.transition 1997, 10, :o5, 877845600
-            tz.transition 1998, 4, :o6, 891759600
-            tz.transition 1998, 10, :o5, 909295200
-            tz.transition 1999, 4, :o6, 923209200
-            tz.transition 1999, 10, :o5, 941349600
-            tz.transition 2000, 4, :o6, 954658800
-            tz.transition 2000, 10, :o5, 972799200
-            tz.transition 2001, 4, :o6, 986108400
-            tz.transition 2001, 10, :o5, 1004248800
-            tz.transition 2002, 4, :o6, 1018162800
-            tz.transition 2002, 10, :o5, 1035698400
-            tz.transition 2003, 4, :o6, 1049612400
-            tz.transition 2003, 10, :o5, 1067148000
-            tz.transition 2004, 4, :o6, 1081062000
-            tz.transition 2004, 10, :o5, 1099202400
-            tz.transition 2005, 4, :o6, 1112511600
-            tz.transition 2005, 10, :o5, 1130652000
-            tz.transition 2006, 4, :o6, 1143961200
-            tz.transition 2006, 10, :o5, 1162101600
-            tz.transition 2007, 3, :o6, 1173596400
-            tz.transition 2007, 11, :o5, 1194156000
-            tz.transition 2008, 3, :o6, 1205046000
-            tz.transition 2008, 11, :o5, 1225605600
-            tz.transition 2009, 3, :o6, 1236495600
-            tz.transition 2009, 11, :o5, 1257055200
-            tz.transition 2010, 3, :o6, 1268550000
-            tz.transition 2010, 11, :o5, 1289109600
-            tz.transition 2011, 3, :o6, 1299999600
-            tz.transition 2011, 11, :o5, 1320559200
-            tz.transition 2012, 3, :o6, 1331449200
-            tz.transition 2012, 11, :o5, 1352008800
-            tz.transition 2013, 3, :o6, 1362898800
-            tz.transition 2013, 11, :o5, 1383458400
-            tz.transition 2014, 3, :o6, 1394348400
-            tz.transition 2014, 11, :o5, 1414908000
-            tz.transition 2015, 3, :o6, 1425798000
-            tz.transition 2015, 11, :o5, 1446357600
-            tz.transition 2016, 3, :o6, 1457852400
-            tz.transition 2016, 11, :o5, 1478412000
-            tz.transition 2017, 3, :o6, 1489302000
-            tz.transition 2017, 11, :o5, 1509861600
-            tz.transition 2018, 3, :o6, 1520751600
-            tz.transition 2018, 11, :o5, 1541311200
-            tz.transition 2019, 3, :o6, 1552201200
-            tz.transition 2019, 11, :o5, 1572760800
-            tz.transition 2020, 3, :o6, 1583650800
-            tz.transition 2020, 11, :o5, 1604210400
-            tz.transition 2021, 3, :o6, 1615705200
-            tz.transition 2021, 11, :o5, 1636264800
-            tz.transition 2022, 3, :o6, 1647154800
-            tz.transition 2022, 11, :o5, 1667714400
-            tz.transition 2023, 3, :o6, 1678604400
-            tz.transition 2023, 11, :o5, 1699164000
-            tz.transition 2024, 3, :o6, 1710054000
-            tz.transition 2024, 11, :o5, 1730613600
-            tz.transition 2025, 3, :o6, 1741503600
-            tz.transition 2025, 11, :o5, 1762063200
-            tz.transition 2026, 3, :o6, 1772953200
-            tz.transition 2026, 11, :o5, 1793512800
-            tz.transition 2027, 3, :o6, 1805007600
-            tz.transition 2027, 11, :o5, 1825567200
-            tz.transition 2028, 3, :o6, 1836457200
-            tz.transition 2028, 11, :o5, 1857016800
-            tz.transition 2029, 3, :o6, 1867906800
-            tz.transition 2029, 11, :o5, 1888466400
-            tz.transition 2030, 3, :o6, 1899356400
-            tz.transition 2030, 11, :o5, 1919916000
-            tz.transition 2031, 3, :o6, 1930806000
-            tz.transition 2031, 11, :o5, 1951365600
-            tz.transition 2032, 3, :o6, 1962860400
-            tz.transition 2032, 11, :o5, 1983420000
-            tz.transition 2033, 3, :o6, 1994310000
-            tz.transition 2033, 11, :o5, 2014869600
-            tz.transition 2034, 3, :o6, 2025759600
-            tz.transition 2034, 11, :o5, 2046319200
-            tz.transition 2035, 3, :o6, 2057209200
-            tz.transition 2035, 11, :o5, 2077768800
-            tz.transition 2036, 3, :o6, 2088658800
-            tz.transition 2036, 11, :o5, 2109218400
-            tz.transition 2037, 3, :o6, 2120108400
-            tz.transition 2037, 11, :o5, 2140668000
-            tz.transition 2038, 3, :o6, 59171923, 24
-            tz.transition 2038, 11, :o5, 9862939, 4
-            tz.transition 2039, 3, :o6, 59180659, 24
-            tz.transition 2039, 11, :o5, 9864395, 4
-            tz.transition 2040, 3, :o6, 59189395, 24
-            tz.transition 2040, 11, :o5, 9865851, 4
-            tz.transition 2041, 3, :o6, 59198131, 24
-            tz.transition 2041, 11, :o5, 9867307, 4
-            tz.transition 2042, 3, :o6, 59206867, 24
-            tz.transition 2042, 11, :o5, 9868763, 4
-            tz.transition 2043, 3, :o6, 59215603, 24
-            tz.transition 2043, 11, :o5, 9870219, 4
-            tz.transition 2044, 3, :o6, 59224507, 24
-            tz.transition 2044, 11, :o5, 9871703, 4
-            tz.transition 2045, 3, :o6, 59233243, 24
-            tz.transition 2045, 11, :o5, 9873159, 4
-            tz.transition 2046, 3, :o6, 59241979, 24
-            tz.transition 2046, 11, :o5, 9874615, 4
-            tz.transition 2047, 3, :o6, 59250715, 24
-            tz.transition 2047, 11, :o5, 9876071, 4
-            tz.transition 2048, 3, :o6, 59259451, 24
-            tz.transition 2048, 11, :o5, 9877527, 4
-            tz.transition 2049, 3, :o6, 59268355, 24
-            tz.transition 2049, 11, :o5, 9879011, 4
-            tz.transition 2050, 3, :o6, 59277091, 24
-            tz.transition 2050, 11, :o5, 9880467, 4
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Monticello.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Monticello.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Monticello.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Kentucky/Monticello.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,198 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Kentucky
-        module Monticello
-          include TimezoneDefinition
-          
-          timezone 'America/Kentucky/Monticello' do |tz|
-            tz.offset :o0, -20364, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            tz.offset :o6, -18000, 3600, :EDT
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1968, 4, :o2, 14639849, 6
-            tz.transition 1968, 10, :o1, 58563763, 24
-            tz.transition 1969, 4, :o2, 14642033, 6
-            tz.transition 1969, 10, :o1, 58572499, 24
-            tz.transition 1970, 4, :o2, 9964800
-            tz.transition 1970, 10, :o1, 25686000
-            tz.transition 1971, 4, :o2, 41414400
-            tz.transition 1971, 10, :o1, 57740400
-            tz.transition 1972, 4, :o2, 73468800
-            tz.transition 1972, 10, :o1, 89190000
-            tz.transition 1973, 4, :o2, 104918400
-            tz.transition 1973, 10, :o1, 120639600
-            tz.transition 1974, 1, :o2, 126691200
-            tz.transition 1974, 10, :o1, 152089200
-            tz.transition 1975, 2, :o2, 162374400
-            tz.transition 1975, 10, :o1, 183538800
-            tz.transition 1976, 4, :o2, 199267200
-            tz.transition 1976, 10, :o1, 215593200
-            tz.transition 1977, 4, :o2, 230716800
-            tz.transition 1977, 10, :o1, 247042800
-            tz.transition 1978, 4, :o2, 262771200
-            tz.transition 1978, 10, :o1, 278492400
-            tz.transition 1979, 4, :o2, 294220800
-            tz.transition 1979, 10, :o1, 309942000
-            tz.transition 1980, 4, :o2, 325670400
-            tz.transition 1980, 10, :o1, 341391600
-            tz.transition 1981, 4, :o2, 357120000
-            tz.transition 1981, 10, :o1, 372841200
-            tz.transition 1982, 4, :o2, 388569600
-            tz.transition 1982, 10, :o1, 404895600
-            tz.transition 1983, 4, :o2, 420019200
-            tz.transition 1983, 10, :o1, 436345200
-            tz.transition 1984, 4, :o2, 452073600
-            tz.transition 1984, 10, :o1, 467794800
-            tz.transition 1985, 4, :o2, 483523200
-            tz.transition 1985, 10, :o1, 499244400
-            tz.transition 1986, 4, :o2, 514972800
-            tz.transition 1986, 10, :o1, 530694000
-            tz.transition 1987, 4, :o2, 544608000
-            tz.transition 1987, 10, :o1, 562143600
-            tz.transition 1988, 4, :o2, 576057600
-            tz.transition 1988, 10, :o1, 594198000
-            tz.transition 1989, 4, :o2, 607507200
-            tz.transition 1989, 10, :o1, 625647600
-            tz.transition 1990, 4, :o2, 638956800
-            tz.transition 1990, 10, :o1, 657097200
-            tz.transition 1991, 4, :o2, 671011200
-            tz.transition 1991, 10, :o1, 688546800
-            tz.transition 1992, 4, :o2, 702460800
-            tz.transition 1992, 10, :o1, 719996400
-            tz.transition 1993, 4, :o2, 733910400
-            tz.transition 1993, 10, :o1, 752050800
-            tz.transition 1994, 4, :o2, 765360000
-            tz.transition 1994, 10, :o1, 783500400
-            tz.transition 1995, 4, :o2, 796809600
-            tz.transition 1995, 10, :o1, 814950000
-            tz.transition 1996, 4, :o2, 828864000
-            tz.transition 1996, 10, :o1, 846399600
-            tz.transition 1997, 4, :o2, 860313600
-            tz.transition 1997, 10, :o1, 877849200
-            tz.transition 1998, 4, :o2, 891763200
-            tz.transition 1998, 10, :o1, 909298800
-            tz.transition 1999, 4, :o2, 923212800
-            tz.transition 1999, 10, :o1, 941353200
-            tz.transition 2000, 4, :o2, 954662400
-            tz.transition 2000, 10, :o5, 972802800
-            tz.transition 2001, 4, :o6, 986108400
-            tz.transition 2001, 10, :o5, 1004248800
-            tz.transition 2002, 4, :o6, 1018162800
-            tz.transition 2002, 10, :o5, 1035698400
-            tz.transition 2003, 4, :o6, 1049612400
-            tz.transition 2003, 10, :o5, 1067148000
-            tz.transition 2004, 4, :o6, 1081062000
-            tz.transition 2004, 10, :o5, 1099202400
-            tz.transition 2005, 4, :o6, 1112511600
-            tz.transition 2005, 10, :o5, 1130652000
-            tz.transition 2006, 4, :o6, 1143961200
-            tz.transition 2006, 10, :o5, 1162101600
-            tz.transition 2007, 3, :o6, 1173596400
-            tz.transition 2007, 11, :o5, 1194156000
-            tz.transition 2008, 3, :o6, 1205046000
-            tz.transition 2008, 11, :o5, 1225605600
-            tz.transition 2009, 3, :o6, 1236495600
-            tz.transition 2009, 11, :o5, 1257055200
-            tz.transition 2010, 3, :o6, 1268550000
-            tz.transition 2010, 11, :o5, 1289109600
-            tz.transition 2011, 3, :o6, 1299999600
-            tz.transition 2011, 11, :o5, 1320559200
-            tz.transition 2012, 3, :o6, 1331449200
-            tz.transition 2012, 11, :o5, 1352008800
-            tz.transition 2013, 3, :o6, 1362898800
-            tz.transition 2013, 11, :o5, 1383458400
-            tz.transition 2014, 3, :o6, 1394348400
-            tz.transition 2014, 11, :o5, 1414908000
-            tz.transition 2015, 3, :o6, 1425798000
-            tz.transition 2015, 11, :o5, 1446357600
-            tz.transition 2016, 3, :o6, 1457852400
-            tz.transition 2016, 11, :o5, 1478412000
-            tz.transition 2017, 3, :o6, 1489302000
-            tz.transition 2017, 11, :o5, 1509861600
-            tz.transition 2018, 3, :o6, 1520751600
-            tz.transition 2018, 11, :o5, 1541311200
-            tz.transition 2019, 3, :o6, 1552201200
-            tz.transition 2019, 11, :o5, 1572760800
-            tz.transition 2020, 3, :o6, 1583650800
-            tz.transition 2020, 11, :o5, 1604210400
-            tz.transition 2021, 3, :o6, 1615705200
-            tz.transition 2021, 11, :o5, 1636264800
-            tz.transition 2022, 3, :o6, 1647154800
-            tz.transition 2022, 11, :o5, 1667714400
-            tz.transition 2023, 3, :o6, 1678604400
-            tz.transition 2023, 11, :o5, 1699164000
-            tz.transition 2024, 3, :o6, 1710054000
-            tz.transition 2024, 11, :o5, 1730613600
-            tz.transition 2025, 3, :o6, 1741503600
-            tz.transition 2025, 11, :o5, 1762063200
-            tz.transition 2026, 3, :o6, 1772953200
-            tz.transition 2026, 11, :o5, 1793512800
-            tz.transition 2027, 3, :o6, 1805007600
-            tz.transition 2027, 11, :o5, 1825567200
-            tz.transition 2028, 3, :o6, 1836457200
-            tz.transition 2028, 11, :o5, 1857016800
-            tz.transition 2029, 3, :o6, 1867906800
-            tz.transition 2029, 11, :o5, 1888466400
-            tz.transition 2030, 3, :o6, 1899356400
-            tz.transition 2030, 11, :o5, 1919916000
-            tz.transition 2031, 3, :o6, 1930806000
-            tz.transition 2031, 11, :o5, 1951365600
-            tz.transition 2032, 3, :o6, 1962860400
-            tz.transition 2032, 11, :o5, 1983420000
-            tz.transition 2033, 3, :o6, 1994310000
-            tz.transition 2033, 11, :o5, 2014869600
-            tz.transition 2034, 3, :o6, 2025759600
-            tz.transition 2034, 11, :o5, 2046319200
-            tz.transition 2035, 3, :o6, 2057209200
-            tz.transition 2035, 11, :o5, 2077768800
-            tz.transition 2036, 3, :o6, 2088658800
-            tz.transition 2036, 11, :o5, 2109218400
-            tz.transition 2037, 3, :o6, 2120108400
-            tz.transition 2037, 11, :o5, 2140668000
-            tz.transition 2038, 3, :o6, 59171923, 24
-            tz.transition 2038, 11, :o5, 9862939, 4
-            tz.transition 2039, 3, :o6, 59180659, 24
-            tz.transition 2039, 11, :o5, 9864395, 4
-            tz.transition 2040, 3, :o6, 59189395, 24
-            tz.transition 2040, 11, :o5, 9865851, 4
-            tz.transition 2041, 3, :o6, 59198131, 24
-            tz.transition 2041, 11, :o5, 9867307, 4
-            tz.transition 2042, 3, :o6, 59206867, 24
-            tz.transition 2042, 11, :o5, 9868763, 4
-            tz.transition 2043, 3, :o6, 59215603, 24
-            tz.transition 2043, 11, :o5, 9870219, 4
-            tz.transition 2044, 3, :o6, 59224507, 24
-            tz.transition 2044, 11, :o5, 9871703, 4
-            tz.transition 2045, 3, :o6, 59233243, 24
-            tz.transition 2045, 11, :o5, 9873159, 4
-            tz.transition 2046, 3, :o6, 59241979, 24
-            tz.transition 2046, 11, :o5, 9874615, 4
-            tz.transition 2047, 3, :o6, 59250715, 24
-            tz.transition 2047, 11, :o5, 9876071, 4
-            tz.transition 2048, 3, :o6, 59259451, 24
-            tz.transition 2048, 11, :o5, 9877527, 4
-            tz.transition 2049, 3, :o6, 59268355, 24
-            tz.transition 2049, 11, :o5, 9879011, 4
-            tz.transition 2050, 3, :o6, 59277091, 24
-            tz.transition 2050, 11, :o5, 9880467, 4
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Knox_IN.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Knox_IN.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Knox_IN.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Knox_IN.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Knox_IN
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Knox_IN', 'America/Indiana/Knox'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/La_Paz.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/La_Paz.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/La_Paz.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/La_Paz.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module La_Paz
-        include TimezoneDefinition
-        
-        timezone 'America/La_Paz' do |tz|
-          tz.offset :o0, -16356, 0, :LMT
-          tz.offset :o1, -16356, 0, :CMT
-          tz.offset :o2, -16356, 3600, :BOST
-          tz.offset :o3, -14400, 0, :BOT
-          
-          tz.transition 1890, 1, :o1, 17361854563, 7200
-          tz.transition 1931, 10, :o2, 17471733763, 7200
-          tz.transition 1932, 3, :o3, 17472871063, 7200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Lima.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Lima.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Lima.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Lima.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Lima
-        include TimezoneDefinition
-        
-        timezone 'America/Lima' do |tz|
-          tz.offset :o0, -18492, 0, :LMT
-          tz.offset :o1, -18516, 0, :LMT
-          tz.offset :o2, -18000, 0, :PET
-          tz.offset :o3, -18000, 3600, :PEST
-          
-          tz.transition 1890, 1, :o1, 17361854741, 7200
-          tz.transition 1908, 7, :o2, 17410685143, 7200
-          tz.transition 1938, 1, :o3, 58293593, 24
-          tz.transition 1938, 4, :o2, 7286969, 3
-          tz.transition 1938, 9, :o3, 58300001, 24
-          tz.transition 1939, 3, :o2, 7288046, 3
-          tz.transition 1939, 9, :o3, 58308737, 24
-          tz.transition 1940, 3, :o2, 7289138, 3
-          tz.transition 1986, 1, :o3, 504939600
-          tz.transition 1986, 4, :o2, 512712000
-          tz.transition 1987, 1, :o3, 536475600
-          tz.transition 1987, 4, :o2, 544248000
-          tz.transition 1990, 1, :o3, 631170000
-          tz.transition 1990, 4, :o2, 638942400
-          tz.transition 1994, 1, :o3, 757400400
-          tz.transition 1994, 4, :o2, 765172800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Los_Angeles.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Los_Angeles.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Los_Angeles.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Los_Angeles.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,232 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Los_Angeles
-        include TimezoneDefinition
-        
-        timezone 'America/Los_Angeles' do |tz|
-          tz.offset :o0, -28378, 0, :LMT
-          tz.offset :o1, -28800, 0, :PST
-          tz.offset :o2, -28800, 3600, :PDT
-          tz.offset :o3, -28800, 3600, :PWT
-          tz.offset :o4, -28800, 3600, :PPT
-          
-          tz.transition 1883, 11, :o1, 7227400, 3
-          tz.transition 1918, 3, :o2, 29060207, 12
-          tz.transition 1918, 10, :o1, 19375151, 8
-          tz.transition 1919, 3, :o2, 29064575, 12
-          tz.transition 1919, 10, :o1, 19378063, 8
-          tz.transition 1942, 2, :o3, 29164799, 12
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 19453831, 8
-          tz.transition 1948, 3, :o2, 29191499, 12
-          tz.transition 1949, 1, :o1, 19463343, 8
-          tz.transition 1950, 4, :o2, 29200823, 12
-          tz.transition 1950, 9, :o1, 19468391, 8
-          tz.transition 1951, 4, :o2, 29205191, 12
-          tz.transition 1951, 9, :o1, 19471359, 8
-          tz.transition 1952, 4, :o2, 29209559, 12
-          tz.transition 1952, 9, :o1, 19474271, 8
-          tz.transition 1953, 4, :o2, 29213927, 12
-          tz.transition 1953, 9, :o1, 19477183, 8
-          tz.transition 1954, 4, :o2, 29218295, 12
-          tz.transition 1954, 9, :o1, 19480095, 8
-          tz.transition 1955, 4, :o2, 29222663, 12
-          tz.transition 1955, 9, :o1, 19483007, 8
-          tz.transition 1956, 4, :o2, 29227115, 12
-          tz.transition 1956, 9, :o1, 19485975, 8
-          tz.transition 1957, 4, :o2, 29231483, 12
-          tz.transition 1957, 9, :o1, 19488887, 8
-          tz.transition 1958, 4, :o2, 29235851, 12
-          tz.transition 1958, 9, :o1, 19491799, 8
-          tz.transition 1959, 4, :o2, 29240219, 12
-          tz.transition 1959, 9, :o1, 19494711, 8
-          tz.transition 1960, 4, :o2, 29244587, 12
-          tz.transition 1960, 9, :o1, 19497623, 8
-          tz.transition 1961, 4, :o2, 29249039, 12
-          tz.transition 1961, 9, :o1, 19500535, 8
-          tz.transition 1962, 4, :o2, 29253407, 12
-          tz.transition 1962, 10, :o1, 19503727, 8
-          tz.transition 1963, 4, :o2, 29257775, 12
-          tz.transition 1963, 10, :o1, 19506639, 8
-          tz.transition 1964, 4, :o2, 29262143, 12
-          tz.transition 1964, 10, :o1, 19509551, 8
-          tz.transition 1965, 4, :o2, 29266511, 12
-          tz.transition 1965, 10, :o1, 19512519, 8
-          tz.transition 1966, 4, :o2, 29270879, 12
-          tz.transition 1966, 10, :o1, 19515431, 8
-          tz.transition 1967, 4, :o2, 29275331, 12
-          tz.transition 1967, 10, :o1, 19518343, 8
-          tz.transition 1968, 4, :o2, 29279699, 12
-          tz.transition 1968, 10, :o1, 19521255, 8
-          tz.transition 1969, 4, :o2, 29284067, 12
-          tz.transition 1969, 10, :o1, 19524167, 8
-          tz.transition 1970, 4, :o2, 9972000
-          tz.transition 1970, 10, :o1, 25693200
-          tz.transition 1971, 4, :o2, 41421600
-          tz.transition 1971, 10, :o1, 57747600
-          tz.transition 1972, 4, :o2, 73476000
-          tz.transition 1972, 10, :o1, 89197200
-          tz.transition 1973, 4, :o2, 104925600
-          tz.transition 1973, 10, :o1, 120646800
-          tz.transition 1974, 1, :o2, 126698400
-          tz.transition 1974, 10, :o1, 152096400
-          tz.transition 1975, 2, :o2, 162381600
-          tz.transition 1975, 10, :o1, 183546000
-          tz.transition 1976, 4, :o2, 199274400
-          tz.transition 1976, 10, :o1, 215600400
-          tz.transition 1977, 4, :o2, 230724000
-          tz.transition 1977, 10, :o1, 247050000
-          tz.transition 1978, 4, :o2, 262778400
-          tz.transition 1978, 10, :o1, 278499600
-          tz.transition 1979, 4, :o2, 294228000
-          tz.transition 1979, 10, :o1, 309949200
-          tz.transition 1980, 4, :o2, 325677600
-          tz.transition 1980, 10, :o1, 341398800
-          tz.transition 1981, 4, :o2, 357127200
-          tz.transition 1981, 10, :o1, 372848400
-          tz.transition 1982, 4, :o2, 388576800
-          tz.transition 1982, 10, :o1, 404902800
-          tz.transition 1983, 4, :o2, 420026400
-          tz.transition 1983, 10, :o1, 436352400
-          tz.transition 1984, 4, :o2, 452080800
-          tz.transition 1984, 10, :o1, 467802000
-          tz.transition 1985, 4, :o2, 483530400
-          tz.transition 1985, 10, :o1, 499251600
-          tz.transition 1986, 4, :o2, 514980000
-          tz.transition 1986, 10, :o1, 530701200
-          tz.transition 1987, 4, :o2, 544615200
-          tz.transition 1987, 10, :o1, 562150800
-          tz.transition 1988, 4, :o2, 576064800
-          tz.transition 1988, 10, :o1, 594205200
-          tz.transition 1989, 4, :o2, 607514400
-          tz.transition 1989, 10, :o1, 625654800
-          tz.transition 1990, 4, :o2, 638964000
-          tz.transition 1990, 10, :o1, 657104400
-          tz.transition 1991, 4, :o2, 671018400
-          tz.transition 1991, 10, :o1, 688554000
-          tz.transition 1992, 4, :o2, 702468000
-          tz.transition 1992, 10, :o1, 720003600
-          tz.transition 1993, 4, :o2, 733917600
-          tz.transition 1993, 10, :o1, 752058000
-          tz.transition 1994, 4, :o2, 765367200
-          tz.transition 1994, 10, :o1, 783507600
-          tz.transition 1995, 4, :o2, 796816800
-          tz.transition 1995, 10, :o1, 814957200
-          tz.transition 1996, 4, :o2, 828871200
-          tz.transition 1996, 10, :o1, 846406800
-          tz.transition 1997, 4, :o2, 860320800
-          tz.transition 1997, 10, :o1, 877856400
-          tz.transition 1998, 4, :o2, 891770400
-          tz.transition 1998, 10, :o1, 909306000
-          tz.transition 1999, 4, :o2, 923220000
-          tz.transition 1999, 10, :o1, 941360400
-          tz.transition 2000, 4, :o2, 954669600
-          tz.transition 2000, 10, :o1, 972810000
-          tz.transition 2001, 4, :o2, 986119200
-          tz.transition 2001, 10, :o1, 1004259600
-          tz.transition 2002, 4, :o2, 1018173600
-          tz.transition 2002, 10, :o1, 1035709200
-          tz.transition 2003, 4, :o2, 1049623200
-          tz.transition 2003, 10, :o1, 1067158800
-          tz.transition 2004, 4, :o2, 1081072800
-          tz.transition 2004, 10, :o1, 1099213200
-          tz.transition 2005, 4, :o2, 1112522400
-          tz.transition 2005, 10, :o1, 1130662800
-          tz.transition 2006, 4, :o2, 1143972000
-          tz.transition 2006, 10, :o1, 1162112400
-          tz.transition 2007, 3, :o2, 1173607200
-          tz.transition 2007, 11, :o1, 1194166800
-          tz.transition 2008, 3, :o2, 1205056800
-          tz.transition 2008, 11, :o1, 1225616400
-          tz.transition 2009, 3, :o2, 1236506400
-          tz.transition 2009, 11, :o1, 1257066000
-          tz.transition 2010, 3, :o2, 1268560800
-          tz.transition 2010, 11, :o1, 1289120400
-          tz.transition 2011, 3, :o2, 1300010400
-          tz.transition 2011, 11, :o1, 1320570000
-          tz.transition 2012, 3, :o2, 1331460000
-          tz.transition 2012, 11, :o1, 1352019600
-          tz.transition 2013, 3, :o2, 1362909600
-          tz.transition 2013, 11, :o1, 1383469200
-          tz.transition 2014, 3, :o2, 1394359200
-          tz.transition 2014, 11, :o1, 1414918800
-          tz.transition 2015, 3, :o2, 1425808800
-          tz.transition 2015, 11, :o1, 1446368400
-          tz.transition 2016, 3, :o2, 1457863200
-          tz.transition 2016, 11, :o1, 1478422800
-          tz.transition 2017, 3, :o2, 1489312800
-          tz.transition 2017, 11, :o1, 1509872400
-          tz.transition 2018, 3, :o2, 1520762400
-          tz.transition 2018, 11, :o1, 1541322000
-          tz.transition 2019, 3, :o2, 1552212000
-          tz.transition 2019, 11, :o1, 1572771600
-          tz.transition 2020, 3, :o2, 1583661600
-          tz.transition 2020, 11, :o1, 1604221200
-          tz.transition 2021, 3, :o2, 1615716000
-          tz.transition 2021, 11, :o1, 1636275600
-          tz.transition 2022, 3, :o2, 1647165600
-          tz.transition 2022, 11, :o1, 1667725200
-          tz.transition 2023, 3, :o2, 1678615200
-          tz.transition 2023, 11, :o1, 1699174800
-          tz.transition 2024, 3, :o2, 1710064800
-          tz.transition 2024, 11, :o1, 1730624400
-          tz.transition 2025, 3, :o2, 1741514400
-          tz.transition 2025, 11, :o1, 1762074000
-          tz.transition 2026, 3, :o2, 1772964000
-          tz.transition 2026, 11, :o1, 1793523600
-          tz.transition 2027, 3, :o2, 1805018400
-          tz.transition 2027, 11, :o1, 1825578000
-          tz.transition 2028, 3, :o2, 1836468000
-          tz.transition 2028, 11, :o1, 1857027600
-          tz.transition 2029, 3, :o2, 1867917600
-          tz.transition 2029, 11, :o1, 1888477200
-          tz.transition 2030, 3, :o2, 1899367200
-          tz.transition 2030, 11, :o1, 1919926800
-          tz.transition 2031, 3, :o2, 1930816800
-          tz.transition 2031, 11, :o1, 1951376400
-          tz.transition 2032, 3, :o2, 1962871200
-          tz.transition 2032, 11, :o1, 1983430800
-          tz.transition 2033, 3, :o2, 1994320800
-          tz.transition 2033, 11, :o1, 2014880400
-          tz.transition 2034, 3, :o2, 2025770400
-          tz.transition 2034, 11, :o1, 2046330000
-          tz.transition 2035, 3, :o2, 2057220000
-          tz.transition 2035, 11, :o1, 2077779600
-          tz.transition 2036, 3, :o2, 2088669600
-          tz.transition 2036, 11, :o1, 2109229200
-          tz.transition 2037, 3, :o2, 2120119200
-          tz.transition 2037, 11, :o1, 2140678800
-          tz.transition 2038, 3, :o2, 29585963, 12
-          tz.transition 2038, 11, :o1, 19725879, 8
-          tz.transition 2039, 3, :o2, 29590331, 12
-          tz.transition 2039, 11, :o1, 19728791, 8
-          tz.transition 2040, 3, :o2, 29594699, 12
-          tz.transition 2040, 11, :o1, 19731703, 8
-          tz.transition 2041, 3, :o2, 29599067, 12
-          tz.transition 2041, 11, :o1, 19734615, 8
-          tz.transition 2042, 3, :o2, 29603435, 12
-          tz.transition 2042, 11, :o1, 19737527, 8
-          tz.transition 2043, 3, :o2, 29607803, 12
-          tz.transition 2043, 11, :o1, 19740439, 8
-          tz.transition 2044, 3, :o2, 29612255, 12
-          tz.transition 2044, 11, :o1, 19743407, 8
-          tz.transition 2045, 3, :o2, 29616623, 12
-          tz.transition 2045, 11, :o1, 19746319, 8
-          tz.transition 2046, 3, :o2, 29620991, 12
-          tz.transition 2046, 11, :o1, 19749231, 8
-          tz.transition 2047, 3, :o2, 29625359, 12
-          tz.transition 2047, 11, :o1, 19752143, 8
-          tz.transition 2048, 3, :o2, 29629727, 12
-          tz.transition 2048, 11, :o1, 19755055, 8
-          tz.transition 2049, 3, :o2, 29634179, 12
-          tz.transition 2049, 11, :o1, 19758023, 8
-          tz.transition 2050, 3, :o2, 29638547, 12
-          tz.transition 2050, 11, :o1, 19760935, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Louisville.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Louisville.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Louisville.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Louisville.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Louisville
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Louisville', 'America/Kentucky/Louisville'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Maceio.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Maceio.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Maceio.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Maceio.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,59 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Maceio
-        include TimezoneDefinition
-        
-        timezone 'America/Maceio' do |tz|
-          tz.offset :o0, -8572, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 52274885743, 21600
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 12, :o2, 19506981, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-          tz.transition 1988, 10, :o2, 592974000
-          tz.transition 1989, 1, :o1, 602042400
-          tz.transition 1989, 10, :o2, 624423600
-          tz.transition 1990, 2, :o1, 634701600
-          tz.transition 1995, 10, :o2, 813726000
-          tz.transition 1996, 2, :o1, 824004000
-          tz.transition 1999, 10, :o2, 938919600
-          tz.transition 2000, 2, :o1, 951616800
-          tz.transition 2000, 10, :o2, 970974000
-          tz.transition 2000, 10, :o1, 972180000
-          tz.transition 2001, 10, :o2, 1003028400
-          tz.transition 2002, 2, :o1, 1013911200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Managua.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Managua.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Managua.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Managua.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,36 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Managua
-        include TimezoneDefinition
-        
-        timezone 'America/Managua' do |tz|
-          tz.offset :o0, -20708, 0, :LMT
-          tz.offset :o1, -20712, 0, :MMT
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -18000, 0, :EST
-          tz.offset :o4, -21600, 3600, :CDT
-          
-          tz.transition 1890, 1, :o1, 52085564777, 21600
-          tz.transition 1934, 6, :o2, 8739402263, 3600
-          tz.transition 1973, 5, :o3, 105084000
-          tz.transition 1975, 2, :o2, 161758800
-          tz.transition 1979, 3, :o4, 290584800
-          tz.transition 1979, 6, :o2, 299134800
-          tz.transition 1980, 3, :o4, 322034400
-          tz.transition 1980, 6, :o2, 330584400
-          tz.transition 1992, 1, :o3, 694260000
-          tz.transition 1992, 9, :o2, 717310800
-          tz.transition 1993, 1, :o3, 725868000
-          tz.transition 1997, 1, :o2, 852094800
-          tz.transition 2005, 4, :o4, 1113112800
-          tz.transition 2005, 10, :o2, 1128229200
-          tz.transition 2006, 4, :o4, 1146384000
-          tz.transition 2006, 10, :o2, 1159682400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Manaus.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Manaus.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Manaus.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Manaus.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,49 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Manaus
-        include TimezoneDefinition
-        
-        timezone 'America/Manaus' do |tz|
-          tz.offset :o0, -14404, 0, :LMT
-          tz.offset :o1, -14400, 0, :AMT
-          tz.offset :o2, -14400, 3600, :AMST
-          
-          tz.transition 1914, 1, :o1, 52274887201, 21600
-          tz.transition 1931, 10, :o2, 19412945, 8
-          tz.transition 1932, 4, :o1, 19414389, 8
-          tz.transition 1932, 10, :o2, 7280951, 3
-          tz.transition 1933, 4, :o1, 19417309, 8
-          tz.transition 1949, 12, :o2, 7299755, 3
-          tz.transition 1950, 4, :o1, 7300163, 3
-          tz.transition 1950, 12, :o2, 7300850, 3
-          tz.transition 1951, 4, :o1, 19469901, 8
-          tz.transition 1951, 12, :o2, 7301945, 3
-          tz.transition 1952, 4, :o1, 19472829, 8
-          tz.transition 1952, 12, :o2, 7303043, 3
-          tz.transition 1953, 3, :o1, 19475501, 8
-          tz.transition 1963, 12, :o2, 7315118, 3
-          tz.transition 1964, 3, :o1, 19507645, 8
-          tz.transition 1965, 1, :o2, 7316375, 3
-          tz.transition 1965, 3, :o1, 19510805, 8
-          tz.transition 1965, 12, :o2, 7317287, 3
-          tz.transition 1966, 3, :o1, 19513485, 8
-          tz.transition 1966, 11, :o2, 7318292, 3
-          tz.transition 1967, 3, :o1, 19516405, 8
-          tz.transition 1967, 11, :o2, 7319387, 3
-          tz.transition 1968, 3, :o1, 19519333, 8
-          tz.transition 1985, 11, :o2, 499752000
-          tz.transition 1986, 3, :o1, 511239600
-          tz.transition 1986, 10, :o2, 530596800
-          tz.transition 1987, 2, :o1, 540270000
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 2, :o1, 571201200
-          tz.transition 1993, 10, :o2, 750830400
-          tz.transition 1994, 2, :o1, 761713200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Martinique.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Martinique.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Martinique.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Martinique.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Martinique
-        include TimezoneDefinition
-        
-        timezone 'America/Martinique' do |tz|
-          tz.offset :o0, -14660, 0, :LMT
-          tz.offset :o1, -14660, 0, :FFMT
-          tz.offset :o2, -14400, 0, :AST
-          tz.offset :o3, -14400, 3600, :ADT
-          
-          tz.transition 1890, 1, :o1, 10417112653, 4320
-          tz.transition 1911, 5, :o2, 10450761133, 4320
-          tz.transition 1980, 4, :o3, 323841600
-          tz.transition 1980, 9, :o2, 338958000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mazatlan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mazatlan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mazatlan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mazatlan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,139 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Mazatlan
-        include TimezoneDefinition
-        
-        timezone 'America/Mazatlan' do |tz|
-          tz.offset :o0, -25540, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -28800, 0, :PST
-          tz.offset :o4, -25200, 3600, :MDT
-          
-          tz.transition 1922, 1, :o1, 58153339, 24
-          tz.transition 1927, 6, :o2, 9700171, 4
-          tz.transition 1930, 11, :o1, 9705183, 4
-          tz.transition 1931, 5, :o2, 9705855, 4
-          tz.transition 1931, 10, :o1, 9706463, 4
-          tz.transition 1932, 4, :o2, 58243171, 24
-          tz.transition 1942, 4, :o1, 9721895, 4
-          tz.transition 1949, 1, :o3, 58390339, 24
-          tz.transition 1970, 1, :o1, 28800
-          tz.transition 1996, 4, :o4, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o4, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o4, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o4, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o4, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 5, :o4, 989139600
-          tz.transition 2001, 9, :o1, 1001836800
-          tz.transition 2002, 4, :o4, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o4, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o4, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o4, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o4, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 4, :o4, 1175418000
-          tz.transition 2007, 10, :o1, 1193558400
-          tz.transition 2008, 4, :o4, 1207472400
-          tz.transition 2008, 10, :o1, 1225008000
-          tz.transition 2009, 4, :o4, 1238922000
-          tz.transition 2009, 10, :o1, 1256457600
-          tz.transition 2010, 4, :o4, 1270371600
-          tz.transition 2010, 10, :o1, 1288512000
-          tz.transition 2011, 4, :o4, 1301821200
-          tz.transition 2011, 10, :o1, 1319961600
-          tz.transition 2012, 4, :o4, 1333270800
-          tz.transition 2012, 10, :o1, 1351411200
-          tz.transition 2013, 4, :o4, 1365325200
-          tz.transition 2013, 10, :o1, 1382860800
-          tz.transition 2014, 4, :o4, 1396774800
-          tz.transition 2014, 10, :o1, 1414310400
-          tz.transition 2015, 4, :o4, 1428224400
-          tz.transition 2015, 10, :o1, 1445760000
-          tz.transition 2016, 4, :o4, 1459674000
-          tz.transition 2016, 10, :o1, 1477814400
-          tz.transition 2017, 4, :o4, 1491123600
-          tz.transition 2017, 10, :o1, 1509264000
-          tz.transition 2018, 4, :o4, 1522573200
-          tz.transition 2018, 10, :o1, 1540713600
-          tz.transition 2019, 4, :o4, 1554627600
-          tz.transition 2019, 10, :o1, 1572163200
-          tz.transition 2020, 4, :o4, 1586077200
-          tz.transition 2020, 10, :o1, 1603612800
-          tz.transition 2021, 4, :o4, 1617526800
-          tz.transition 2021, 10, :o1, 1635667200
-          tz.transition 2022, 4, :o4, 1648976400
-          tz.transition 2022, 10, :o1, 1667116800
-          tz.transition 2023, 4, :o4, 1680426000
-          tz.transition 2023, 10, :o1, 1698566400
-          tz.transition 2024, 4, :o4, 1712480400
-          tz.transition 2024, 10, :o1, 1730016000
-          tz.transition 2025, 4, :o4, 1743930000
-          tz.transition 2025, 10, :o1, 1761465600
-          tz.transition 2026, 4, :o4, 1775379600
-          tz.transition 2026, 10, :o1, 1792915200
-          tz.transition 2027, 4, :o4, 1806829200
-          tz.transition 2027, 10, :o1, 1824969600
-          tz.transition 2028, 4, :o4, 1838278800
-          tz.transition 2028, 10, :o1, 1856419200
-          tz.transition 2029, 4, :o4, 1869728400
-          tz.transition 2029, 10, :o1, 1887868800
-          tz.transition 2030, 4, :o4, 1901782800
-          tz.transition 2030, 10, :o1, 1919318400
-          tz.transition 2031, 4, :o4, 1933232400
-          tz.transition 2031, 10, :o1, 1950768000
-          tz.transition 2032, 4, :o4, 1964682000
-          tz.transition 2032, 10, :o1, 1982822400
-          tz.transition 2033, 4, :o4, 1996131600
-          tz.transition 2033, 10, :o1, 2014272000
-          tz.transition 2034, 4, :o4, 2027581200
-          tz.transition 2034, 10, :o1, 2045721600
-          tz.transition 2035, 4, :o4, 2059030800
-          tz.transition 2035, 10, :o1, 2077171200
-          tz.transition 2036, 4, :o4, 2091085200
-          tz.transition 2036, 10, :o1, 2108620800
-          tz.transition 2037, 4, :o4, 2122534800
-          tz.transition 2037, 10, :o1, 2140070400
-          tz.transition 2038, 4, :o4, 19724143, 8
-          tz.transition 2038, 10, :o1, 14794367, 6
-          tz.transition 2039, 4, :o4, 19727055, 8
-          tz.transition 2039, 10, :o1, 14796551, 6
-          tz.transition 2040, 4, :o4, 19729967, 8
-          tz.transition 2040, 10, :o1, 14798735, 6
-          tz.transition 2041, 4, :o4, 19732935, 8
-          tz.transition 2041, 10, :o1, 14800919, 6
-          tz.transition 2042, 4, :o4, 19735847, 8
-          tz.transition 2042, 10, :o1, 14803103, 6
-          tz.transition 2043, 4, :o4, 19738759, 8
-          tz.transition 2043, 10, :o1, 14805287, 6
-          tz.transition 2044, 4, :o4, 19741671, 8
-          tz.transition 2044, 10, :o1, 14807513, 6
-          tz.transition 2045, 4, :o4, 19744583, 8
-          tz.transition 2045, 10, :o1, 14809697, 6
-          tz.transition 2046, 4, :o4, 19747495, 8
-          tz.transition 2046, 10, :o1, 14811881, 6
-          tz.transition 2047, 4, :o4, 19750463, 8
-          tz.transition 2047, 10, :o1, 14814065, 6
-          tz.transition 2048, 4, :o4, 19753375, 8
-          tz.transition 2048, 10, :o1, 14816249, 6
-          tz.transition 2049, 4, :o4, 19756287, 8
-          tz.transition 2049, 10, :o1, 14818475, 6
-          tz.transition 2050, 4, :o4, 19759199, 8
-          tz.transition 2050, 10, :o1, 14820659, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mendoza.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mendoza.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mendoza.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mendoza.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Mendoza
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Mendoza', 'America/Argentina/Mendoza'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Menominee.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Menominee.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Menominee.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Menominee.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,190 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Menominee
-        include TimezoneDefinition
-        
-        timezone 'America/Menominee' do |tz|
-          tz.offset :o0, -21027, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -21600, 3600, :CWT
-          tz.offset :o4, -21600, 3600, :CPT
-          tz.offset :o5, -18000, 0, :EST
-          
-          tz.transition 1885, 9, :o1, 69402333409, 28800
-          tz.transition 1918, 3, :o2, 14530103, 6
-          tz.transition 1918, 10, :o1, 58125451, 24
-          tz.transition 1919, 3, :o2, 14532287, 6
-          tz.transition 1919, 10, :o1, 58134187, 24
-          tz.transition 1942, 2, :o3, 14582399, 6
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361491, 24
-          tz.transition 1946, 4, :o2, 14591633, 6
-          tz.transition 1946, 9, :o1, 58370227, 24
-          tz.transition 1966, 4, :o2, 14635439, 6
-          tz.transition 1966, 10, :o1, 58546291, 24
-          tz.transition 1969, 4, :o5, 14642033, 6
-          tz.transition 1973, 4, :o2, 104914800
-          tz.transition 1973, 10, :o1, 120639600
-          tz.transition 1974, 1, :o2, 126691200
-          tz.transition 1974, 10, :o1, 152089200
-          tz.transition 1975, 2, :o2, 162374400
-          tz.transition 1975, 10, :o1, 183538800
-          tz.transition 1976, 4, :o2, 199267200
-          tz.transition 1976, 10, :o1, 215593200
-          tz.transition 1977, 4, :o2, 230716800
-          tz.transition 1977, 10, :o1, 247042800
-          tz.transition 1978, 4, :o2, 262771200
-          tz.transition 1978, 10, :o1, 278492400
-          tz.transition 1979, 4, :o2, 294220800
-          tz.transition 1979, 10, :o1, 309942000
-          tz.transition 1980, 4, :o2, 325670400
-          tz.transition 1980, 10, :o1, 341391600
-          tz.transition 1981, 4, :o2, 357120000
-          tz.transition 1981, 10, :o1, 372841200
-          tz.transition 1982, 4, :o2, 388569600
-          tz.transition 1982, 10, :o1, 404895600
-          tz.transition 1983, 4, :o2, 420019200
-          tz.transition 1983, 10, :o1, 436345200
-          tz.transition 1984, 4, :o2, 452073600
-          tz.transition 1984, 10, :o1, 467794800
-          tz.transition 1985, 4, :o2, 483523200
-          tz.transition 1985, 10, :o1, 499244400
-          tz.transition 1986, 4, :o2, 514972800
-          tz.transition 1986, 10, :o1, 530694000
-          tz.transition 1987, 4, :o2, 544608000
-          tz.transition 1987, 10, :o1, 562143600
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594198000
-          tz.transition 1989, 4, :o2, 607507200
-          tz.transition 1989, 10, :o1, 625647600
-          tz.transition 1990, 4, :o2, 638956800
-          tz.transition 1990, 10, :o1, 657097200
-          tz.transition 1991, 4, :o2, 671011200
-          tz.transition 1991, 10, :o1, 688546800
-          tz.transition 1992, 4, :o2, 702460800
-          tz.transition 1992, 10, :o1, 719996400
-          tz.transition 1993, 4, :o2, 733910400
-          tz.transition 1993, 10, :o1, 752050800
-          tz.transition 1994, 4, :o2, 765360000
-          tz.transition 1994, 10, :o1, 783500400
-          tz.transition 1995, 4, :o2, 796809600
-          tz.transition 1995, 10, :o1, 814950000
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 4, :o2, 986112000
-          tz.transition 2001, 10, :o1, 1004252400
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 3, :o2, 1173600000
-          tz.transition 2007, 11, :o1, 1194159600
-          tz.transition 2008, 3, :o2, 1205049600
-          tz.transition 2008, 11, :o1, 1225609200
-          tz.transition 2009, 3, :o2, 1236499200
-          tz.transition 2009, 11, :o1, 1257058800
-          tz.transition 2010, 3, :o2, 1268553600
-          tz.transition 2010, 11, :o1, 1289113200
-          tz.transition 2011, 3, :o2, 1300003200
-          tz.transition 2011, 11, :o1, 1320562800
-          tz.transition 2012, 3, :o2, 1331452800
-          tz.transition 2012, 11, :o1, 1352012400
-          tz.transition 2013, 3, :o2, 1362902400
-          tz.transition 2013, 11, :o1, 1383462000
-          tz.transition 2014, 3, :o2, 1394352000
-          tz.transition 2014, 11, :o1, 1414911600
-          tz.transition 2015, 3, :o2, 1425801600
-          tz.transition 2015, 11, :o1, 1446361200
-          tz.transition 2016, 3, :o2, 1457856000
-          tz.transition 2016, 11, :o1, 1478415600
-          tz.transition 2017, 3, :o2, 1489305600
-          tz.transition 2017, 11, :o1, 1509865200
-          tz.transition 2018, 3, :o2, 1520755200
-          tz.transition 2018, 11, :o1, 1541314800
-          tz.transition 2019, 3, :o2, 1552204800
-          tz.transition 2019, 11, :o1, 1572764400
-          tz.transition 2020, 3, :o2, 1583654400
-          tz.transition 2020, 11, :o1, 1604214000
-          tz.transition 2021, 3, :o2, 1615708800
-          tz.transition 2021, 11, :o1, 1636268400
-          tz.transition 2022, 3, :o2, 1647158400
-          tz.transition 2022, 11, :o1, 1667718000
-          tz.transition 2023, 3, :o2, 1678608000
-          tz.transition 2023, 11, :o1, 1699167600
-          tz.transition 2024, 3, :o2, 1710057600
-          tz.transition 2024, 11, :o1, 1730617200
-          tz.transition 2025, 3, :o2, 1741507200
-          tz.transition 2025, 11, :o1, 1762066800
-          tz.transition 2026, 3, :o2, 1772956800
-          tz.transition 2026, 11, :o1, 1793516400
-          tz.transition 2027, 3, :o2, 1805011200
-          tz.transition 2027, 11, :o1, 1825570800
-          tz.transition 2028, 3, :o2, 1836460800
-          tz.transition 2028, 11, :o1, 1857020400
-          tz.transition 2029, 3, :o2, 1867910400
-          tz.transition 2029, 11, :o1, 1888470000
-          tz.transition 2030, 3, :o2, 1899360000
-          tz.transition 2030, 11, :o1, 1919919600
-          tz.transition 2031, 3, :o2, 1930809600
-          tz.transition 2031, 11, :o1, 1951369200
-          tz.transition 2032, 3, :o2, 1962864000
-          tz.transition 2032, 11, :o1, 1983423600
-          tz.transition 2033, 3, :o2, 1994313600
-          tz.transition 2033, 11, :o1, 2014873200
-          tz.transition 2034, 3, :o2, 2025763200
-          tz.transition 2034, 11, :o1, 2046322800
-          tz.transition 2035, 3, :o2, 2057212800
-          tz.transition 2035, 11, :o1, 2077772400
-          tz.transition 2036, 3, :o2, 2088662400
-          tz.transition 2036, 11, :o1, 2109222000
-          tz.transition 2037, 3, :o2, 2120112000
-          tz.transition 2037, 11, :o1, 2140671600
-          tz.transition 2038, 3, :o2, 14792981, 6
-          tz.transition 2038, 11, :o1, 59177635, 24
-          tz.transition 2039, 3, :o2, 14795165, 6
-          tz.transition 2039, 11, :o1, 59186371, 24
-          tz.transition 2040, 3, :o2, 14797349, 6
-          tz.transition 2040, 11, :o1, 59195107, 24
-          tz.transition 2041, 3, :o2, 14799533, 6
-          tz.transition 2041, 11, :o1, 59203843, 24
-          tz.transition 2042, 3, :o2, 14801717, 6
-          tz.transition 2042, 11, :o1, 59212579, 24
-          tz.transition 2043, 3, :o2, 14803901, 6
-          tz.transition 2043, 11, :o1, 59221315, 24
-          tz.transition 2044, 3, :o2, 14806127, 6
-          tz.transition 2044, 11, :o1, 59230219, 24
-          tz.transition 2045, 3, :o2, 14808311, 6
-          tz.transition 2045, 11, :o1, 59238955, 24
-          tz.transition 2046, 3, :o2, 14810495, 6
-          tz.transition 2046, 11, :o1, 59247691, 24
-          tz.transition 2047, 3, :o2, 14812679, 6
-          tz.transition 2047, 11, :o1, 59256427, 24
-          tz.transition 2048, 3, :o2, 14814863, 6
-          tz.transition 2048, 11, :o1, 59265163, 24
-          tz.transition 2049, 3, :o2, 14817089, 6
-          tz.transition 2049, 11, :o1, 59274067, 24
-          tz.transition 2050, 3, :o2, 14819273, 6
-          tz.transition 2050, 11, :o1, 59282803, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Merida.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Merida.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Merida.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Merida.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,132 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Merida
-        include TimezoneDefinition
-        
-        timezone 'America/Merida' do |tz|
-          tz.offset :o0, -21508, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -21600, 3600, :CDT
-          
-          tz.transition 1922, 1, :o1, 9692223, 4
-          tz.transition 1981, 12, :o2, 377935200
-          tz.transition 1982, 12, :o1, 407653200
-          tz.transition 1996, 4, :o3, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o3, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o3, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o3, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o3, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 5, :o3, 989136000
-          tz.transition 2001, 9, :o1, 1001833200
-          tz.transition 2002, 4, :o3, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o3, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o3, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o3, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o3, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 4, :o3, 1175414400
-          tz.transition 2007, 10, :o1, 1193554800
-          tz.transition 2008, 4, :o3, 1207468800
-          tz.transition 2008, 10, :o1, 1225004400
-          tz.transition 2009, 4, :o3, 1238918400
-          tz.transition 2009, 10, :o1, 1256454000
-          tz.transition 2010, 4, :o3, 1270368000
-          tz.transition 2010, 10, :o1, 1288508400
-          tz.transition 2011, 4, :o3, 1301817600
-          tz.transition 2011, 10, :o1, 1319958000
-          tz.transition 2012, 4, :o3, 1333267200
-          tz.transition 2012, 10, :o1, 1351407600
-          tz.transition 2013, 4, :o3, 1365321600
-          tz.transition 2013, 10, :o1, 1382857200
-          tz.transition 2014, 4, :o3, 1396771200
-          tz.transition 2014, 10, :o1, 1414306800
-          tz.transition 2015, 4, :o3, 1428220800
-          tz.transition 2015, 10, :o1, 1445756400
-          tz.transition 2016, 4, :o3, 1459670400
-          tz.transition 2016, 10, :o1, 1477810800
-          tz.transition 2017, 4, :o3, 1491120000
-          tz.transition 2017, 10, :o1, 1509260400
-          tz.transition 2018, 4, :o3, 1522569600
-          tz.transition 2018, 10, :o1, 1540710000
-          tz.transition 2019, 4, :o3, 1554624000
-          tz.transition 2019, 10, :o1, 1572159600
-          tz.transition 2020, 4, :o3, 1586073600
-          tz.transition 2020, 10, :o1, 1603609200
-          tz.transition 2021, 4, :o3, 1617523200
-          tz.transition 2021, 10, :o1, 1635663600
-          tz.transition 2022, 4, :o3, 1648972800
-          tz.transition 2022, 10, :o1, 1667113200
-          tz.transition 2023, 4, :o3, 1680422400
-          tz.transition 2023, 10, :o1, 1698562800
-          tz.transition 2024, 4, :o3, 1712476800
-          tz.transition 2024, 10, :o1, 1730012400
-          tz.transition 2025, 4, :o3, 1743926400
-          tz.transition 2025, 10, :o1, 1761462000
-          tz.transition 2026, 4, :o3, 1775376000
-          tz.transition 2026, 10, :o1, 1792911600
-          tz.transition 2027, 4, :o3, 1806825600
-          tz.transition 2027, 10, :o1, 1824966000
-          tz.transition 2028, 4, :o3, 1838275200
-          tz.transition 2028, 10, :o1, 1856415600
-          tz.transition 2029, 4, :o3, 1869724800
-          tz.transition 2029, 10, :o1, 1887865200
-          tz.transition 2030, 4, :o3, 1901779200
-          tz.transition 2030, 10, :o1, 1919314800
-          tz.transition 2031, 4, :o3, 1933228800
-          tz.transition 2031, 10, :o1, 1950764400
-          tz.transition 2032, 4, :o3, 1964678400
-          tz.transition 2032, 10, :o1, 1982818800
-          tz.transition 2033, 4, :o3, 1996128000
-          tz.transition 2033, 10, :o1, 2014268400
-          tz.transition 2034, 4, :o3, 2027577600
-          tz.transition 2034, 10, :o1, 2045718000
-          tz.transition 2035, 4, :o3, 2059027200
-          tz.transition 2035, 10, :o1, 2077167600
-          tz.transition 2036, 4, :o3, 2091081600
-          tz.transition 2036, 10, :o1, 2108617200
-          tz.transition 2037, 4, :o3, 2122531200
-          tz.transition 2037, 10, :o1, 2140066800
-          tz.transition 2038, 4, :o3, 14793107, 6
-          tz.transition 2038, 10, :o1, 59177467, 24
-          tz.transition 2039, 4, :o3, 14795291, 6
-          tz.transition 2039, 10, :o1, 59186203, 24
-          tz.transition 2040, 4, :o3, 14797475, 6
-          tz.transition 2040, 10, :o1, 59194939, 24
-          tz.transition 2041, 4, :o3, 14799701, 6
-          tz.transition 2041, 10, :o1, 59203675, 24
-          tz.transition 2042, 4, :o3, 14801885, 6
-          tz.transition 2042, 10, :o1, 59212411, 24
-          tz.transition 2043, 4, :o3, 14804069, 6
-          tz.transition 2043, 10, :o1, 59221147, 24
-          tz.transition 2044, 4, :o3, 14806253, 6
-          tz.transition 2044, 10, :o1, 59230051, 24
-          tz.transition 2045, 4, :o3, 14808437, 6
-          tz.transition 2045, 10, :o1, 59238787, 24
-          tz.transition 2046, 4, :o3, 14810621, 6
-          tz.transition 2046, 10, :o1, 59247523, 24
-          tz.transition 2047, 4, :o3, 14812847, 6
-          tz.transition 2047, 10, :o1, 59256259, 24
-          tz.transition 2048, 4, :o3, 14815031, 6
-          tz.transition 2048, 10, :o1, 59264995, 24
-          tz.transition 2049, 4, :o3, 14817215, 6
-          tz.transition 2049, 10, :o1, 59273899, 24
-          tz.transition 2050, 4, :o3, 14819399, 6
-          tz.transition 2050, 10, :o1, 59282635, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mexico_City.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mexico_City.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mexico_City.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Mexico_City.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,144 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Mexico_City
-        include TimezoneDefinition
-        
-        timezone 'America/Mexico_City' do |tz|
-          tz.offset :o0, -23796, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -21600, 3600, :CDT
-          tz.offset :o4, -21600, 3600, :CWT
-          
-          tz.transition 1922, 1, :o1, 58153339, 24
-          tz.transition 1927, 6, :o2, 9700171, 4
-          tz.transition 1930, 11, :o1, 9705183, 4
-          tz.transition 1931, 5, :o2, 9705855, 4
-          tz.transition 1931, 10, :o1, 9706463, 4
-          tz.transition 1932, 4, :o2, 58243171, 24
-          tz.transition 1939, 2, :o3, 9717199, 4
-          tz.transition 1939, 6, :o2, 58306553, 24
-          tz.transition 1940, 12, :o3, 9719891, 4
-          tz.transition 1941, 4, :o2, 58322057, 24
-          tz.transition 1943, 12, :o4, 9724299, 4
-          tz.transition 1944, 5, :o2, 58349081, 24
-          tz.transition 1950, 2, :o3, 9733299, 4
-          tz.transition 1950, 7, :o2, 58403825, 24
-          tz.transition 1996, 4, :o3, 828864000
-          tz.transition 1996, 10, :o2, 846399600
-          tz.transition 1997, 4, :o3, 860313600
-          tz.transition 1997, 10, :o2, 877849200
-          tz.transition 1998, 4, :o3, 891763200
-          tz.transition 1998, 10, :o2, 909298800
-          tz.transition 1999, 4, :o3, 923212800
-          tz.transition 1999, 10, :o2, 941353200
-          tz.transition 2000, 4, :o3, 954662400
-          tz.transition 2000, 10, :o2, 972802800
-          tz.transition 2001, 5, :o3, 989136000
-          tz.transition 2001, 9, :o2, 1001833200
-          tz.transition 2002, 4, :o3, 1018166400
-          tz.transition 2002, 10, :o2, 1035702000
-          tz.transition 2003, 4, :o3, 1049616000
-          tz.transition 2003, 10, :o2, 1067151600
-          tz.transition 2004, 4, :o3, 1081065600
-          tz.transition 2004, 10, :o2, 1099206000
-          tz.transition 2005, 4, :o3, 1112515200
-          tz.transition 2005, 10, :o2, 1130655600
-          tz.transition 2006, 4, :o3, 1143964800
-          tz.transition 2006, 10, :o2, 1162105200
-          tz.transition 2007, 4, :o3, 1175414400
-          tz.transition 2007, 10, :o2, 1193554800
-          tz.transition 2008, 4, :o3, 1207468800
-          tz.transition 2008, 10, :o2, 1225004400
-          tz.transition 2009, 4, :o3, 1238918400
-          tz.transition 2009, 10, :o2, 1256454000
-          tz.transition 2010, 4, :o3, 1270368000
-          tz.transition 2010, 10, :o2, 1288508400
-          tz.transition 2011, 4, :o3, 1301817600
-          tz.transition 2011, 10, :o2, 1319958000
-          tz.transition 2012, 4, :o3, 1333267200
-          tz.transition 2012, 10, :o2, 1351407600
-          tz.transition 2013, 4, :o3, 1365321600
-          tz.transition 2013, 10, :o2, 1382857200
-          tz.transition 2014, 4, :o3, 1396771200
-          tz.transition 2014, 10, :o2, 1414306800
-          tz.transition 2015, 4, :o3, 1428220800
-          tz.transition 2015, 10, :o2, 1445756400
-          tz.transition 2016, 4, :o3, 1459670400
-          tz.transition 2016, 10, :o2, 1477810800
-          tz.transition 2017, 4, :o3, 1491120000
-          tz.transition 2017, 10, :o2, 1509260400
-          tz.transition 2018, 4, :o3, 1522569600
-          tz.transition 2018, 10, :o2, 1540710000
-          tz.transition 2019, 4, :o3, 1554624000
-          tz.transition 2019, 10, :o2, 1572159600
-          tz.transition 2020, 4, :o3, 1586073600
-          tz.transition 2020, 10, :o2, 1603609200
-          tz.transition 2021, 4, :o3, 1617523200
-          tz.transition 2021, 10, :o2, 1635663600
-          tz.transition 2022, 4, :o3, 1648972800
-          tz.transition 2022, 10, :o2, 1667113200
-          tz.transition 2023, 4, :o3, 1680422400
-          tz.transition 2023, 10, :o2, 1698562800
-          tz.transition 2024, 4, :o3, 1712476800
-          tz.transition 2024, 10, :o2, 1730012400
-          tz.transition 2025, 4, :o3, 1743926400
-          tz.transition 2025, 10, :o2, 1761462000
-          tz.transition 2026, 4, :o3, 1775376000
-          tz.transition 2026, 10, :o2, 1792911600
-          tz.transition 2027, 4, :o3, 1806825600
-          tz.transition 2027, 10, :o2, 1824966000
-          tz.transition 2028, 4, :o3, 1838275200
-          tz.transition 2028, 10, :o2, 1856415600
-          tz.transition 2029, 4, :o3, 1869724800
-          tz.transition 2029, 10, :o2, 1887865200
-          tz.transition 2030, 4, :o3, 1901779200
-          tz.transition 2030, 10, :o2, 1919314800
-          tz.transition 2031, 4, :o3, 1933228800
-          tz.transition 2031, 10, :o2, 1950764400
-          tz.transition 2032, 4, :o3, 1964678400
-          tz.transition 2032, 10, :o2, 1982818800
-          tz.transition 2033, 4, :o3, 1996128000
-          tz.transition 2033, 10, :o2, 2014268400
-          tz.transition 2034, 4, :o3, 2027577600
-          tz.transition 2034, 10, :o2, 2045718000
-          tz.transition 2035, 4, :o3, 2059027200
-          tz.transition 2035, 10, :o2, 2077167600
-          tz.transition 2036, 4, :o3, 2091081600
-          tz.transition 2036, 10, :o2, 2108617200
-          tz.transition 2037, 4, :o3, 2122531200
-          tz.transition 2037, 10, :o2, 2140066800
-          tz.transition 2038, 4, :o3, 14793107, 6
-          tz.transition 2038, 10, :o2, 59177467, 24
-          tz.transition 2039, 4, :o3, 14795291, 6
-          tz.transition 2039, 10, :o2, 59186203, 24
-          tz.transition 2040, 4, :o3, 14797475, 6
-          tz.transition 2040, 10, :o2, 59194939, 24
-          tz.transition 2041, 4, :o3, 14799701, 6
-          tz.transition 2041, 10, :o2, 59203675, 24
-          tz.transition 2042, 4, :o3, 14801885, 6
-          tz.transition 2042, 10, :o2, 59212411, 24
-          tz.transition 2043, 4, :o3, 14804069, 6
-          tz.transition 2043, 10, :o2, 59221147, 24
-          tz.transition 2044, 4, :o3, 14806253, 6
-          tz.transition 2044, 10, :o2, 59230051, 24
-          tz.transition 2045, 4, :o3, 14808437, 6
-          tz.transition 2045, 10, :o2, 59238787, 24
-          tz.transition 2046, 4, :o3, 14810621, 6
-          tz.transition 2046, 10, :o2, 59247523, 24
-          tz.transition 2047, 4, :o3, 14812847, 6
-          tz.transition 2047, 10, :o2, 59256259, 24
-          tz.transition 2048, 4, :o3, 14815031, 6
-          tz.transition 2048, 10, :o2, 59264995, 24
-          tz.transition 2049, 4, :o3, 14817215, 6
-          tz.transition 2049, 10, :o2, 59273899, 24
-          tz.transition 2050, 4, :o3, 14819399, 6
-          tz.transition 2050, 10, :o2, 59282635, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Miquelon.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Miquelon.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Miquelon.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Miquelon.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,149 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Miquelon
-        include TimezoneDefinition
-        
-        timezone 'America/Miquelon' do |tz|
-          tz.offset :o0, -13480, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -10800, 0, :PMST
-          tz.offset :o3, -10800, 3600, :PMDT
-          
-          tz.transition 1911, 5, :o1, 5225410777, 2160
-          tz.transition 1980, 5, :o2, 326001600
-          tz.transition 1987, 4, :o3, 544597200
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 4, :o3, 576046800
-          tz.transition 1988, 10, :o2, 594187200
-          tz.transition 1989, 4, :o3, 607496400
-          tz.transition 1989, 10, :o2, 625636800
-          tz.transition 1990, 4, :o3, 638946000
-          tz.transition 1990, 10, :o2, 657086400
-          tz.transition 1991, 4, :o3, 671000400
-          tz.transition 1991, 10, :o2, 688536000
-          tz.transition 1992, 4, :o3, 702450000
-          tz.transition 1992, 10, :o2, 719985600
-          tz.transition 1993, 4, :o3, 733899600
-          tz.transition 1993, 10, :o2, 752040000
-          tz.transition 1994, 4, :o3, 765349200
-          tz.transition 1994, 10, :o2, 783489600
-          tz.transition 1995, 4, :o3, 796798800
-          tz.transition 1995, 10, :o2, 814939200
-          tz.transition 1996, 4, :o3, 828853200
-          tz.transition 1996, 10, :o2, 846388800
-          tz.transition 1997, 4, :o3, 860302800
-          tz.transition 1997, 10, :o2, 877838400
-          tz.transition 1998, 4, :o3, 891752400
-          tz.transition 1998, 10, :o2, 909288000
-          tz.transition 1999, 4, :o3, 923202000
-          tz.transition 1999, 10, :o2, 941342400
-          tz.transition 2000, 4, :o3, 954651600
-          tz.transition 2000, 10, :o2, 972792000
-          tz.transition 2001, 4, :o3, 986101200
-          tz.transition 2001, 10, :o2, 1004241600
-          tz.transition 2002, 4, :o3, 1018155600
-          tz.transition 2002, 10, :o2, 1035691200
-          tz.transition 2003, 4, :o3, 1049605200
-          tz.transition 2003, 10, :o2, 1067140800
-          tz.transition 2004, 4, :o3, 1081054800
-          tz.transition 2004, 10, :o2, 1099195200
-          tz.transition 2005, 4, :o3, 1112504400
-          tz.transition 2005, 10, :o2, 1130644800
-          tz.transition 2006, 4, :o3, 1143954000
-          tz.transition 2006, 10, :o2, 1162094400
-          tz.transition 2007, 3, :o3, 1173589200
-          tz.transition 2007, 11, :o2, 1194148800
-          tz.transition 2008, 3, :o3, 1205038800
-          tz.transition 2008, 11, :o2, 1225598400
-          tz.transition 2009, 3, :o3, 1236488400
-          tz.transition 2009, 11, :o2, 1257048000
-          tz.transition 2010, 3, :o3, 1268542800
-          tz.transition 2010, 11, :o2, 1289102400
-          tz.transition 2011, 3, :o3, 1299992400
-          tz.transition 2011, 11, :o2, 1320552000
-          tz.transition 2012, 3, :o3, 1331442000
-          tz.transition 2012, 11, :o2, 1352001600
-          tz.transition 2013, 3, :o3, 1362891600
-          tz.transition 2013, 11, :o2, 1383451200
-          tz.transition 2014, 3, :o3, 1394341200
-          tz.transition 2014, 11, :o2, 1414900800
-          tz.transition 2015, 3, :o3, 1425790800
-          tz.transition 2015, 11, :o2, 1446350400
-          tz.transition 2016, 3, :o3, 1457845200
-          tz.transition 2016, 11, :o2, 1478404800
-          tz.transition 2017, 3, :o3, 1489294800
-          tz.transition 2017, 11, :o2, 1509854400
-          tz.transition 2018, 3, :o3, 1520744400
-          tz.transition 2018, 11, :o2, 1541304000
-          tz.transition 2019, 3, :o3, 1552194000
-          tz.transition 2019, 11, :o2, 1572753600
-          tz.transition 2020, 3, :o3, 1583643600
-          tz.transition 2020, 11, :o2, 1604203200
-          tz.transition 2021, 3, :o3, 1615698000
-          tz.transition 2021, 11, :o2, 1636257600
-          tz.transition 2022, 3, :o3, 1647147600
-          tz.transition 2022, 11, :o2, 1667707200
-          tz.transition 2023, 3, :o3, 1678597200
-          tz.transition 2023, 11, :o2, 1699156800
-          tz.transition 2024, 3, :o3, 1710046800
-          tz.transition 2024, 11, :o2, 1730606400
-          tz.transition 2025, 3, :o3, 1741496400
-          tz.transition 2025, 11, :o2, 1762056000
-          tz.transition 2026, 3, :o3, 1772946000
-          tz.transition 2026, 11, :o2, 1793505600
-          tz.transition 2027, 3, :o3, 1805000400
-          tz.transition 2027, 11, :o2, 1825560000
-          tz.transition 2028, 3, :o3, 1836450000
-          tz.transition 2028, 11, :o2, 1857009600
-          tz.transition 2029, 3, :o3, 1867899600
-          tz.transition 2029, 11, :o2, 1888459200
-          tz.transition 2030, 3, :o3, 1899349200
-          tz.transition 2030, 11, :o2, 1919908800
-          tz.transition 2031, 3, :o3, 1930798800
-          tz.transition 2031, 11, :o2, 1951358400
-          tz.transition 2032, 3, :o3, 1962853200
-          tz.transition 2032, 11, :o2, 1983412800
-          tz.transition 2033, 3, :o3, 1994302800
-          tz.transition 2033, 11, :o2, 2014862400
-          tz.transition 2034, 3, :o3, 2025752400
-          tz.transition 2034, 11, :o2, 2046312000
-          tz.transition 2035, 3, :o3, 2057202000
-          tz.transition 2035, 11, :o2, 2077761600
-          tz.transition 2036, 3, :o3, 2088651600
-          tz.transition 2036, 11, :o2, 2109211200
-          tz.transition 2037, 3, :o3, 2120101200
-          tz.transition 2037, 11, :o2, 2140660800
-          tz.transition 2038, 3, :o3, 59171921, 24
-          tz.transition 2038, 11, :o2, 7397204, 3
-          tz.transition 2039, 3, :o3, 59180657, 24
-          tz.transition 2039, 11, :o2, 7398296, 3
-          tz.transition 2040, 3, :o3, 59189393, 24
-          tz.transition 2040, 11, :o2, 7399388, 3
-          tz.transition 2041, 3, :o3, 59198129, 24
-          tz.transition 2041, 11, :o2, 7400480, 3
-          tz.transition 2042, 3, :o3, 59206865, 24
-          tz.transition 2042, 11, :o2, 7401572, 3
-          tz.transition 2043, 3, :o3, 59215601, 24
-          tz.transition 2043, 11, :o2, 7402664, 3
-          tz.transition 2044, 3, :o3, 59224505, 24
-          tz.transition 2044, 11, :o2, 7403777, 3
-          tz.transition 2045, 3, :o3, 59233241, 24
-          tz.transition 2045, 11, :o2, 7404869, 3
-          tz.transition 2046, 3, :o3, 59241977, 24
-          tz.transition 2046, 11, :o2, 7405961, 3
-          tz.transition 2047, 3, :o3, 59250713, 24
-          tz.transition 2047, 11, :o2, 7407053, 3
-          tz.transition 2048, 3, :o3, 59259449, 24
-          tz.transition 2048, 11, :o2, 7408145, 3
-          tz.transition 2049, 3, :o3, 59268353, 24
-          tz.transition 2049, 11, :o2, 7409258, 3
-          tz.transition 2050, 3, :o3, 59277089, 24
-          tz.transition 2050, 11, :o2, 7410350, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Moncton.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Moncton.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Moncton.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Moncton.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,254 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Moncton
-        include TimezoneDefinition
-        
-        timezone 'America/Moncton' do |tz|
-          tz.offset :o0, -15548, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -14400, 0, :AST
-          tz.offset :o3, -14400, 3600, :ADT
-          tz.offset :o4, -14400, 3600, :AWT
-          tz.offset :o5, -14400, 3600, :APT
-          
-          tz.transition 1883, 12, :o1, 52037719487, 21600
-          tz.transition 1902, 6, :o2, 57981977, 24
-          tz.transition 1918, 4, :o3, 9686791, 4
-          tz.transition 1918, 10, :o2, 58125545, 24
-          tz.transition 1933, 6, :o3, 58253633, 24
-          tz.transition 1933, 9, :o2, 7281977, 3
-          tz.transition 1934, 6, :o3, 58262369, 24
-          tz.transition 1934, 9, :o2, 7283069, 3
-          tz.transition 1935, 6, :o3, 58271105, 24
-          tz.transition 1935, 9, :o2, 7284161, 3
-          tz.transition 1936, 6, :o3, 58279841, 24
-          tz.transition 1936, 9, :o2, 7285253, 3
-          tz.transition 1937, 6, :o3, 58288577, 24
-          tz.transition 1937, 9, :o2, 7286345, 3
-          tz.transition 1938, 6, :o3, 58297313, 24
-          tz.transition 1938, 9, :o2, 7287437, 3
-          tz.transition 1939, 5, :o3, 58305857, 24
-          tz.transition 1939, 9, :o2, 7288589, 3
-          tz.transition 1940, 5, :o3, 58314449, 24
-          tz.transition 1940, 9, :o2, 7289681, 3
-          tz.transition 1941, 5, :o3, 58322849, 24
-          tz.transition 1941, 9, :o2, 7290794, 3
-          tz.transition 1942, 2, :o4, 9721599, 4
-          tz.transition 1945, 8, :o5, 58360379, 24
-          tz.transition 1945, 9, :o2, 58361489, 24
-          tz.transition 1946, 4, :o3, 9727755, 4
-          tz.transition 1946, 9, :o2, 58370225, 24
-          tz.transition 1947, 4, :o3, 9729211, 4
-          tz.transition 1947, 9, :o2, 58378961, 24
-          tz.transition 1948, 4, :o3, 9730667, 4
-          tz.transition 1948, 9, :o2, 58387697, 24
-          tz.transition 1949, 4, :o3, 9732123, 4
-          tz.transition 1949, 9, :o2, 58396433, 24
-          tz.transition 1950, 4, :o3, 9733607, 4
-          tz.transition 1950, 9, :o2, 58405169, 24
-          tz.transition 1951, 4, :o3, 9735063, 4
-          tz.transition 1951, 9, :o2, 58414073, 24
-          tz.transition 1952, 4, :o3, 9736519, 4
-          tz.transition 1952, 9, :o2, 58422809, 24
-          tz.transition 1953, 4, :o3, 9737975, 4
-          tz.transition 1953, 9, :o2, 58431545, 24
-          tz.transition 1954, 4, :o3, 9739431, 4
-          tz.transition 1954, 9, :o2, 58440281, 24
-          tz.transition 1955, 4, :o3, 9740887, 4
-          tz.transition 1955, 9, :o2, 58449017, 24
-          tz.transition 1956, 4, :o3, 9742371, 4
-          tz.transition 1956, 9, :o2, 58457921, 24
-          tz.transition 1957, 4, :o3, 9743827, 4
-          tz.transition 1957, 10, :o2, 58467329, 24
-          tz.transition 1958, 4, :o3, 9745283, 4
-          tz.transition 1958, 10, :o2, 58476065, 24
-          tz.transition 1959, 4, :o3, 9746739, 4
-          tz.transition 1959, 10, :o2, 58484801, 24
-          tz.transition 1960, 4, :o3, 9748195, 4
-          tz.transition 1960, 10, :o2, 58493705, 24
-          tz.transition 1961, 4, :o3, 9749679, 4
-          tz.transition 1961, 10, :o2, 58502441, 24
-          tz.transition 1962, 4, :o3, 9751135, 4
-          tz.transition 1962, 10, :o2, 58511177, 24
-          tz.transition 1963, 4, :o3, 9752591, 4
-          tz.transition 1963, 10, :o2, 58519913, 24
-          tz.transition 1964, 4, :o3, 9754047, 4
-          tz.transition 1964, 10, :o2, 58528649, 24
-          tz.transition 1965, 4, :o3, 9755503, 4
-          tz.transition 1965, 10, :o2, 58537553, 24
-          tz.transition 1966, 4, :o3, 9756959, 4
-          tz.transition 1966, 10, :o2, 58546289, 24
-          tz.transition 1967, 4, :o3, 9758443, 4
-          tz.transition 1967, 10, :o2, 58555025, 24
-          tz.transition 1968, 4, :o3, 9759899, 4
-          tz.transition 1968, 10, :o2, 58563761, 24
-          tz.transition 1969, 4, :o3, 9761355, 4
-          tz.transition 1969, 10, :o2, 58572497, 24
-          tz.transition 1970, 4, :o3, 9957600
-          tz.transition 1970, 10, :o2, 25678800
-          tz.transition 1971, 4, :o3, 41407200
-          tz.transition 1971, 10, :o2, 57733200
-          tz.transition 1972, 4, :o3, 73461600
-          tz.transition 1972, 10, :o2, 89182800
-          tz.transition 1974, 4, :o3, 136360800
-          tz.transition 1974, 10, :o2, 152082000
-          tz.transition 1975, 4, :o3, 167810400
-          tz.transition 1975, 10, :o2, 183531600
-          tz.transition 1976, 4, :o3, 199260000
-          tz.transition 1976, 10, :o2, 215586000
-          tz.transition 1977, 4, :o3, 230709600
-          tz.transition 1977, 10, :o2, 247035600
-          tz.transition 1978, 4, :o3, 262764000
-          tz.transition 1978, 10, :o2, 278485200
-          tz.transition 1979, 4, :o3, 294213600
-          tz.transition 1979, 10, :o2, 309934800
-          tz.transition 1980, 4, :o3, 325663200
-          tz.transition 1980, 10, :o2, 341384400
-          tz.transition 1981, 4, :o3, 357112800
-          tz.transition 1981, 10, :o2, 372834000
-          tz.transition 1982, 4, :o3, 388562400
-          tz.transition 1982, 10, :o2, 404888400
-          tz.transition 1983, 4, :o3, 420012000
-          tz.transition 1983, 10, :o2, 436338000
-          tz.transition 1984, 4, :o3, 452066400
-          tz.transition 1984, 10, :o2, 467787600
-          tz.transition 1985, 4, :o3, 483516000
-          tz.transition 1985, 10, :o2, 499237200
-          tz.transition 1986, 4, :o3, 514965600
-          tz.transition 1986, 10, :o2, 530686800
-          tz.transition 1987, 4, :o3, 544600800
-          tz.transition 1987, 10, :o2, 562136400
-          tz.transition 1988, 4, :o3, 576050400
-          tz.transition 1988, 10, :o2, 594190800
-          tz.transition 1989, 4, :o3, 607500000
-          tz.transition 1989, 10, :o2, 625640400
-          tz.transition 1990, 4, :o3, 638949600
-          tz.transition 1990, 10, :o2, 657090000
-          tz.transition 1991, 4, :o3, 671004000
-          tz.transition 1991, 10, :o2, 688539600
-          tz.transition 1992, 4, :o3, 702453600
-          tz.transition 1992, 10, :o2, 719989200
-          tz.transition 1993, 4, :o3, 733896060
-          tz.transition 1993, 10, :o2, 752036460
-          tz.transition 1994, 4, :o3, 765345660
-          tz.transition 1994, 10, :o2, 783486060
-          tz.transition 1995, 4, :o3, 796795260
-          tz.transition 1995, 10, :o2, 814935660
-          tz.transition 1996, 4, :o3, 828849660
-          tz.transition 1996, 10, :o2, 846385260
-          tz.transition 1997, 4, :o3, 860299260
-          tz.transition 1997, 10, :o2, 877834860
-          tz.transition 1998, 4, :o3, 891748860
-          tz.transition 1998, 10, :o2, 909284460
-          tz.transition 1999, 4, :o3, 923198460
-          tz.transition 1999, 10, :o2, 941338860
-          tz.transition 2000, 4, :o3, 954648060
-          tz.transition 2000, 10, :o2, 972788460
-          tz.transition 2001, 4, :o3, 986097660
-          tz.transition 2001, 10, :o2, 1004238060
-          tz.transition 2002, 4, :o3, 1018152060
-          tz.transition 2002, 10, :o2, 1035687660
-          tz.transition 2003, 4, :o3, 1049601660
-          tz.transition 2003, 10, :o2, 1067137260
-          tz.transition 2004, 4, :o3, 1081051260
-          tz.transition 2004, 10, :o2, 1099191660
-          tz.transition 2005, 4, :o3, 1112500860
-          tz.transition 2005, 10, :o2, 1130641260
-          tz.transition 2006, 4, :o3, 1143950460
-          tz.transition 2006, 10, :o2, 1162090860
-          tz.transition 2007, 3, :o3, 1173592800
-          tz.transition 2007, 11, :o2, 1194152400
-          tz.transition 2008, 3, :o3, 1205042400
-          tz.transition 2008, 11, :o2, 1225602000
-          tz.transition 2009, 3, :o3, 1236492000
-          tz.transition 2009, 11, :o2, 1257051600
-          tz.transition 2010, 3, :o3, 1268546400
-          tz.transition 2010, 11, :o2, 1289106000
-          tz.transition 2011, 3, :o3, 1299996000
-          tz.transition 2011, 11, :o2, 1320555600
-          tz.transition 2012, 3, :o3, 1331445600
-          tz.transition 2012, 11, :o2, 1352005200
-          tz.transition 2013, 3, :o3, 1362895200
-          tz.transition 2013, 11, :o2, 1383454800
-          tz.transition 2014, 3, :o3, 1394344800
-          tz.transition 2014, 11, :o2, 1414904400
-          tz.transition 2015, 3, :o3, 1425794400
-          tz.transition 2015, 11, :o2, 1446354000
-          tz.transition 2016, 3, :o3, 1457848800
-          tz.transition 2016, 11, :o2, 1478408400
-          tz.transition 2017, 3, :o3, 1489298400
-          tz.transition 2017, 11, :o2, 1509858000
-          tz.transition 2018, 3, :o3, 1520748000
-          tz.transition 2018, 11, :o2, 1541307600
-          tz.transition 2019, 3, :o3, 1552197600
-          tz.transition 2019, 11, :o2, 1572757200
-          tz.transition 2020, 3, :o3, 1583647200
-          tz.transition 2020, 11, :o2, 1604206800
-          tz.transition 2021, 3, :o3, 1615701600
-          tz.transition 2021, 11, :o2, 1636261200
-          tz.transition 2022, 3, :o3, 1647151200
-          tz.transition 2022, 11, :o2, 1667710800
-          tz.transition 2023, 3, :o3, 1678600800
-          tz.transition 2023, 11, :o2, 1699160400
-          tz.transition 2024, 3, :o3, 1710050400
-          tz.transition 2024, 11, :o2, 1730610000
-          tz.transition 2025, 3, :o3, 1741500000
-          tz.transition 2025, 11, :o2, 1762059600
-          tz.transition 2026, 3, :o3, 1772949600
-          tz.transition 2026, 11, :o2, 1793509200
-          tz.transition 2027, 3, :o3, 1805004000
-          tz.transition 2027, 11, :o2, 1825563600
-          tz.transition 2028, 3, :o3, 1836453600
-          tz.transition 2028, 11, :o2, 1857013200
-          tz.transition 2029, 3, :o3, 1867903200
-          tz.transition 2029, 11, :o2, 1888462800
-          tz.transition 2030, 3, :o3, 1899352800
-          tz.transition 2030, 11, :o2, 1919912400
-          tz.transition 2031, 3, :o3, 1930802400
-          tz.transition 2031, 11, :o2, 1951362000
-          tz.transition 2032, 3, :o3, 1962856800
-          tz.transition 2032, 11, :o2, 1983416400
-          tz.transition 2033, 3, :o3, 1994306400
-          tz.transition 2033, 11, :o2, 2014866000
-          tz.transition 2034, 3, :o3, 2025756000
-          tz.transition 2034, 11, :o2, 2046315600
-          tz.transition 2035, 3, :o3, 2057205600
-          tz.transition 2035, 11, :o2, 2077765200
-          tz.transition 2036, 3, :o3, 2088655200
-          tz.transition 2036, 11, :o2, 2109214800
-          tz.transition 2037, 3, :o3, 2120104800
-          tz.transition 2037, 11, :o2, 2140664400
-          tz.transition 2038, 3, :o3, 9861987, 4
-          tz.transition 2038, 11, :o2, 59177633, 24
-          tz.transition 2039, 3, :o3, 9863443, 4
-          tz.transition 2039, 11, :o2, 59186369, 24
-          tz.transition 2040, 3, :o3, 9864899, 4
-          tz.transition 2040, 11, :o2, 59195105, 24
-          tz.transition 2041, 3, :o3, 9866355, 4
-          tz.transition 2041, 11, :o2, 59203841, 24
-          tz.transition 2042, 3, :o3, 9867811, 4
-          tz.transition 2042, 11, :o2, 59212577, 24
-          tz.transition 2043, 3, :o3, 9869267, 4
-          tz.transition 2043, 11, :o2, 59221313, 24
-          tz.transition 2044, 3, :o3, 9870751, 4
-          tz.transition 2044, 11, :o2, 59230217, 24
-          tz.transition 2045, 3, :o3, 9872207, 4
-          tz.transition 2045, 11, :o2, 59238953, 24
-          tz.transition 2046, 3, :o3, 9873663, 4
-          tz.transition 2046, 11, :o2, 59247689, 24
-          tz.transition 2047, 3, :o3, 9875119, 4
-          tz.transition 2047, 11, :o2, 59256425, 24
-          tz.transition 2048, 3, :o3, 9876575, 4
-          tz.transition 2048, 11, :o2, 59265161, 24
-          tz.transition 2049, 3, :o3, 9878059, 4
-          tz.transition 2049, 11, :o2, 59274065, 24
-          tz.transition 2050, 3, :o3, 9879515, 4
-          tz.transition 2050, 11, :o2, 59282801, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Monterrey.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Monterrey.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Monterrey.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Monterrey.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,131 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Monterrey
-        include TimezoneDefinition
-        
-        timezone 'America/Monterrey' do |tz|
-          tz.offset :o0, -24076, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          
-          tz.transition 1922, 1, :o1, 9692223, 4
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594198000
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 5, :o2, 989136000
-          tz.transition 2001, 9, :o1, 1001833200
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 4, :o2, 1175414400
-          tz.transition 2007, 10, :o1, 1193554800
-          tz.transition 2008, 4, :o2, 1207468800
-          tz.transition 2008, 10, :o1, 1225004400
-          tz.transition 2009, 4, :o2, 1238918400
-          tz.transition 2009, 10, :o1, 1256454000
-          tz.transition 2010, 4, :o2, 1270368000
-          tz.transition 2010, 10, :o1, 1288508400
-          tz.transition 2011, 4, :o2, 1301817600
-          tz.transition 2011, 10, :o1, 1319958000
-          tz.transition 2012, 4, :o2, 1333267200
-          tz.transition 2012, 10, :o1, 1351407600
-          tz.transition 2013, 4, :o2, 1365321600
-          tz.transition 2013, 10, :o1, 1382857200
-          tz.transition 2014, 4, :o2, 1396771200
-          tz.transition 2014, 10, :o1, 1414306800
-          tz.transition 2015, 4, :o2, 1428220800
-          tz.transition 2015, 10, :o1, 1445756400
-          tz.transition 2016, 4, :o2, 1459670400
-          tz.transition 2016, 10, :o1, 1477810800
-          tz.transition 2017, 4, :o2, 1491120000
-          tz.transition 2017, 10, :o1, 1509260400
-          tz.transition 2018, 4, :o2, 1522569600
-          tz.transition 2018, 10, :o1, 1540710000
-          tz.transition 2019, 4, :o2, 1554624000
-          tz.transition 2019, 10, :o1, 1572159600
-          tz.transition 2020, 4, :o2, 1586073600
-          tz.transition 2020, 10, :o1, 1603609200
-          tz.transition 2021, 4, :o2, 1617523200
-          tz.transition 2021, 10, :o1, 1635663600
-          tz.transition 2022, 4, :o2, 1648972800
-          tz.transition 2022, 10, :o1, 1667113200
-          tz.transition 2023, 4, :o2, 1680422400
-          tz.transition 2023, 10, :o1, 1698562800
-          tz.transition 2024, 4, :o2, 1712476800
-          tz.transition 2024, 10, :o1, 1730012400
-          tz.transition 2025, 4, :o2, 1743926400
-          tz.transition 2025, 10, :o1, 1761462000
-          tz.transition 2026, 4, :o2, 1775376000
-          tz.transition 2026, 10, :o1, 1792911600
-          tz.transition 2027, 4, :o2, 1806825600
-          tz.transition 2027, 10, :o1, 1824966000
-          tz.transition 2028, 4, :o2, 1838275200
-          tz.transition 2028, 10, :o1, 1856415600
-          tz.transition 2029, 4, :o2, 1869724800
-          tz.transition 2029, 10, :o1, 1887865200
-          tz.transition 2030, 4, :o2, 1901779200
-          tz.transition 2030, 10, :o1, 1919314800
-          tz.transition 2031, 4, :o2, 1933228800
-          tz.transition 2031, 10, :o1, 1950764400
-          tz.transition 2032, 4, :o2, 1964678400
-          tz.transition 2032, 10, :o1, 1982818800
-          tz.transition 2033, 4, :o2, 1996128000
-          tz.transition 2033, 10, :o1, 2014268400
-          tz.transition 2034, 4, :o2, 2027577600
-          tz.transition 2034, 10, :o1, 2045718000
-          tz.transition 2035, 4, :o2, 2059027200
-          tz.transition 2035, 10, :o1, 2077167600
-          tz.transition 2036, 4, :o2, 2091081600
-          tz.transition 2036, 10, :o1, 2108617200
-          tz.transition 2037, 4, :o2, 2122531200
-          tz.transition 2037, 10, :o1, 2140066800
-          tz.transition 2038, 4, :o2, 14793107, 6
-          tz.transition 2038, 10, :o1, 59177467, 24
-          tz.transition 2039, 4, :o2, 14795291, 6
-          tz.transition 2039, 10, :o1, 59186203, 24
-          tz.transition 2040, 4, :o2, 14797475, 6
-          tz.transition 2040, 10, :o1, 59194939, 24
-          tz.transition 2041, 4, :o2, 14799701, 6
-          tz.transition 2041, 10, :o1, 59203675, 24
-          tz.transition 2042, 4, :o2, 14801885, 6
-          tz.transition 2042, 10, :o1, 59212411, 24
-          tz.transition 2043, 4, :o2, 14804069, 6
-          tz.transition 2043, 10, :o1, 59221147, 24
-          tz.transition 2044, 4, :o2, 14806253, 6
-          tz.transition 2044, 10, :o1, 59230051, 24
-          tz.transition 2045, 4, :o2, 14808437, 6
-          tz.transition 2045, 10, :o1, 59238787, 24
-          tz.transition 2046, 4, :o2, 14810621, 6
-          tz.transition 2046, 10, :o1, 59247523, 24
-          tz.transition 2047, 4, :o2, 14812847, 6
-          tz.transition 2047, 10, :o1, 59256259, 24
-          tz.transition 2048, 4, :o2, 14815031, 6
-          tz.transition 2048, 10, :o1, 59264995, 24
-          tz.transition 2049, 4, :o2, 14817215, 6
-          tz.transition 2049, 10, :o1, 59273899, 24
-          tz.transition 2050, 4, :o2, 14819399, 6
-          tz.transition 2050, 10, :o1, 59282635, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montevideo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montevideo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montevideo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montevideo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,179 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Montevideo
-        include TimezoneDefinition
-        
-        timezone 'America/Montevideo' do |tz|
-          tz.offset :o0, -13484, 0, :LMT
-          tz.offset :o1, -13484, 0, :MMT
-          tz.offset :o2, -12600, 0, :UYT
-          tz.offset :o3, -12600, 1800, :UYHST
-          tz.offset :o4, -10800, 3600, :UYST
-          tz.offset :o5, -10800, 0, :UYT
-          tz.offset :o6, -10800, 1800, :UYHST
-          
-          tz.transition 1898, 6, :o1, 52152522971, 21600
-          tz.transition 1920, 5, :o2, 52324826171, 21600
-          tz.transition 1923, 10, :o3, 116337343, 48
-          tz.transition 1924, 4, :o2, 19391013, 8
-          tz.transition 1924, 10, :o3, 116354863, 48
-          tz.transition 1925, 4, :o2, 19393933, 8
-          tz.transition 1925, 10, :o3, 116372383, 48
-          tz.transition 1926, 4, :o2, 19396853, 8
-          tz.transition 1933, 10, :o3, 116513983, 48
-          tz.transition 1934, 4, :o2, 19420229, 8
-          tz.transition 1934, 10, :o3, 116531455, 48
-          tz.transition 1935, 3, :o2, 19423141, 8
-          tz.transition 1935, 10, :o3, 116548927, 48
-          tz.transition 1936, 3, :o2, 19426053, 8
-          tz.transition 1936, 11, :o3, 116566735, 48
-          tz.transition 1937, 3, :o2, 19428965, 8
-          tz.transition 1937, 10, :o3, 116584207, 48
-          tz.transition 1938, 3, :o2, 19431877, 8
-          tz.transition 1938, 10, :o3, 116601679, 48
-          tz.transition 1939, 3, :o2, 19434789, 8
-          tz.transition 1939, 10, :o3, 116619151, 48
-          tz.transition 1940, 3, :o2, 19437757, 8
-          tz.transition 1940, 10, :o3, 116636623, 48
-          tz.transition 1941, 3, :o2, 19440669, 8
-          tz.transition 1941, 8, :o3, 116649967, 48
-          tz.transition 1942, 1, :o2, 19442885, 8
-          tz.transition 1942, 12, :o4, 116673967, 48
-          tz.transition 1943, 3, :o5, 29169571, 12
-          tz.transition 1959, 5, :o4, 19493701, 8
-          tz.transition 1959, 11, :o5, 29242651, 12
-          tz.transition 1960, 1, :o4, 19495605, 8
-          tz.transition 1960, 3, :o5, 29243995, 12
-          tz.transition 1965, 4, :o4, 19510837, 8
-          tz.transition 1965, 9, :o5, 29268355, 12
-          tz.transition 1966, 4, :o4, 19513749, 8
-          tz.transition 1966, 10, :o5, 29273155, 12
-          tz.transition 1967, 4, :o4, 19516661, 8
-          tz.transition 1967, 10, :o5, 29277535, 12
-          tz.transition 1968, 5, :o6, 19520029, 8
-          tz.transition 1968, 12, :o5, 117129245, 48
-          tz.transition 1969, 5, :o6, 19522949, 8
-          tz.transition 1969, 12, :o5, 117146765, 48
-          tz.transition 1970, 5, :o6, 12625200
-          tz.transition 1970, 12, :o5, 28953000
-          tz.transition 1972, 4, :o4, 72932400
-          tz.transition 1972, 8, :o5, 82692000
-          tz.transition 1974, 3, :o6, 132116400
-          tz.transition 1974, 12, :o4, 156911400
-          tz.transition 1976, 10, :o5, 212983200
-          tz.transition 1977, 12, :o4, 250052400
-          tz.transition 1978, 4, :o5, 260244000
-          tz.transition 1979, 10, :o4, 307594800
-          tz.transition 1980, 5, :o5, 325994400
-          tz.transition 1987, 12, :o4, 566449200
-          tz.transition 1988, 3, :o5, 574308000
-          tz.transition 1988, 12, :o4, 597812400
-          tz.transition 1989, 3, :o5, 605671200
-          tz.transition 1989, 10, :o4, 625633200
-          tz.transition 1990, 3, :o5, 636516000
-          tz.transition 1990, 10, :o4, 656478000
-          tz.transition 1991, 3, :o5, 667965600
-          tz.transition 1991, 10, :o4, 688532400
-          tz.transition 1992, 3, :o5, 699415200
-          tz.transition 1992, 10, :o4, 719377200
-          tz.transition 1993, 2, :o5, 730864800
-          tz.transition 2004, 9, :o4, 1095562800
-          tz.transition 2005, 3, :o5, 1111896000
-          tz.transition 2005, 10, :o4, 1128834000
-          tz.transition 2006, 3, :o5, 1142136000
-          tz.transition 2006, 10, :o4, 1159678800
-          tz.transition 2007, 3, :o5, 1173585600
-          tz.transition 2007, 10, :o4, 1191733200
-          tz.transition 2008, 3, :o5, 1205035200
-          tz.transition 2008, 10, :o4, 1223182800
-          tz.transition 2009, 3, :o5, 1236484800
-          tz.transition 2009, 10, :o4, 1254632400
-          tz.transition 2010, 3, :o5, 1268539200
-          tz.transition 2010, 10, :o4, 1286082000
-          tz.transition 2011, 3, :o5, 1299988800
-          tz.transition 2011, 10, :o4, 1317531600
-          tz.transition 2012, 3, :o5, 1331438400
-          tz.transition 2012, 10, :o4, 1349586000
-          tz.transition 2013, 3, :o5, 1362888000
-          tz.transition 2013, 10, :o4, 1381035600
-          tz.transition 2014, 3, :o5, 1394337600
-          tz.transition 2014, 10, :o4, 1412485200
-          tz.transition 2015, 3, :o5, 1425787200
-          tz.transition 2015, 10, :o4, 1443934800
-          tz.transition 2016, 3, :o5, 1457841600
-          tz.transition 2016, 10, :o4, 1475384400
-          tz.transition 2017, 3, :o5, 1489291200
-          tz.transition 2017, 10, :o4, 1506834000
-          tz.transition 2018, 3, :o5, 1520740800
-          tz.transition 2018, 10, :o4, 1538888400
-          tz.transition 2019, 3, :o5, 1552190400
-          tz.transition 2019, 10, :o4, 1570338000
-          tz.transition 2020, 3, :o5, 1583640000
-          tz.transition 2020, 10, :o4, 1601787600
-          tz.transition 2021, 3, :o5, 1615694400
-          tz.transition 2021, 10, :o4, 1633237200
-          tz.transition 2022, 3, :o5, 1647144000
-          tz.transition 2022, 10, :o4, 1664686800
-          tz.transition 2023, 3, :o5, 1678593600
-          tz.transition 2023, 10, :o4, 1696136400
-          tz.transition 2024, 3, :o5, 1710043200
-          tz.transition 2024, 10, :o4, 1728190800
-          tz.transition 2025, 3, :o5, 1741492800
-          tz.transition 2025, 10, :o4, 1759640400
-          tz.transition 2026, 3, :o5, 1772942400
-          tz.transition 2026, 10, :o4, 1791090000
-          tz.transition 2027, 3, :o5, 1804996800
-          tz.transition 2027, 10, :o4, 1822539600
-          tz.transition 2028, 3, :o5, 1836446400
-          tz.transition 2028, 10, :o4, 1853989200
-          tz.transition 2029, 3, :o5, 1867896000
-          tz.transition 2029, 10, :o4, 1886043600
-          tz.transition 2030, 3, :o5, 1899345600
-          tz.transition 2030, 10, :o4, 1917493200
-          tz.transition 2031, 3, :o5, 1930795200
-          tz.transition 2031, 10, :o4, 1948942800
-          tz.transition 2032, 3, :o5, 1962849600
-          tz.transition 2032, 10, :o4, 1980392400
-          tz.transition 2033, 3, :o5, 1994299200
-          tz.transition 2033, 10, :o4, 2011842000
-          tz.transition 2034, 3, :o5, 2025748800
-          tz.transition 2034, 10, :o4, 2043291600
-          tz.transition 2035, 3, :o5, 2057198400
-          tz.transition 2035, 10, :o4, 2075346000
-          tz.transition 2036, 3, :o5, 2088648000
-          tz.transition 2036, 10, :o4, 2106795600
-          tz.transition 2037, 3, :o5, 2120097600
-          tz.transition 2037, 10, :o4, 2138245200
-          tz.transition 2038, 3, :o5, 7396490, 3
-          tz.transition 2038, 10, :o4, 59176793, 24
-          tz.transition 2039, 3, :o5, 7397582, 3
-          tz.transition 2039, 10, :o4, 59185529, 24
-          tz.transition 2040, 3, :o5, 7398674, 3
-          tz.transition 2040, 10, :o4, 59194433, 24
-          tz.transition 2041, 3, :o5, 7399766, 3
-          tz.transition 2041, 10, :o4, 59203169, 24
-          tz.transition 2042, 3, :o5, 7400858, 3
-          tz.transition 2042, 10, :o4, 59211905, 24
-          tz.transition 2043, 3, :o5, 7401950, 3
-          tz.transition 2043, 10, :o4, 59220641, 24
-          tz.transition 2044, 3, :o5, 7403063, 3
-          tz.transition 2044, 10, :o4, 59229377, 24
-          tz.transition 2045, 3, :o5, 7404155, 3
-          tz.transition 2045, 10, :o4, 59238113, 24
-          tz.transition 2046, 3, :o5, 7405247, 3
-          tz.transition 2046, 10, :o4, 59247017, 24
-          tz.transition 2047, 3, :o5, 7406339, 3
-          tz.transition 2047, 10, :o4, 59255753, 24
-          tz.transition 2048, 3, :o5, 7407431, 3
-          tz.transition 2048, 10, :o4, 59264489, 24
-          tz.transition 2049, 3, :o5, 7408544, 3
-          tz.transition 2049, 10, :o4, 59273225, 24
-          tz.transition 2050, 3, :o5, 7409636, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montreal.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montreal.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montreal.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montreal.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,279 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Montreal
-        include TimezoneDefinition
-        
-        timezone 'America/Montreal' do |tz|
-          tz.offset :o0, -17656, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EDT
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          
-          tz.transition 1884, 1, :o1, 26019108407, 10800
-          tz.transition 1917, 3, :o2, 58111507, 24
-          tz.transition 1917, 4, :o1, 7264028, 3
-          tz.transition 1918, 4, :o2, 58120747, 24
-          tz.transition 1918, 10, :o1, 9687591, 4
-          tz.transition 1919, 3, :o2, 38752781, 16
-          tz.transition 1919, 10, :o1, 116268325, 48
-          tz.transition 1920, 5, :o2, 38759149, 16
-          tz.transition 1920, 10, :o1, 116284837, 48
-          tz.transition 1921, 5, :o2, 58147459, 24
-          tz.transition 1921, 10, :o1, 116302309, 48
-          tz.transition 1922, 4, :o2, 58156195, 24
-          tz.transition 1922, 10, :o1, 116319781, 48
-          tz.transition 1924, 5, :o2, 58174147, 24
-          tz.transition 1924, 9, :o1, 116354725, 48
-          tz.transition 1925, 5, :o2, 58182571, 24
-          tz.transition 1925, 9, :o1, 116372197, 48
-          tz.transition 1926, 5, :o2, 58191307, 24
-          tz.transition 1926, 9, :o1, 116389669, 48
-          tz.transition 1927, 5, :o2, 58200041, 24
-          tz.transition 1927, 9, :o1, 7275446, 3
-          tz.transition 1928, 4, :o2, 58208777, 24
-          tz.transition 1928, 9, :o1, 7276559, 3
-          tz.transition 1929, 4, :o2, 58217513, 24
-          tz.transition 1929, 9, :o1, 7277651, 3
-          tz.transition 1930, 4, :o2, 58226249, 24
-          tz.transition 1930, 9, :o1, 7278743, 3
-          tz.transition 1931, 4, :o2, 58234985, 24
-          tz.transition 1931, 9, :o1, 7279835, 3
-          tz.transition 1932, 5, :o2, 58243889, 24
-          tz.transition 1932, 9, :o1, 7280927, 3
-          tz.transition 1933, 4, :o2, 58252625, 24
-          tz.transition 1933, 10, :o1, 7282040, 3
-          tz.transition 1934, 4, :o2, 58261361, 24
-          tz.transition 1934, 9, :o1, 7283132, 3
-          tz.transition 1935, 4, :o2, 58270097, 24
-          tz.transition 1935, 9, :o1, 7284224, 3
-          tz.transition 1936, 4, :o2, 58278833, 24
-          tz.transition 1936, 9, :o1, 7285316, 3
-          tz.transition 1937, 4, :o2, 58287569, 24
-          tz.transition 1937, 9, :o1, 7286408, 3
-          tz.transition 1938, 4, :o2, 58296305, 24
-          tz.transition 1938, 9, :o1, 7287500, 3
-          tz.transition 1939, 4, :o2, 58305209, 24
-          tz.transition 1939, 9, :o1, 7288592, 3
-          tz.transition 1940, 4, :o2, 58313945, 24
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 9726915, 4
-          tz.transition 1946, 4, :o2, 58366531, 24
-          tz.transition 1946, 9, :o1, 9728371, 4
-          tz.transition 1947, 4, :o2, 58375267, 24
-          tz.transition 1947, 9, :o1, 9729827, 4
-          tz.transition 1948, 4, :o2, 58384003, 24
-          tz.transition 1948, 9, :o1, 9731283, 4
-          tz.transition 1949, 4, :o2, 58392739, 24
-          tz.transition 1949, 10, :o1, 9732879, 4
-          tz.transition 1950, 4, :o2, 58401643, 24
-          tz.transition 1950, 10, :o1, 9734335, 4
-          tz.transition 1951, 4, :o2, 58410379, 24
-          tz.transition 1951, 9, :o1, 9735679, 4
-          tz.transition 1952, 4, :o2, 58419115, 24
-          tz.transition 1952, 9, :o1, 9737135, 4
-          tz.transition 1953, 4, :o2, 58427851, 24
-          tz.transition 1953, 9, :o1, 9738591, 4
-          tz.transition 1954, 4, :o2, 58436587, 24
-          tz.transition 1954, 9, :o1, 9740047, 4
-          tz.transition 1955, 4, :o2, 58445323, 24
-          tz.transition 1955, 9, :o1, 9741503, 4
-          tz.transition 1956, 4, :o2, 58454227, 24
-          tz.transition 1956, 9, :o1, 9742987, 4
-          tz.transition 1957, 4, :o2, 58462963, 24
-          tz.transition 1957, 10, :o1, 9744555, 4
-          tz.transition 1958, 4, :o2, 58471699, 24
-          tz.transition 1958, 10, :o1, 9746011, 4
-          tz.transition 1959, 4, :o2, 58480435, 24
-          tz.transition 1959, 10, :o1, 9747467, 4
-          tz.transition 1960, 4, :o2, 58489171, 24
-          tz.transition 1960, 10, :o1, 9748951, 4
-          tz.transition 1961, 4, :o2, 58498075, 24
-          tz.transition 1961, 10, :o1, 9750407, 4
-          tz.transition 1962, 4, :o2, 58506811, 24
-          tz.transition 1962, 10, :o1, 9751863, 4
-          tz.transition 1963, 4, :o2, 58515547, 24
-          tz.transition 1963, 10, :o1, 9753319, 4
-          tz.transition 1964, 4, :o2, 58524283, 24
-          tz.transition 1964, 10, :o1, 9754775, 4
-          tz.transition 1965, 4, :o2, 58533019, 24
-          tz.transition 1965, 10, :o1, 9756259, 4
-          tz.transition 1966, 4, :o2, 58541755, 24
-          tz.transition 1966, 10, :o1, 9757715, 4
-          tz.transition 1967, 4, :o2, 58550659, 24
-          tz.transition 1967, 10, :o1, 9759171, 4
-          tz.transition 1968, 4, :o2, 58559395, 24
-          tz.transition 1968, 10, :o1, 9760627, 4
-          tz.transition 1969, 4, :o2, 58568131, 24
-          tz.transition 1969, 10, :o1, 9762083, 4
-          tz.transition 1970, 4, :o2, 9961200
-          tz.transition 1970, 10, :o1, 25682400
-          tz.transition 1971, 4, :o2, 41410800
-          tz.transition 1971, 10, :o1, 57736800
-          tz.transition 1972, 4, :o2, 73465200
-          tz.transition 1972, 10, :o1, 89186400
-          tz.transition 1973, 4, :o2, 104914800
-          tz.transition 1973, 10, :o1, 120636000
-          tz.transition 1974, 4, :o2, 136364400
-          tz.transition 1974, 10, :o1, 152085600
-          tz.transition 1975, 4, :o2, 167814000
-          tz.transition 1975, 10, :o1, 183535200
-          tz.transition 1976, 4, :o2, 199263600
-          tz.transition 1976, 10, :o1, 215589600
-          tz.transition 1977, 4, :o2, 230713200
-          tz.transition 1977, 10, :o1, 247039200
-          tz.transition 1978, 4, :o2, 262767600
-          tz.transition 1978, 10, :o1, 278488800
-          tz.transition 1979, 4, :o2, 294217200
-          tz.transition 1979, 10, :o1, 309938400
-          tz.transition 1980, 4, :o2, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o2, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o2, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o2, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o2, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o2, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o2, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o2, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o2, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o2, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o2, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o2, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o2, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o2, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o2, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o2, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o2, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o2, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o2, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o2, 923209200
-          tz.transition 1999, 10, :o1, 941349600
-          tz.transition 2000, 4, :o2, 954658800
-          tz.transition 2000, 10, :o1, 972799200
-          tz.transition 2001, 4, :o2, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o2, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o2, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o2, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o2, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o2, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 3, :o2, 1173596400
-          tz.transition 2007, 11, :o1, 1194156000
-          tz.transition 2008, 3, :o2, 1205046000
-          tz.transition 2008, 11, :o1, 1225605600
-          tz.transition 2009, 3, :o2, 1236495600
-          tz.transition 2009, 11, :o1, 1257055200
-          tz.transition 2010, 3, :o2, 1268550000
-          tz.transition 2010, 11, :o1, 1289109600
-          tz.transition 2011, 3, :o2, 1299999600
-          tz.transition 2011, 11, :o1, 1320559200
-          tz.transition 2012, 3, :o2, 1331449200
-          tz.transition 2012, 11, :o1, 1352008800
-          tz.transition 2013, 3, :o2, 1362898800
-          tz.transition 2013, 11, :o1, 1383458400
-          tz.transition 2014, 3, :o2, 1394348400
-          tz.transition 2014, 11, :o1, 1414908000
-          tz.transition 2015, 3, :o2, 1425798000
-          tz.transition 2015, 11, :o1, 1446357600
-          tz.transition 2016, 3, :o2, 1457852400
-          tz.transition 2016, 11, :o1, 1478412000
-          tz.transition 2017, 3, :o2, 1489302000
-          tz.transition 2017, 11, :o1, 1509861600
-          tz.transition 2018, 3, :o2, 1520751600
-          tz.transition 2018, 11, :o1, 1541311200
-          tz.transition 2019, 3, :o2, 1552201200
-          tz.transition 2019, 11, :o1, 1572760800
-          tz.transition 2020, 3, :o2, 1583650800
-          tz.transition 2020, 11, :o1, 1604210400
-          tz.transition 2021, 3, :o2, 1615705200
-          tz.transition 2021, 11, :o1, 1636264800
-          tz.transition 2022, 3, :o2, 1647154800
-          tz.transition 2022, 11, :o1, 1667714400
-          tz.transition 2023, 3, :o2, 1678604400
-          tz.transition 2023, 11, :o1, 1699164000
-          tz.transition 2024, 3, :o2, 1710054000
-          tz.transition 2024, 11, :o1, 1730613600
-          tz.transition 2025, 3, :o2, 1741503600
-          tz.transition 2025, 11, :o1, 1762063200
-          tz.transition 2026, 3, :o2, 1772953200
-          tz.transition 2026, 11, :o1, 1793512800
-          tz.transition 2027, 3, :o2, 1805007600
-          tz.transition 2027, 11, :o1, 1825567200
-          tz.transition 2028, 3, :o2, 1836457200
-          tz.transition 2028, 11, :o1, 1857016800
-          tz.transition 2029, 3, :o2, 1867906800
-          tz.transition 2029, 11, :o1, 1888466400
-          tz.transition 2030, 3, :o2, 1899356400
-          tz.transition 2030, 11, :o1, 1919916000
-          tz.transition 2031, 3, :o2, 1930806000
-          tz.transition 2031, 11, :o1, 1951365600
-          tz.transition 2032, 3, :o2, 1962860400
-          tz.transition 2032, 11, :o1, 1983420000
-          tz.transition 2033, 3, :o2, 1994310000
-          tz.transition 2033, 11, :o1, 2014869600
-          tz.transition 2034, 3, :o2, 2025759600
-          tz.transition 2034, 11, :o1, 2046319200
-          tz.transition 2035, 3, :o2, 2057209200
-          tz.transition 2035, 11, :o1, 2077768800
-          tz.transition 2036, 3, :o2, 2088658800
-          tz.transition 2036, 11, :o1, 2109218400
-          tz.transition 2037, 3, :o2, 2120108400
-          tz.transition 2037, 11, :o1, 2140668000
-          tz.transition 2038, 3, :o2, 59171923, 24
-          tz.transition 2038, 11, :o1, 9862939, 4
-          tz.transition 2039, 3, :o2, 59180659, 24
-          tz.transition 2039, 11, :o1, 9864395, 4
-          tz.transition 2040, 3, :o2, 59189395, 24
-          tz.transition 2040, 11, :o1, 9865851, 4
-          tz.transition 2041, 3, :o2, 59198131, 24
-          tz.transition 2041, 11, :o1, 9867307, 4
-          tz.transition 2042, 3, :o2, 59206867, 24
-          tz.transition 2042, 11, :o1, 9868763, 4
-          tz.transition 2043, 3, :o2, 59215603, 24
-          tz.transition 2043, 11, :o1, 9870219, 4
-          tz.transition 2044, 3, :o2, 59224507, 24
-          tz.transition 2044, 11, :o1, 9871703, 4
-          tz.transition 2045, 3, :o2, 59233243, 24
-          tz.transition 2045, 11, :o1, 9873159, 4
-          tz.transition 2046, 3, :o2, 59241979, 24
-          tz.transition 2046, 11, :o1, 9874615, 4
-          tz.transition 2047, 3, :o2, 59250715, 24
-          tz.transition 2047, 11, :o1, 9876071, 4
-          tz.transition 2048, 3, :o2, 59259451, 24
-          tz.transition 2048, 11, :o1, 9877527, 4
-          tz.transition 2049, 3, :o2, 59268355, 24
-          tz.transition 2049, 11, :o1, 9879011, 4
-          tz.transition 2050, 3, :o2, 59277091, 24
-          tz.transition 2050, 11, :o1, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montserrat.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montserrat.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montserrat.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Montserrat.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Montserrat
-        include TimezoneDefinition
-        
-        timezone 'America/Montserrat' do |tz|
-          tz.offset :o0, -14932, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1911, 7, :o1, 13063780837, 5400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nassau.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nassau.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nassau.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nassau.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,193 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Nassau
-        include TimezoneDefinition
-        
-        timezone 'America/Nassau' do |tz|
-          tz.offset :o0, -18564, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EDT
-          
-          tz.transition 1912, 3, :o1, 17420138747, 7200
-          tz.transition 1964, 4, :o2, 58524283, 24
-          tz.transition 1964, 10, :o1, 9754775, 4
-          tz.transition 1965, 4, :o2, 58533019, 24
-          tz.transition 1965, 10, :o1, 9756259, 4
-          tz.transition 1966, 4, :o2, 58541755, 24
-          tz.transition 1966, 10, :o1, 9757715, 4
-          tz.transition 1967, 4, :o2, 58550659, 24
-          tz.transition 1967, 10, :o1, 9759171, 4
-          tz.transition 1968, 4, :o2, 58559395, 24
-          tz.transition 1968, 10, :o1, 9760627, 4
-          tz.transition 1969, 4, :o2, 58568131, 24
-          tz.transition 1969, 10, :o1, 9762083, 4
-          tz.transition 1970, 4, :o2, 9961200
-          tz.transition 1970, 10, :o1, 25682400
-          tz.transition 1971, 4, :o2, 41410800
-          tz.transition 1971, 10, :o1, 57736800
-          tz.transition 1972, 4, :o2, 73465200
-          tz.transition 1972, 10, :o1, 89186400
-          tz.transition 1973, 4, :o2, 104914800
-          tz.transition 1973, 10, :o1, 120636000
-          tz.transition 1974, 4, :o2, 136364400
-          tz.transition 1974, 10, :o1, 152085600
-          tz.transition 1975, 4, :o2, 167814000
-          tz.transition 1975, 10, :o1, 183535200
-          tz.transition 1976, 4, :o2, 199263600
-          tz.transition 1976, 10, :o1, 215589600
-          tz.transition 1977, 4, :o2, 230713200
-          tz.transition 1977, 10, :o1, 247039200
-          tz.transition 1978, 4, :o2, 262767600
-          tz.transition 1978, 10, :o1, 278488800
-          tz.transition 1979, 4, :o2, 294217200
-          tz.transition 1979, 10, :o1, 309938400
-          tz.transition 1980, 4, :o2, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o2, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o2, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o2, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o2, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o2, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o2, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o2, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o2, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o2, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o2, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o2, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o2, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o2, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o2, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o2, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o2, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o2, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o2, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o2, 923209200
-          tz.transition 1999, 10, :o1, 941349600
-          tz.transition 2000, 4, :o2, 954658800
-          tz.transition 2000, 10, :o1, 972799200
-          tz.transition 2001, 4, :o2, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o2, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o2, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o2, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o2, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o2, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 4, :o2, 1175410800
-          tz.transition 2007, 10, :o1, 1193551200
-          tz.transition 2008, 4, :o2, 1207465200
-          tz.transition 2008, 10, :o1, 1225000800
-          tz.transition 2009, 4, :o2, 1238914800
-          tz.transition 2009, 10, :o1, 1256450400
-          tz.transition 2010, 4, :o2, 1270364400
-          tz.transition 2010, 10, :o1, 1288504800
-          tz.transition 2011, 4, :o2, 1301814000
-          tz.transition 2011, 10, :o1, 1319954400
-          tz.transition 2012, 4, :o2, 1333263600
-          tz.transition 2012, 10, :o1, 1351404000
-          tz.transition 2013, 4, :o2, 1365318000
-          tz.transition 2013, 10, :o1, 1382853600
-          tz.transition 2014, 4, :o2, 1396767600
-          tz.transition 2014, 10, :o1, 1414303200
-          tz.transition 2015, 4, :o2, 1428217200
-          tz.transition 2015, 10, :o1, 1445752800
-          tz.transition 2016, 4, :o2, 1459666800
-          tz.transition 2016, 10, :o1, 1477807200
-          tz.transition 2017, 4, :o2, 1491116400
-          tz.transition 2017, 10, :o1, 1509256800
-          tz.transition 2018, 4, :o2, 1522566000
-          tz.transition 2018, 10, :o1, 1540706400
-          tz.transition 2019, 4, :o2, 1554620400
-          tz.transition 2019, 10, :o1, 1572156000
-          tz.transition 2020, 4, :o2, 1586070000
-          tz.transition 2020, 10, :o1, 1603605600
-          tz.transition 2021, 4, :o2, 1617519600
-          tz.transition 2021, 10, :o1, 1635660000
-          tz.transition 2022, 4, :o2, 1648969200
-          tz.transition 2022, 10, :o1, 1667109600
-          tz.transition 2023, 4, :o2, 1680418800
-          tz.transition 2023, 10, :o1, 1698559200
-          tz.transition 2024, 4, :o2, 1712473200
-          tz.transition 2024, 10, :o1, 1730008800
-          tz.transition 2025, 4, :o2, 1743922800
-          tz.transition 2025, 10, :o1, 1761458400
-          tz.transition 2026, 4, :o2, 1775372400
-          tz.transition 2026, 10, :o1, 1792908000
-          tz.transition 2027, 4, :o2, 1806822000
-          tz.transition 2027, 10, :o1, 1824962400
-          tz.transition 2028, 4, :o2, 1838271600
-          tz.transition 2028, 10, :o1, 1856412000
-          tz.transition 2029, 4, :o2, 1869721200
-          tz.transition 2029, 10, :o1, 1887861600
-          tz.transition 2030, 4, :o2, 1901775600
-          tz.transition 2030, 10, :o1, 1919311200
-          tz.transition 2031, 4, :o2, 1933225200
-          tz.transition 2031, 10, :o1, 1950760800
-          tz.transition 2032, 4, :o2, 1964674800
-          tz.transition 2032, 10, :o1, 1982815200
-          tz.transition 2033, 4, :o2, 1996124400
-          tz.transition 2033, 10, :o1, 2014264800
-          tz.transition 2034, 4, :o2, 2027574000
-          tz.transition 2034, 10, :o1, 2045714400
-          tz.transition 2035, 4, :o2, 2059023600
-          tz.transition 2035, 10, :o1, 2077164000
-          tz.transition 2036, 4, :o2, 2091078000
-          tz.transition 2036, 10, :o1, 2108613600
-          tz.transition 2037, 4, :o2, 2122527600
-          tz.transition 2037, 10, :o1, 2140063200
-          tz.transition 2038, 4, :o2, 59172427, 24
-          tz.transition 2038, 10, :o1, 9862911, 4
-          tz.transition 2039, 4, :o2, 59181163, 24
-          tz.transition 2039, 10, :o1, 9864367, 4
-          tz.transition 2040, 4, :o2, 59189899, 24
-          tz.transition 2040, 10, :o1, 9865823, 4
-          tz.transition 2041, 4, :o2, 59198803, 24
-          tz.transition 2041, 10, :o1, 9867279, 4
-          tz.transition 2042, 4, :o2, 59207539, 24
-          tz.transition 2042, 10, :o1, 9868735, 4
-          tz.transition 2043, 4, :o2, 59216275, 24
-          tz.transition 2043, 10, :o1, 9870191, 4
-          tz.transition 2044, 4, :o2, 59225011, 24
-          tz.transition 2044, 10, :o1, 9871675, 4
-          tz.transition 2045, 4, :o2, 59233747, 24
-          tz.transition 2045, 10, :o1, 9873131, 4
-          tz.transition 2046, 4, :o2, 59242483, 24
-          tz.transition 2046, 10, :o1, 9874587, 4
-          tz.transition 2047, 4, :o2, 59251387, 24
-          tz.transition 2047, 10, :o1, 9876043, 4
-          tz.transition 2048, 4, :o2, 59260123, 24
-          tz.transition 2048, 10, :o1, 9877499, 4
-          tz.transition 2049, 4, :o2, 59268859, 24
-          tz.transition 2049, 10, :o1, 9878983, 4
-          tz.transition 2050, 4, :o2, 59277595, 24
-          tz.transition 2050, 10, :o1, 9880439, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/New_York.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/New_York.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/New_York.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/New_York.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,282 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module New_York
-        include TimezoneDefinition
-        
-        timezone 'America/New_York' do |tz|
-          tz.offset :o0, -17762, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EDT
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          
-          tz.transition 1883, 11, :o1, 57819197, 24
-          tz.transition 1918, 3, :o2, 58120411, 24
-          tz.transition 1918, 10, :o1, 9687575, 4
-          tz.transition 1919, 3, :o2, 58129147, 24
-          tz.transition 1919, 10, :o1, 9689031, 4
-          tz.transition 1920, 3, :o2, 58137883, 24
-          tz.transition 1920, 10, :o1, 9690515, 4
-          tz.transition 1921, 4, :o2, 58147291, 24
-          tz.transition 1921, 9, :o1, 9691831, 4
-          tz.transition 1922, 4, :o2, 58156195, 24
-          tz.transition 1922, 9, :o1, 9693287, 4
-          tz.transition 1923, 4, :o2, 58164931, 24
-          tz.transition 1923, 9, :o1, 9694771, 4
-          tz.transition 1924, 4, :o2, 58173667, 24
-          tz.transition 1924, 9, :o1, 9696227, 4
-          tz.transition 1925, 4, :o2, 58182403, 24
-          tz.transition 1925, 9, :o1, 9697683, 4
-          tz.transition 1926, 4, :o2, 58191139, 24
-          tz.transition 1926, 9, :o1, 9699139, 4
-          tz.transition 1927, 4, :o2, 58199875, 24
-          tz.transition 1927, 9, :o1, 9700595, 4
-          tz.transition 1928, 4, :o2, 58208779, 24
-          tz.transition 1928, 9, :o1, 9702079, 4
-          tz.transition 1929, 4, :o2, 58217515, 24
-          tz.transition 1929, 9, :o1, 9703535, 4
-          tz.transition 1930, 4, :o2, 58226251, 24
-          tz.transition 1930, 9, :o1, 9704991, 4
-          tz.transition 1931, 4, :o2, 58234987, 24
-          tz.transition 1931, 9, :o1, 9706447, 4
-          tz.transition 1932, 4, :o2, 58243723, 24
-          tz.transition 1932, 9, :o1, 9707903, 4
-          tz.transition 1933, 4, :o2, 58252627, 24
-          tz.transition 1933, 9, :o1, 9709359, 4
-          tz.transition 1934, 4, :o2, 58261363, 24
-          tz.transition 1934, 9, :o1, 9710843, 4
-          tz.transition 1935, 4, :o2, 58270099, 24
-          tz.transition 1935, 9, :o1, 9712299, 4
-          tz.transition 1936, 4, :o2, 58278835, 24
-          tz.transition 1936, 9, :o1, 9713755, 4
-          tz.transition 1937, 4, :o2, 58287571, 24
-          tz.transition 1937, 9, :o1, 9715211, 4
-          tz.transition 1938, 4, :o2, 58296307, 24
-          tz.transition 1938, 9, :o1, 9716667, 4
-          tz.transition 1939, 4, :o2, 58305211, 24
-          tz.transition 1939, 9, :o1, 9718123, 4
-          tz.transition 1940, 4, :o2, 58313947, 24
-          tz.transition 1940, 9, :o1, 9719607, 4
-          tz.transition 1941, 4, :o2, 58322683, 24
-          tz.transition 1941, 9, :o1, 9721063, 4
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 9726915, 4
-          tz.transition 1946, 4, :o2, 58366531, 24
-          tz.transition 1946, 9, :o1, 9728371, 4
-          tz.transition 1947, 4, :o2, 58375267, 24
-          tz.transition 1947, 9, :o1, 9729827, 4
-          tz.transition 1948, 4, :o2, 58384003, 24
-          tz.transition 1948, 9, :o1, 9731283, 4
-          tz.transition 1949, 4, :o2, 58392739, 24
-          tz.transition 1949, 9, :o1, 9732739, 4
-          tz.transition 1950, 4, :o2, 58401643, 24
-          tz.transition 1950, 9, :o1, 9734195, 4
-          tz.transition 1951, 4, :o2, 58410379, 24
-          tz.transition 1951, 9, :o1, 9735679, 4
-          tz.transition 1952, 4, :o2, 58419115, 24
-          tz.transition 1952, 9, :o1, 9737135, 4
-          tz.transition 1953, 4, :o2, 58427851, 24
-          tz.transition 1953, 9, :o1, 9738591, 4
-          tz.transition 1954, 4, :o2, 58436587, 24
-          tz.transition 1954, 9, :o1, 9740047, 4
-          tz.transition 1955, 4, :o2, 58445323, 24
-          tz.transition 1955, 10, :o1, 9741643, 4
-          tz.transition 1956, 4, :o2, 58454227, 24
-          tz.transition 1956, 10, :o1, 9743099, 4
-          tz.transition 1957, 4, :o2, 58462963, 24
-          tz.transition 1957, 10, :o1, 9744555, 4
-          tz.transition 1958, 4, :o2, 58471699, 24
-          tz.transition 1958, 10, :o1, 9746011, 4
-          tz.transition 1959, 4, :o2, 58480435, 24
-          tz.transition 1959, 10, :o1, 9747467, 4
-          tz.transition 1960, 4, :o2, 58489171, 24
-          tz.transition 1960, 10, :o1, 9748951, 4
-          tz.transition 1961, 4, :o2, 58498075, 24
-          tz.transition 1961, 10, :o1, 9750407, 4
-          tz.transition 1962, 4, :o2, 58506811, 24
-          tz.transition 1962, 10, :o1, 9751863, 4
-          tz.transition 1963, 4, :o2, 58515547, 24
-          tz.transition 1963, 10, :o1, 9753319, 4
-          tz.transition 1964, 4, :o2, 58524283, 24
-          tz.transition 1964, 10, :o1, 9754775, 4
-          tz.transition 1965, 4, :o2, 58533019, 24
-          tz.transition 1965, 10, :o1, 9756259, 4
-          tz.transition 1966, 4, :o2, 58541755, 24
-          tz.transition 1966, 10, :o1, 9757715, 4
-          tz.transition 1967, 4, :o2, 58550659, 24
-          tz.transition 1967, 10, :o1, 9759171, 4
-          tz.transition 1968, 4, :o2, 58559395, 24
-          tz.transition 1968, 10, :o1, 9760627, 4
-          tz.transition 1969, 4, :o2, 58568131, 24
-          tz.transition 1969, 10, :o1, 9762083, 4
-          tz.transition 1970, 4, :o2, 9961200
-          tz.transition 1970, 10, :o1, 25682400
-          tz.transition 1971, 4, :o2, 41410800
-          tz.transition 1971, 10, :o1, 57736800
-          tz.transition 1972, 4, :o2, 73465200
-          tz.transition 1972, 10, :o1, 89186400
-          tz.transition 1973, 4, :o2, 104914800
-          tz.transition 1973, 10, :o1, 120636000
-          tz.transition 1974, 1, :o2, 126687600
-          tz.transition 1974, 10, :o1, 152085600
-          tz.transition 1975, 2, :o2, 162370800
-          tz.transition 1975, 10, :o1, 183535200
-          tz.transition 1976, 4, :o2, 199263600
-          tz.transition 1976, 10, :o1, 215589600
-          tz.transition 1977, 4, :o2, 230713200
-          tz.transition 1977, 10, :o1, 247039200
-          tz.transition 1978, 4, :o2, 262767600
-          tz.transition 1978, 10, :o1, 278488800
-          tz.transition 1979, 4, :o2, 294217200
-          tz.transition 1979, 10, :o1, 309938400
-          tz.transition 1980, 4, :o2, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o2, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o2, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o2, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o2, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o2, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o2, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o2, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o2, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o2, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o2, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o2, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o2, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o2, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o2, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o2, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o2, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o2, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o2, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o2, 923209200
-          tz.transition 1999, 10, :o1, 941349600
-          tz.transition 2000, 4, :o2, 954658800
-          tz.transition 2000, 10, :o1, 972799200
-          tz.transition 2001, 4, :o2, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o2, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o2, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o2, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o2, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o2, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 3, :o2, 1173596400
-          tz.transition 2007, 11, :o1, 1194156000
-          tz.transition 2008, 3, :o2, 1205046000
-          tz.transition 2008, 11, :o1, 1225605600
-          tz.transition 2009, 3, :o2, 1236495600
-          tz.transition 2009, 11, :o1, 1257055200
-          tz.transition 2010, 3, :o2, 1268550000
-          tz.transition 2010, 11, :o1, 1289109600
-          tz.transition 2011, 3, :o2, 1299999600
-          tz.transition 2011, 11, :o1, 1320559200
-          tz.transition 2012, 3, :o2, 1331449200
-          tz.transition 2012, 11, :o1, 1352008800
-          tz.transition 2013, 3, :o2, 1362898800
-          tz.transition 2013, 11, :o1, 1383458400
-          tz.transition 2014, 3, :o2, 1394348400
-          tz.transition 2014, 11, :o1, 1414908000
-          tz.transition 2015, 3, :o2, 1425798000
-          tz.transition 2015, 11, :o1, 1446357600
-          tz.transition 2016, 3, :o2, 1457852400
-          tz.transition 2016, 11, :o1, 1478412000
-          tz.transition 2017, 3, :o2, 1489302000
-          tz.transition 2017, 11, :o1, 1509861600
-          tz.transition 2018, 3, :o2, 1520751600
-          tz.transition 2018, 11, :o1, 1541311200
-          tz.transition 2019, 3, :o2, 1552201200
-          tz.transition 2019, 11, :o1, 1572760800
-          tz.transition 2020, 3, :o2, 1583650800
-          tz.transition 2020, 11, :o1, 1604210400
-          tz.transition 2021, 3, :o2, 1615705200
-          tz.transition 2021, 11, :o1, 1636264800
-          tz.transition 2022, 3, :o2, 1647154800
-          tz.transition 2022, 11, :o1, 1667714400
-          tz.transition 2023, 3, :o2, 1678604400
-          tz.transition 2023, 11, :o1, 1699164000
-          tz.transition 2024, 3, :o2, 1710054000
-          tz.transition 2024, 11, :o1, 1730613600
-          tz.transition 2025, 3, :o2, 1741503600
-          tz.transition 2025, 11, :o1, 1762063200
-          tz.transition 2026, 3, :o2, 1772953200
-          tz.transition 2026, 11, :o1, 1793512800
-          tz.transition 2027, 3, :o2, 1805007600
-          tz.transition 2027, 11, :o1, 1825567200
-          tz.transition 2028, 3, :o2, 1836457200
-          tz.transition 2028, 11, :o1, 1857016800
-          tz.transition 2029, 3, :o2, 1867906800
-          tz.transition 2029, 11, :o1, 1888466400
-          tz.transition 2030, 3, :o2, 1899356400
-          tz.transition 2030, 11, :o1, 1919916000
-          tz.transition 2031, 3, :o2, 1930806000
-          tz.transition 2031, 11, :o1, 1951365600
-          tz.transition 2032, 3, :o2, 1962860400
-          tz.transition 2032, 11, :o1, 1983420000
-          tz.transition 2033, 3, :o2, 1994310000
-          tz.transition 2033, 11, :o1, 2014869600
-          tz.transition 2034, 3, :o2, 2025759600
-          tz.transition 2034, 11, :o1, 2046319200
-          tz.transition 2035, 3, :o2, 2057209200
-          tz.transition 2035, 11, :o1, 2077768800
-          tz.transition 2036, 3, :o2, 2088658800
-          tz.transition 2036, 11, :o1, 2109218400
-          tz.transition 2037, 3, :o2, 2120108400
-          tz.transition 2037, 11, :o1, 2140668000
-          tz.transition 2038, 3, :o2, 59171923, 24
-          tz.transition 2038, 11, :o1, 9862939, 4
-          tz.transition 2039, 3, :o2, 59180659, 24
-          tz.transition 2039, 11, :o1, 9864395, 4
-          tz.transition 2040, 3, :o2, 59189395, 24
-          tz.transition 2040, 11, :o1, 9865851, 4
-          tz.transition 2041, 3, :o2, 59198131, 24
-          tz.transition 2041, 11, :o1, 9867307, 4
-          tz.transition 2042, 3, :o2, 59206867, 24
-          tz.transition 2042, 11, :o1, 9868763, 4
-          tz.transition 2043, 3, :o2, 59215603, 24
-          tz.transition 2043, 11, :o1, 9870219, 4
-          tz.transition 2044, 3, :o2, 59224507, 24
-          tz.transition 2044, 11, :o1, 9871703, 4
-          tz.transition 2045, 3, :o2, 59233243, 24
-          tz.transition 2045, 11, :o1, 9873159, 4
-          tz.transition 2046, 3, :o2, 59241979, 24
-          tz.transition 2046, 11, :o1, 9874615, 4
-          tz.transition 2047, 3, :o2, 59250715, 24
-          tz.transition 2047, 11, :o1, 9876071, 4
-          tz.transition 2048, 3, :o2, 59259451, 24
-          tz.transition 2048, 11, :o1, 9877527, 4
-          tz.transition 2049, 3, :o2, 59268355, 24
-          tz.transition 2049, 11, :o1, 9879011, 4
-          tz.transition 2050, 3, :o2, 59277091, 24
-          tz.transition 2050, 11, :o1, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nipigon.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nipigon.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nipigon.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nipigon.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,181 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Nipigon
-        include TimezoneDefinition
-        
-        timezone 'America/Nipigon' do |tz|
-          tz.offset :o0, -21184, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EDT
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          
-          tz.transition 1895, 1, :o1, 1628906453, 675
-          tz.transition 1918, 4, :o2, 58120747, 24
-          tz.transition 1918, 10, :o1, 9687591, 4
-          tz.transition 1940, 9, :o2, 58317641, 24
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 9726915, 4
-          tz.transition 1974, 4, :o2, 136364400
-          tz.transition 1974, 10, :o1, 152085600
-          tz.transition 1975, 4, :o2, 167814000
-          tz.transition 1975, 10, :o1, 183535200
-          tz.transition 1976, 4, :o2, 199263600
-          tz.transition 1976, 10, :o1, 215589600
-          tz.transition 1977, 4, :o2, 230713200
-          tz.transition 1977, 10, :o1, 247039200
-          tz.transition 1978, 4, :o2, 262767600
-          tz.transition 1978, 10, :o1, 278488800
-          tz.transition 1979, 4, :o2, 294217200
-          tz.transition 1979, 10, :o1, 309938400
-          tz.transition 1980, 4, :o2, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o2, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o2, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o2, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o2, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o2, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o2, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o2, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o2, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o2, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o2, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o2, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o2, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o2, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o2, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o2, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o2, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o2, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o2, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o2, 923209200
-          tz.transition 1999, 10, :o1, 941349600
-          tz.transition 2000, 4, :o2, 954658800
-          tz.transition 2000, 10, :o1, 972799200
-          tz.transition 2001, 4, :o2, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o2, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o2, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o2, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o2, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o2, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 3, :o2, 1173596400
-          tz.transition 2007, 11, :o1, 1194156000
-          tz.transition 2008, 3, :o2, 1205046000
-          tz.transition 2008, 11, :o1, 1225605600
-          tz.transition 2009, 3, :o2, 1236495600
-          tz.transition 2009, 11, :o1, 1257055200
-          tz.transition 2010, 3, :o2, 1268550000
-          tz.transition 2010, 11, :o1, 1289109600
-          tz.transition 2011, 3, :o2, 1299999600
-          tz.transition 2011, 11, :o1, 1320559200
-          tz.transition 2012, 3, :o2, 1331449200
-          tz.transition 2012, 11, :o1, 1352008800
-          tz.transition 2013, 3, :o2, 1362898800
-          tz.transition 2013, 11, :o1, 1383458400
-          tz.transition 2014, 3, :o2, 1394348400
-          tz.transition 2014, 11, :o1, 1414908000
-          tz.transition 2015, 3, :o2, 1425798000
-          tz.transition 2015, 11, :o1, 1446357600
-          tz.transition 2016, 3, :o2, 1457852400
-          tz.transition 2016, 11, :o1, 1478412000
-          tz.transition 2017, 3, :o2, 1489302000
-          tz.transition 2017, 11, :o1, 1509861600
-          tz.transition 2018, 3, :o2, 1520751600
-          tz.transition 2018, 11, :o1, 1541311200
-          tz.transition 2019, 3, :o2, 1552201200
-          tz.transition 2019, 11, :o1, 1572760800
-          tz.transition 2020, 3, :o2, 1583650800
-          tz.transition 2020, 11, :o1, 1604210400
-          tz.transition 2021, 3, :o2, 1615705200
-          tz.transition 2021, 11, :o1, 1636264800
-          tz.transition 2022, 3, :o2, 1647154800
-          tz.transition 2022, 11, :o1, 1667714400
-          tz.transition 2023, 3, :o2, 1678604400
-          tz.transition 2023, 11, :o1, 1699164000
-          tz.transition 2024, 3, :o2, 1710054000
-          tz.transition 2024, 11, :o1, 1730613600
-          tz.transition 2025, 3, :o2, 1741503600
-          tz.transition 2025, 11, :o1, 1762063200
-          tz.transition 2026, 3, :o2, 1772953200
-          tz.transition 2026, 11, :o1, 1793512800
-          tz.transition 2027, 3, :o2, 1805007600
-          tz.transition 2027, 11, :o1, 1825567200
-          tz.transition 2028, 3, :o2, 1836457200
-          tz.transition 2028, 11, :o1, 1857016800
-          tz.transition 2029, 3, :o2, 1867906800
-          tz.transition 2029, 11, :o1, 1888466400
-          tz.transition 2030, 3, :o2, 1899356400
-          tz.transition 2030, 11, :o1, 1919916000
-          tz.transition 2031, 3, :o2, 1930806000
-          tz.transition 2031, 11, :o1, 1951365600
-          tz.transition 2032, 3, :o2, 1962860400
-          tz.transition 2032, 11, :o1, 1983420000
-          tz.transition 2033, 3, :o2, 1994310000
-          tz.transition 2033, 11, :o1, 2014869600
-          tz.transition 2034, 3, :o2, 2025759600
-          tz.transition 2034, 11, :o1, 2046319200
-          tz.transition 2035, 3, :o2, 2057209200
-          tz.transition 2035, 11, :o1, 2077768800
-          tz.transition 2036, 3, :o2, 2088658800
-          tz.transition 2036, 11, :o1, 2109218400
-          tz.transition 2037, 3, :o2, 2120108400
-          tz.transition 2037, 11, :o1, 2140668000
-          tz.transition 2038, 3, :o2, 59171923, 24
-          tz.transition 2038, 11, :o1, 9862939, 4
-          tz.transition 2039, 3, :o2, 59180659, 24
-          tz.transition 2039, 11, :o1, 9864395, 4
-          tz.transition 2040, 3, :o2, 59189395, 24
-          tz.transition 2040, 11, :o1, 9865851, 4
-          tz.transition 2041, 3, :o2, 59198131, 24
-          tz.transition 2041, 11, :o1, 9867307, 4
-          tz.transition 2042, 3, :o2, 59206867, 24
-          tz.transition 2042, 11, :o1, 9868763, 4
-          tz.transition 2043, 3, :o2, 59215603, 24
-          tz.transition 2043, 11, :o1, 9870219, 4
-          tz.transition 2044, 3, :o2, 59224507, 24
-          tz.transition 2044, 11, :o1, 9871703, 4
-          tz.transition 2045, 3, :o2, 59233243, 24
-          tz.transition 2045, 11, :o1, 9873159, 4
-          tz.transition 2046, 3, :o2, 59241979, 24
-          tz.transition 2046, 11, :o1, 9874615, 4
-          tz.transition 2047, 3, :o2, 59250715, 24
-          tz.transition 2047, 11, :o1, 9876071, 4
-          tz.transition 2048, 3, :o2, 59259451, 24
-          tz.transition 2048, 11, :o1, 9877527, 4
-          tz.transition 2049, 3, :o2, 59268355, 24
-          tz.transition 2049, 11, :o1, 9879011, 4
-          tz.transition 2050, 3, :o2, 59277091, 24
-          tz.transition 2050, 11, :o1, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nome.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nome.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nome.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Nome.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,196 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Nome
-        include TimezoneDefinition
-        
-        timezone 'America/Nome' do |tz|
-          tz.offset :o0, 46701, 0, :LMT
-          tz.offset :o1, -39698, 0, :LMT
-          tz.offset :o2, -39600, 0, :NST
-          tz.offset :o3, -39600, 3600, :NWT
-          tz.offset :o4, -39600, 3600, :NPT
-          tz.offset :o5, -39600, 0, :BST
-          tz.offset :o6, -39600, 3600, :BDT
-          tz.offset :o7, -32400, 0, :YST
-          tz.offset :o8, -32400, 0, :AKST
-          tz.offset :o9, -32400, 3600, :AKDT
-          
-          tz.transition 1867, 10, :o1, 23071266811, 9600
-          tz.transition 1900, 8, :o2, 104338906249, 43200
-          tz.transition 1942, 2, :o3, 58329601, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 2431729, 1
-          tz.transition 1967, 4, :o5, 58549967, 24
-          tz.transition 1969, 4, :o6, 58568137, 24
-          tz.transition 1969, 10, :o5, 2440521, 1
-          tz.transition 1970, 4, :o6, 9982800
-          tz.transition 1970, 10, :o5, 25704000
-          tz.transition 1971, 4, :o6, 41432400
-          tz.transition 1971, 10, :o5, 57758400
-          tz.transition 1972, 4, :o6, 73486800
-          tz.transition 1972, 10, :o5, 89208000
-          tz.transition 1973, 4, :o6, 104936400
-          tz.transition 1973, 10, :o5, 120657600
-          tz.transition 1974, 1, :o6, 126709200
-          tz.transition 1974, 10, :o5, 152107200
-          tz.transition 1975, 2, :o6, 162392400
-          tz.transition 1975, 10, :o5, 183556800
-          tz.transition 1976, 4, :o6, 199285200
-          tz.transition 1976, 10, :o5, 215611200
-          tz.transition 1977, 4, :o6, 230734800
-          tz.transition 1977, 10, :o5, 247060800
-          tz.transition 1978, 4, :o6, 262789200
-          tz.transition 1978, 10, :o5, 278510400
-          tz.transition 1979, 4, :o6, 294238800
-          tz.transition 1979, 10, :o5, 309960000
-          tz.transition 1980, 4, :o6, 325688400
-          tz.transition 1980, 10, :o5, 341409600
-          tz.transition 1981, 4, :o6, 357138000
-          tz.transition 1981, 10, :o5, 372859200
-          tz.transition 1982, 4, :o6, 388587600
-          tz.transition 1982, 10, :o5, 404913600
-          tz.transition 1983, 4, :o6, 420037200
-          tz.transition 1983, 10, :o7, 436363200
-          tz.transition 1983, 11, :o8, 439030800
-          tz.transition 1984, 4, :o9, 452084400
-          tz.transition 1984, 10, :o8, 467805600
-          tz.transition 1985, 4, :o9, 483534000
-          tz.transition 1985, 10, :o8, 499255200
-          tz.transition 1986, 4, :o9, 514983600
-          tz.transition 1986, 10, :o8, 530704800
-          tz.transition 1987, 4, :o9, 544618800
-          tz.transition 1987, 10, :o8, 562154400
-          tz.transition 1988, 4, :o9, 576068400
-          tz.transition 1988, 10, :o8, 594208800
-          tz.transition 1989, 4, :o9, 607518000
-          tz.transition 1989, 10, :o8, 625658400
-          tz.transition 1990, 4, :o9, 638967600
-          tz.transition 1990, 10, :o8, 657108000
-          tz.transition 1991, 4, :o9, 671022000
-          tz.transition 1991, 10, :o8, 688557600
-          tz.transition 1992, 4, :o9, 702471600
-          tz.transition 1992, 10, :o8, 720007200
-          tz.transition 1993, 4, :o9, 733921200
-          tz.transition 1993, 10, :o8, 752061600
-          tz.transition 1994, 4, :o9, 765370800
-          tz.transition 1994, 10, :o8, 783511200
-          tz.transition 1995, 4, :o9, 796820400
-          tz.transition 1995, 10, :o8, 814960800
-          tz.transition 1996, 4, :o9, 828874800
-          tz.transition 1996, 10, :o8, 846410400
-          tz.transition 1997, 4, :o9, 860324400
-          tz.transition 1997, 10, :o8, 877860000
-          tz.transition 1998, 4, :o9, 891774000
-          tz.transition 1998, 10, :o8, 909309600
-          tz.transition 1999, 4, :o9, 923223600
-          tz.transition 1999, 10, :o8, 941364000
-          tz.transition 2000, 4, :o9, 954673200
-          tz.transition 2000, 10, :o8, 972813600
-          tz.transition 2001, 4, :o9, 986122800
-          tz.transition 2001, 10, :o8, 1004263200
-          tz.transition 2002, 4, :o9, 1018177200
-          tz.transition 2002, 10, :o8, 1035712800
-          tz.transition 2003, 4, :o9, 1049626800
-          tz.transition 2003, 10, :o8, 1067162400
-          tz.transition 2004, 4, :o9, 1081076400
-          tz.transition 2004, 10, :o8, 1099216800
-          tz.transition 2005, 4, :o9, 1112526000
-          tz.transition 2005, 10, :o8, 1130666400
-          tz.transition 2006, 4, :o9, 1143975600
-          tz.transition 2006, 10, :o8, 1162116000
-          tz.transition 2007, 3, :o9, 1173610800
-          tz.transition 2007, 11, :o8, 1194170400
-          tz.transition 2008, 3, :o9, 1205060400
-          tz.transition 2008, 11, :o8, 1225620000
-          tz.transition 2009, 3, :o9, 1236510000
-          tz.transition 2009, 11, :o8, 1257069600
-          tz.transition 2010, 3, :o9, 1268564400
-          tz.transition 2010, 11, :o8, 1289124000
-          tz.transition 2011, 3, :o9, 1300014000
-          tz.transition 2011, 11, :o8, 1320573600
-          tz.transition 2012, 3, :o9, 1331463600
-          tz.transition 2012, 11, :o8, 1352023200
-          tz.transition 2013, 3, :o9, 1362913200
-          tz.transition 2013, 11, :o8, 1383472800
-          tz.transition 2014, 3, :o9, 1394362800
-          tz.transition 2014, 11, :o8, 1414922400
-          tz.transition 2015, 3, :o9, 1425812400
-          tz.transition 2015, 11, :o8, 1446372000
-          tz.transition 2016, 3, :o9, 1457866800
-          tz.transition 2016, 11, :o8, 1478426400
-          tz.transition 2017, 3, :o9, 1489316400
-          tz.transition 2017, 11, :o8, 1509876000
-          tz.transition 2018, 3, :o9, 1520766000
-          tz.transition 2018, 11, :o8, 1541325600
-          tz.transition 2019, 3, :o9, 1552215600
-          tz.transition 2019, 11, :o8, 1572775200
-          tz.transition 2020, 3, :o9, 1583665200
-          tz.transition 2020, 11, :o8, 1604224800
-          tz.transition 2021, 3, :o9, 1615719600
-          tz.transition 2021, 11, :o8, 1636279200
-          tz.transition 2022, 3, :o9, 1647169200
-          tz.transition 2022, 11, :o8, 1667728800
-          tz.transition 2023, 3, :o9, 1678618800
-          tz.transition 2023, 11, :o8, 1699178400
-          tz.transition 2024, 3, :o9, 1710068400
-          tz.transition 2024, 11, :o8, 1730628000
-          tz.transition 2025, 3, :o9, 1741518000
-          tz.transition 2025, 11, :o8, 1762077600
-          tz.transition 2026, 3, :o9, 1772967600
-          tz.transition 2026, 11, :o8, 1793527200
-          tz.transition 2027, 3, :o9, 1805022000
-          tz.transition 2027, 11, :o8, 1825581600
-          tz.transition 2028, 3, :o9, 1836471600
-          tz.transition 2028, 11, :o8, 1857031200
-          tz.transition 2029, 3, :o9, 1867921200
-          tz.transition 2029, 11, :o8, 1888480800
-          tz.transition 2030, 3, :o9, 1899370800
-          tz.transition 2030, 11, :o8, 1919930400
-          tz.transition 2031, 3, :o9, 1930820400
-          tz.transition 2031, 11, :o8, 1951380000
-          tz.transition 2032, 3, :o9, 1962874800
-          tz.transition 2032, 11, :o8, 1983434400
-          tz.transition 2033, 3, :o9, 1994324400
-          tz.transition 2033, 11, :o8, 2014884000
-          tz.transition 2034, 3, :o9, 2025774000
-          tz.transition 2034, 11, :o8, 2046333600
-          tz.transition 2035, 3, :o9, 2057223600
-          tz.transition 2035, 11, :o8, 2077783200
-          tz.transition 2036, 3, :o9, 2088673200
-          tz.transition 2036, 11, :o8, 2109232800
-          tz.transition 2037, 3, :o9, 2120122800
-          tz.transition 2037, 11, :o8, 2140682400
-          tz.transition 2038, 3, :o9, 59171927, 24
-          tz.transition 2038, 11, :o8, 29588819, 12
-          tz.transition 2039, 3, :o9, 59180663, 24
-          tz.transition 2039, 11, :o8, 29593187, 12
-          tz.transition 2040, 3, :o9, 59189399, 24
-          tz.transition 2040, 11, :o8, 29597555, 12
-          tz.transition 2041, 3, :o9, 59198135, 24
-          tz.transition 2041, 11, :o8, 29601923, 12
-          tz.transition 2042, 3, :o9, 59206871, 24
-          tz.transition 2042, 11, :o8, 29606291, 12
-          tz.transition 2043, 3, :o9, 59215607, 24
-          tz.transition 2043, 11, :o8, 29610659, 12
-          tz.transition 2044, 3, :o9, 59224511, 24
-          tz.transition 2044, 11, :o8, 29615111, 12
-          tz.transition 2045, 3, :o9, 59233247, 24
-          tz.transition 2045, 11, :o8, 29619479, 12
-          tz.transition 2046, 3, :o9, 59241983, 24
-          tz.transition 2046, 11, :o8, 29623847, 12
-          tz.transition 2047, 3, :o9, 59250719, 24
-          tz.transition 2047, 11, :o8, 29628215, 12
-          tz.transition 2048, 3, :o9, 59259455, 24
-          tz.transition 2048, 11, :o8, 29632583, 12
-          tz.transition 2049, 3, :o9, 59268359, 24
-          tz.transition 2049, 11, :o8, 29637035, 12
-          tz.transition 2050, 3, :o9, 59277095, 24
-          tz.transition 2050, 11, :o8, 29641403, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Noronha.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Noronha.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Noronha.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Noronha.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,57 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Noronha
-        include TimezoneDefinition
-        
-        timezone 'America/Noronha' do |tz|
-          tz.offset :o0, -7780, 0, :LMT
-          tz.offset :o1, -7200, 0, :FNT
-          tz.offset :o2, -7200, 3600, :FNST
-          
-          tz.transition 1914, 1, :o1, 10454977109, 4320
-          tz.transition 1931, 10, :o2, 58238833, 24
-          tz.transition 1932, 4, :o1, 58243165, 24
-          tz.transition 1932, 10, :o2, 29123803, 12
-          tz.transition 1933, 4, :o1, 58251925, 24
-          tz.transition 1949, 12, :o2, 29199019, 12
-          tz.transition 1950, 4, :o1, 29200651, 12
-          tz.transition 1950, 12, :o2, 29203399, 12
-          tz.transition 1951, 4, :o1, 58409701, 24
-          tz.transition 1951, 12, :o2, 29207779, 12
-          tz.transition 1952, 4, :o1, 58418485, 24
-          tz.transition 1952, 12, :o2, 29212171, 12
-          tz.transition 1953, 3, :o1, 58426501, 24
-          tz.transition 1963, 12, :o2, 29260471, 12
-          tz.transition 1964, 3, :o1, 58522933, 24
-          tz.transition 1965, 1, :o2, 29265499, 12
-          tz.transition 1965, 3, :o1, 58532413, 24
-          tz.transition 1965, 12, :o2, 29269147, 12
-          tz.transition 1966, 3, :o1, 58540453, 24
-          tz.transition 1966, 11, :o2, 29273167, 12
-          tz.transition 1967, 3, :o1, 58549213, 24
-          tz.transition 1967, 11, :o2, 29277547, 12
-          tz.transition 1968, 3, :o1, 58557997, 24
-          tz.transition 1985, 11, :o2, 499744800
-          tz.transition 1986, 3, :o1, 511232400
-          tz.transition 1986, 10, :o2, 530589600
-          tz.transition 1987, 2, :o1, 540262800
-          tz.transition 1987, 10, :o2, 562125600
-          tz.transition 1988, 2, :o1, 571194000
-          tz.transition 1988, 10, :o2, 592970400
-          tz.transition 1989, 1, :o1, 602038800
-          tz.transition 1989, 10, :o2, 624420000
-          tz.transition 1990, 2, :o1, 634698000
-          tz.transition 1999, 10, :o2, 938916000
-          tz.transition 2000, 2, :o1, 951613200
-          tz.transition 2000, 10, :o2, 970970400
-          tz.transition 2000, 10, :o1, 971571600
-          tz.transition 2001, 10, :o2, 1003024800
-          tz.transition 2002, 2, :o1, 1013907600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/Center.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/Center.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/Center.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/Center.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,200 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module North_Dakota
-        module Center
-          include TimezoneDefinition
-          
-          timezone 'America/North_Dakota/Center' do |tz|
-            tz.offset :o0, -24312, 0, :LMT
-            tz.offset :o1, -25200, 0, :MST
-            tz.offset :o2, -25200, 3600, :MDT
-            tz.offset :o3, -25200, 3600, :MWT
-            tz.offset :o4, -25200, 3600, :MPT
-            tz.offset :o5, -21600, 0, :CST
-            tz.offset :o6, -21600, 3600, :CDT
-            
-            tz.transition 1883, 11, :o1, 57819199, 24
-            tz.transition 1918, 3, :o2, 19373471, 8
-            tz.transition 1918, 10, :o1, 14531363, 6
-            tz.transition 1919, 3, :o2, 19376383, 8
-            tz.transition 1919, 10, :o1, 14533547, 6
-            tz.transition 1942, 2, :o3, 19443199, 8
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 14590373, 6
-            tz.transition 1967, 4, :o2, 19516887, 8
-            tz.transition 1967, 10, :o1, 14638757, 6
-            tz.transition 1968, 4, :o2, 19519799, 8
-            tz.transition 1968, 10, :o1, 14640941, 6
-            tz.transition 1969, 4, :o2, 19522711, 8
-            tz.transition 1969, 10, :o1, 14643125, 6
-            tz.transition 1970, 4, :o2, 9968400
-            tz.transition 1970, 10, :o1, 25689600
-            tz.transition 1971, 4, :o2, 41418000
-            tz.transition 1971, 10, :o1, 57744000
-            tz.transition 1972, 4, :o2, 73472400
-            tz.transition 1972, 10, :o1, 89193600
-            tz.transition 1973, 4, :o2, 104922000
-            tz.transition 1973, 10, :o1, 120643200
-            tz.transition 1974, 1, :o2, 126694800
-            tz.transition 1974, 10, :o1, 152092800
-            tz.transition 1975, 2, :o2, 162378000
-            tz.transition 1975, 10, :o1, 183542400
-            tz.transition 1976, 4, :o2, 199270800
-            tz.transition 1976, 10, :o1, 215596800
-            tz.transition 1977, 4, :o2, 230720400
-            tz.transition 1977, 10, :o1, 247046400
-            tz.transition 1978, 4, :o2, 262774800
-            tz.transition 1978, 10, :o1, 278496000
-            tz.transition 1979, 4, :o2, 294224400
-            tz.transition 1979, 10, :o1, 309945600
-            tz.transition 1980, 4, :o2, 325674000
-            tz.transition 1980, 10, :o1, 341395200
-            tz.transition 1981, 4, :o2, 357123600
-            tz.transition 1981, 10, :o1, 372844800
-            tz.transition 1982, 4, :o2, 388573200
-            tz.transition 1982, 10, :o1, 404899200
-            tz.transition 1983, 4, :o2, 420022800
-            tz.transition 1983, 10, :o1, 436348800
-            tz.transition 1984, 4, :o2, 452077200
-            tz.transition 1984, 10, :o1, 467798400
-            tz.transition 1985, 4, :o2, 483526800
-            tz.transition 1985, 10, :o1, 499248000
-            tz.transition 1986, 4, :o2, 514976400
-            tz.transition 1986, 10, :o1, 530697600
-            tz.transition 1987, 4, :o2, 544611600
-            tz.transition 1987, 10, :o1, 562147200
-            tz.transition 1988, 4, :o2, 576061200
-            tz.transition 1988, 10, :o1, 594201600
-            tz.transition 1989, 4, :o2, 607510800
-            tz.transition 1989, 10, :o1, 625651200
-            tz.transition 1990, 4, :o2, 638960400
-            tz.transition 1990, 10, :o1, 657100800
-            tz.transition 1991, 4, :o2, 671014800
-            tz.transition 1991, 10, :o1, 688550400
-            tz.transition 1992, 4, :o2, 702464400
-            tz.transition 1992, 10, :o5, 720000000
-            tz.transition 1993, 4, :o6, 733910400
-            tz.transition 1993, 10, :o5, 752050800
-            tz.transition 1994, 4, :o6, 765360000
-            tz.transition 1994, 10, :o5, 783500400
-            tz.transition 1995, 4, :o6, 796809600
-            tz.transition 1995, 10, :o5, 814950000
-            tz.transition 1996, 4, :o6, 828864000
-            tz.transition 1996, 10, :o5, 846399600
-            tz.transition 1997, 4, :o6, 860313600
-            tz.transition 1997, 10, :o5, 877849200
-            tz.transition 1998, 4, :o6, 891763200
-            tz.transition 1998, 10, :o5, 909298800
-            tz.transition 1999, 4, :o6, 923212800
-            tz.transition 1999, 10, :o5, 941353200
-            tz.transition 2000, 4, :o6, 954662400
-            tz.transition 2000, 10, :o5, 972802800
-            tz.transition 2001, 4, :o6, 986112000
-            tz.transition 2001, 10, :o5, 1004252400
-            tz.transition 2002, 4, :o6, 1018166400
-            tz.transition 2002, 10, :o5, 1035702000
-            tz.transition 2003, 4, :o6, 1049616000
-            tz.transition 2003, 10, :o5, 1067151600
-            tz.transition 2004, 4, :o6, 1081065600
-            tz.transition 2004, 10, :o5, 1099206000
-            tz.transition 2005, 4, :o6, 1112515200
-            tz.transition 2005, 10, :o5, 1130655600
-            tz.transition 2006, 4, :o6, 1143964800
-            tz.transition 2006, 10, :o5, 1162105200
-            tz.transition 2007, 3, :o6, 1173600000
-            tz.transition 2007, 11, :o5, 1194159600
-            tz.transition 2008, 3, :o6, 1205049600
-            tz.transition 2008, 11, :o5, 1225609200
-            tz.transition 2009, 3, :o6, 1236499200
-            tz.transition 2009, 11, :o5, 1257058800
-            tz.transition 2010, 3, :o6, 1268553600
-            tz.transition 2010, 11, :o5, 1289113200
-            tz.transition 2011, 3, :o6, 1300003200
-            tz.transition 2011, 11, :o5, 1320562800
-            tz.transition 2012, 3, :o6, 1331452800
-            tz.transition 2012, 11, :o5, 1352012400
-            tz.transition 2013, 3, :o6, 1362902400
-            tz.transition 2013, 11, :o5, 1383462000
-            tz.transition 2014, 3, :o6, 1394352000
-            tz.transition 2014, 11, :o5, 1414911600
-            tz.transition 2015, 3, :o6, 1425801600
-            tz.transition 2015, 11, :o5, 1446361200
-            tz.transition 2016, 3, :o6, 1457856000
-            tz.transition 2016, 11, :o5, 1478415600
-            tz.transition 2017, 3, :o6, 1489305600
-            tz.transition 2017, 11, :o5, 1509865200
-            tz.transition 2018, 3, :o6, 1520755200
-            tz.transition 2018, 11, :o5, 1541314800
-            tz.transition 2019, 3, :o6, 1552204800
-            tz.transition 2019, 11, :o5, 1572764400
-            tz.transition 2020, 3, :o6, 1583654400
-            tz.transition 2020, 11, :o5, 1604214000
-            tz.transition 2021, 3, :o6, 1615708800
-            tz.transition 2021, 11, :o5, 1636268400
-            tz.transition 2022, 3, :o6, 1647158400
-            tz.transition 2022, 11, :o5, 1667718000
-            tz.transition 2023, 3, :o6, 1678608000
-            tz.transition 2023, 11, :o5, 1699167600
-            tz.transition 2024, 3, :o6, 1710057600
-            tz.transition 2024, 11, :o5, 1730617200
-            tz.transition 2025, 3, :o6, 1741507200
-            tz.transition 2025, 11, :o5, 1762066800
-            tz.transition 2026, 3, :o6, 1772956800
-            tz.transition 2026, 11, :o5, 1793516400
-            tz.transition 2027, 3, :o6, 1805011200
-            tz.transition 2027, 11, :o5, 1825570800
-            tz.transition 2028, 3, :o6, 1836460800
-            tz.transition 2028, 11, :o5, 1857020400
-            tz.transition 2029, 3, :o6, 1867910400
-            tz.transition 2029, 11, :o5, 1888470000
-            tz.transition 2030, 3, :o6, 1899360000
-            tz.transition 2030, 11, :o5, 1919919600
-            tz.transition 2031, 3, :o6, 1930809600
-            tz.transition 2031, 11, :o5, 1951369200
-            tz.transition 2032, 3, :o6, 1962864000
-            tz.transition 2032, 11, :o5, 1983423600
-            tz.transition 2033, 3, :o6, 1994313600
-            tz.transition 2033, 11, :o5, 2014873200
-            tz.transition 2034, 3, :o6, 2025763200
-            tz.transition 2034, 11, :o5, 2046322800
-            tz.transition 2035, 3, :o6, 2057212800
-            tz.transition 2035, 11, :o5, 2077772400
-            tz.transition 2036, 3, :o6, 2088662400
-            tz.transition 2036, 11, :o5, 2109222000
-            tz.transition 2037, 3, :o6, 2120112000
-            tz.transition 2037, 11, :o5, 2140671600
-            tz.transition 2038, 3, :o6, 14792981, 6
-            tz.transition 2038, 11, :o5, 59177635, 24
-            tz.transition 2039, 3, :o6, 14795165, 6
-            tz.transition 2039, 11, :o5, 59186371, 24
-            tz.transition 2040, 3, :o6, 14797349, 6
-            tz.transition 2040, 11, :o5, 59195107, 24
-            tz.transition 2041, 3, :o6, 14799533, 6
-            tz.transition 2041, 11, :o5, 59203843, 24
-            tz.transition 2042, 3, :o6, 14801717, 6
-            tz.transition 2042, 11, :o5, 59212579, 24
-            tz.transition 2043, 3, :o6, 14803901, 6
-            tz.transition 2043, 11, :o5, 59221315, 24
-            tz.transition 2044, 3, :o6, 14806127, 6
-            tz.transition 2044, 11, :o5, 59230219, 24
-            tz.transition 2045, 3, :o6, 14808311, 6
-            tz.transition 2045, 11, :o5, 59238955, 24
-            tz.transition 2046, 3, :o6, 14810495, 6
-            tz.transition 2046, 11, :o5, 59247691, 24
-            tz.transition 2047, 3, :o6, 14812679, 6
-            tz.transition 2047, 11, :o5, 59256427, 24
-            tz.transition 2048, 3, :o6, 14814863, 6
-            tz.transition 2048, 11, :o5, 59265163, 24
-            tz.transition 2049, 3, :o6, 14817089, 6
-            tz.transition 2049, 11, :o5, 59274067, 24
-            tz.transition 2050, 3, :o6, 14819273, 6
-            tz.transition 2050, 11, :o5, 59282803, 24
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/New_Salem.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/New_Salem.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/New_Salem.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/North_Dakota/New_Salem.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,200 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module North_Dakota
-        module New_Salem
-          include TimezoneDefinition
-          
-          timezone 'America/North_Dakota/New_Salem' do |tz|
-            tz.offset :o0, -24339, 0, :LMT
-            tz.offset :o1, -25200, 0, :MST
-            tz.offset :o2, -25200, 3600, :MDT
-            tz.offset :o3, -25200, 3600, :MWT
-            tz.offset :o4, -25200, 3600, :MPT
-            tz.offset :o5, -21600, 0, :CST
-            tz.offset :o6, -21600, 3600, :CDT
-            
-            tz.transition 1883, 11, :o1, 57819199, 24
-            tz.transition 1918, 3, :o2, 19373471, 8
-            tz.transition 1918, 10, :o1, 14531363, 6
-            tz.transition 1919, 3, :o2, 19376383, 8
-            tz.transition 1919, 10, :o1, 14533547, 6
-            tz.transition 1942, 2, :o3, 19443199, 8
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 14590373, 6
-            tz.transition 1967, 4, :o2, 19516887, 8
-            tz.transition 1967, 10, :o1, 14638757, 6
-            tz.transition 1968, 4, :o2, 19519799, 8
-            tz.transition 1968, 10, :o1, 14640941, 6
-            tz.transition 1969, 4, :o2, 19522711, 8
-            tz.transition 1969, 10, :o1, 14643125, 6
-            tz.transition 1970, 4, :o2, 9968400
-            tz.transition 1970, 10, :o1, 25689600
-            tz.transition 1971, 4, :o2, 41418000
-            tz.transition 1971, 10, :o1, 57744000
-            tz.transition 1972, 4, :o2, 73472400
-            tz.transition 1972, 10, :o1, 89193600
-            tz.transition 1973, 4, :o2, 104922000
-            tz.transition 1973, 10, :o1, 120643200
-            tz.transition 1974, 1, :o2, 126694800
-            tz.transition 1974, 10, :o1, 152092800
-            tz.transition 1975, 2, :o2, 162378000
-            tz.transition 1975, 10, :o1, 183542400
-            tz.transition 1976, 4, :o2, 199270800
-            tz.transition 1976, 10, :o1, 215596800
-            tz.transition 1977, 4, :o2, 230720400
-            tz.transition 1977, 10, :o1, 247046400
-            tz.transition 1978, 4, :o2, 262774800
-            tz.transition 1978, 10, :o1, 278496000
-            tz.transition 1979, 4, :o2, 294224400
-            tz.transition 1979, 10, :o1, 309945600
-            tz.transition 1980, 4, :o2, 325674000
-            tz.transition 1980, 10, :o1, 341395200
-            tz.transition 1981, 4, :o2, 357123600
-            tz.transition 1981, 10, :o1, 372844800
-            tz.transition 1982, 4, :o2, 388573200
-            tz.transition 1982, 10, :o1, 404899200
-            tz.transition 1983, 4, :o2, 420022800
-            tz.transition 1983, 10, :o1, 436348800
-            tz.transition 1984, 4, :o2, 452077200
-            tz.transition 1984, 10, :o1, 467798400
-            tz.transition 1985, 4, :o2, 483526800
-            tz.transition 1985, 10, :o1, 499248000
-            tz.transition 1986, 4, :o2, 514976400
-            tz.transition 1986, 10, :o1, 530697600
-            tz.transition 1987, 4, :o2, 544611600
-            tz.transition 1987, 10, :o1, 562147200
-            tz.transition 1988, 4, :o2, 576061200
-            tz.transition 1988, 10, :o1, 594201600
-            tz.transition 1989, 4, :o2, 607510800
-            tz.transition 1989, 10, :o1, 625651200
-            tz.transition 1990, 4, :o2, 638960400
-            tz.transition 1990, 10, :o1, 657100800
-            tz.transition 1991, 4, :o2, 671014800
-            tz.transition 1991, 10, :o1, 688550400
-            tz.transition 1992, 4, :o2, 702464400
-            tz.transition 1992, 10, :o1, 720000000
-            tz.transition 1993, 4, :o2, 733914000
-            tz.transition 1993, 10, :o1, 752054400
-            tz.transition 1994, 4, :o2, 765363600
-            tz.transition 1994, 10, :o1, 783504000
-            tz.transition 1995, 4, :o2, 796813200
-            tz.transition 1995, 10, :o1, 814953600
-            tz.transition 1996, 4, :o2, 828867600
-            tz.transition 1996, 10, :o1, 846403200
-            tz.transition 1997, 4, :o2, 860317200
-            tz.transition 1997, 10, :o1, 877852800
-            tz.transition 1998, 4, :o2, 891766800
-            tz.transition 1998, 10, :o1, 909302400
-            tz.transition 1999, 4, :o2, 923216400
-            tz.transition 1999, 10, :o1, 941356800
-            tz.transition 2000, 4, :o2, 954666000
-            tz.transition 2000, 10, :o1, 972806400
-            tz.transition 2001, 4, :o2, 986115600
-            tz.transition 2001, 10, :o1, 1004256000
-            tz.transition 2002, 4, :o2, 1018170000
-            tz.transition 2002, 10, :o1, 1035705600
-            tz.transition 2003, 4, :o2, 1049619600
-            tz.transition 2003, 10, :o5, 1067155200
-            tz.transition 2004, 4, :o6, 1081065600
-            tz.transition 2004, 10, :o5, 1099206000
-            tz.transition 2005, 4, :o6, 1112515200
-            tz.transition 2005, 10, :o5, 1130655600
-            tz.transition 2006, 4, :o6, 1143964800
-            tz.transition 2006, 10, :o5, 1162105200
-            tz.transition 2007, 3, :o6, 1173600000
-            tz.transition 2007, 11, :o5, 1194159600
-            tz.transition 2008, 3, :o6, 1205049600
-            tz.transition 2008, 11, :o5, 1225609200
-            tz.transition 2009, 3, :o6, 1236499200
-            tz.transition 2009, 11, :o5, 1257058800
-            tz.transition 2010, 3, :o6, 1268553600
-            tz.transition 2010, 11, :o5, 1289113200
-            tz.transition 2011, 3, :o6, 1300003200
-            tz.transition 2011, 11, :o5, 1320562800
-            tz.transition 2012, 3, :o6, 1331452800
-            tz.transition 2012, 11, :o5, 1352012400
-            tz.transition 2013, 3, :o6, 1362902400
-            tz.transition 2013, 11, :o5, 1383462000
-            tz.transition 2014, 3, :o6, 1394352000
-            tz.transition 2014, 11, :o5, 1414911600
-            tz.transition 2015, 3, :o6, 1425801600
-            tz.transition 2015, 11, :o5, 1446361200
-            tz.transition 2016, 3, :o6, 1457856000
-            tz.transition 2016, 11, :o5, 1478415600
-            tz.transition 2017, 3, :o6, 1489305600
-            tz.transition 2017, 11, :o5, 1509865200
-            tz.transition 2018, 3, :o6, 1520755200
-            tz.transition 2018, 11, :o5, 1541314800
-            tz.transition 2019, 3, :o6, 1552204800
-            tz.transition 2019, 11, :o5, 1572764400
-            tz.transition 2020, 3, :o6, 1583654400
-            tz.transition 2020, 11, :o5, 1604214000
-            tz.transition 2021, 3, :o6, 1615708800
-            tz.transition 2021, 11, :o5, 1636268400
-            tz.transition 2022, 3, :o6, 1647158400
-            tz.transition 2022, 11, :o5, 1667718000
-            tz.transition 2023, 3, :o6, 1678608000
-            tz.transition 2023, 11, :o5, 1699167600
-            tz.transition 2024, 3, :o6, 1710057600
-            tz.transition 2024, 11, :o5, 1730617200
-            tz.transition 2025, 3, :o6, 1741507200
-            tz.transition 2025, 11, :o5, 1762066800
-            tz.transition 2026, 3, :o6, 1772956800
-            tz.transition 2026, 11, :o5, 1793516400
-            tz.transition 2027, 3, :o6, 1805011200
-            tz.transition 2027, 11, :o5, 1825570800
-            tz.transition 2028, 3, :o6, 1836460800
-            tz.transition 2028, 11, :o5, 1857020400
-            tz.transition 2029, 3, :o6, 1867910400
-            tz.transition 2029, 11, :o5, 1888470000
-            tz.transition 2030, 3, :o6, 1899360000
-            tz.transition 2030, 11, :o5, 1919919600
-            tz.transition 2031, 3, :o6, 1930809600
-            tz.transition 2031, 11, :o5, 1951369200
-            tz.transition 2032, 3, :o6, 1962864000
-            tz.transition 2032, 11, :o5, 1983423600
-            tz.transition 2033, 3, :o6, 1994313600
-            tz.transition 2033, 11, :o5, 2014873200
-            tz.transition 2034, 3, :o6, 2025763200
-            tz.transition 2034, 11, :o5, 2046322800
-            tz.transition 2035, 3, :o6, 2057212800
-            tz.transition 2035, 11, :o5, 2077772400
-            tz.transition 2036, 3, :o6, 2088662400
-            tz.transition 2036, 11, :o5, 2109222000
-            tz.transition 2037, 3, :o6, 2120112000
-            tz.transition 2037, 11, :o5, 2140671600
-            tz.transition 2038, 3, :o6, 14792981, 6
-            tz.transition 2038, 11, :o5, 59177635, 24
-            tz.transition 2039, 3, :o6, 14795165, 6
-            tz.transition 2039, 11, :o5, 59186371, 24
-            tz.transition 2040, 3, :o6, 14797349, 6
-            tz.transition 2040, 11, :o5, 59195107, 24
-            tz.transition 2041, 3, :o6, 14799533, 6
-            tz.transition 2041, 11, :o5, 59203843, 24
-            tz.transition 2042, 3, :o6, 14801717, 6
-            tz.transition 2042, 11, :o5, 59212579, 24
-            tz.transition 2043, 3, :o6, 14803901, 6
-            tz.transition 2043, 11, :o5, 59221315, 24
-            tz.transition 2044, 3, :o6, 14806127, 6
-            tz.transition 2044, 11, :o5, 59230219, 24
-            tz.transition 2045, 3, :o6, 14808311, 6
-            tz.transition 2045, 11, :o5, 59238955, 24
-            tz.transition 2046, 3, :o6, 14810495, 6
-            tz.transition 2046, 11, :o5, 59247691, 24
-            tz.transition 2047, 3, :o6, 14812679, 6
-            tz.transition 2047, 11, :o5, 59256427, 24
-            tz.transition 2048, 3, :o6, 14814863, 6
-            tz.transition 2048, 11, :o5, 59265163, 24
-            tz.transition 2049, 3, :o6, 14817089, 6
-            tz.transition 2049, 11, :o5, 59274067, 24
-            tz.transition 2050, 3, :o6, 14819273, 6
-            tz.transition 2050, 11, :o5, 59282803, 24
-          end
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Panama.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Panama.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Panama.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Panama.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Panama
-        include TimezoneDefinition
-        
-        timezone 'America/Panama' do |tz|
-          tz.offset :o0, -19088, 0, :LMT
-          tz.offset :o1, -19176, 0, :CMT
-          tz.offset :o2, -18000, 0, :EST
-          
-          tz.transition 1890, 1, :o1, 13021391093, 5400
-          tz.transition 1908, 4, :o2, 8704993399, 3600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Pangnirtung.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Pangnirtung.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Pangnirtung.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Pangnirtung.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,177 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Pangnirtung
-        include TimezoneDefinition
-        
-        timezone 'America/Pangnirtung' do |tz|
-          tz.offset :o0, -15776, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          tz.offset :o3, -14400, 3600, :AWT
-          tz.offset :o4, -14400, 3600, :APT
-          tz.offset :o5, -14400, 7200, :ADDT
-          tz.offset :o6, -18000, 3600, :EDT
-          tz.offset :o7, -18000, 0, :EST
-          tz.offset :o8, -21600, 0, :CST
-          tz.offset :o9, -21600, 3600, :CDT
-          
-          tz.transition 1884, 1, :o1, 6504777043, 2700
-          tz.transition 1918, 4, :o2, 9686791, 4
-          tz.transition 1918, 10, :o1, 58125449, 24
-          tz.transition 1919, 5, :o2, 9688415, 4
-          tz.transition 1919, 11, :o1, 19378109, 8
-          tz.transition 1942, 2, :o3, 9721599, 4
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361489, 24
-          tz.transition 1965, 4, :o5, 7316627, 3
-          tz.transition 1965, 10, :o1, 7317194, 3
-          tz.transition 1980, 4, :o2, 325663200
-          tz.transition 1980, 10, :o1, 341384400
-          tz.transition 1981, 4, :o2, 357112800
-          tz.transition 1981, 10, :o1, 372834000
-          tz.transition 1982, 4, :o2, 388562400
-          tz.transition 1982, 10, :o1, 404888400
-          tz.transition 1983, 4, :o2, 420012000
-          tz.transition 1983, 10, :o1, 436338000
-          tz.transition 1984, 4, :o2, 452066400
-          tz.transition 1984, 10, :o1, 467787600
-          tz.transition 1985, 4, :o2, 483516000
-          tz.transition 1985, 10, :o1, 499237200
-          tz.transition 1986, 4, :o2, 514965600
-          tz.transition 1986, 10, :o1, 530686800
-          tz.transition 1987, 4, :o2, 544600800
-          tz.transition 1987, 10, :o1, 562136400
-          tz.transition 1988, 4, :o2, 576050400
-          tz.transition 1988, 10, :o1, 594190800
-          tz.transition 1989, 4, :o2, 607500000
-          tz.transition 1989, 10, :o1, 625640400
-          tz.transition 1990, 4, :o2, 638949600
-          tz.transition 1990, 10, :o1, 657090000
-          tz.transition 1991, 4, :o2, 671004000
-          tz.transition 1991, 10, :o1, 688539600
-          tz.transition 1992, 4, :o2, 702453600
-          tz.transition 1992, 10, :o1, 719989200
-          tz.transition 1993, 4, :o2, 733903200
-          tz.transition 1993, 10, :o1, 752043600
-          tz.transition 1994, 4, :o2, 765352800
-          tz.transition 1994, 10, :o1, 783493200
-          tz.transition 1995, 4, :o6, 796802400
-          tz.transition 1995, 10, :o7, 814946400
-          tz.transition 1996, 4, :o6, 828860400
-          tz.transition 1996, 10, :o7, 846396000
-          tz.transition 1997, 4, :o6, 860310000
-          tz.transition 1997, 10, :o7, 877845600
-          tz.transition 1998, 4, :o6, 891759600
-          tz.transition 1998, 10, :o7, 909295200
-          tz.transition 1999, 4, :o6, 923209200
-          tz.transition 1999, 10, :o8, 941349600
-          tz.transition 2000, 4, :o9, 954662400
-          tz.transition 2000, 10, :o7, 972802800
-          tz.transition 2001, 4, :o6, 986108400
-          tz.transition 2001, 10, :o7, 1004248800
-          tz.transition 2002, 4, :o6, 1018162800
-          tz.transition 2002, 10, :o7, 1035698400
-          tz.transition 2003, 4, :o6, 1049612400
-          tz.transition 2003, 10, :o7, 1067148000
-          tz.transition 2004, 4, :o6, 1081062000
-          tz.transition 2004, 10, :o7, 1099202400
-          tz.transition 2005, 4, :o6, 1112511600
-          tz.transition 2005, 10, :o7, 1130652000
-          tz.transition 2006, 4, :o6, 1143961200
-          tz.transition 2006, 10, :o7, 1162101600
-          tz.transition 2007, 3, :o6, 1173596400
-          tz.transition 2007, 11, :o7, 1194156000
-          tz.transition 2008, 3, :o6, 1205046000
-          tz.transition 2008, 11, :o7, 1225605600
-          tz.transition 2009, 3, :o6, 1236495600
-          tz.transition 2009, 11, :o7, 1257055200
-          tz.transition 2010, 3, :o6, 1268550000
-          tz.transition 2010, 11, :o7, 1289109600
-          tz.transition 2011, 3, :o6, 1299999600
-          tz.transition 2011, 11, :o7, 1320559200
-          tz.transition 2012, 3, :o6, 1331449200
-          tz.transition 2012, 11, :o7, 1352008800
-          tz.transition 2013, 3, :o6, 1362898800
-          tz.transition 2013, 11, :o7, 1383458400
-          tz.transition 2014, 3, :o6, 1394348400
-          tz.transition 2014, 11, :o7, 1414908000
-          tz.transition 2015, 3, :o6, 1425798000
-          tz.transition 2015, 11, :o7, 1446357600
-          tz.transition 2016, 3, :o6, 1457852400
-          tz.transition 2016, 11, :o7, 1478412000
-          tz.transition 2017, 3, :o6, 1489302000
-          tz.transition 2017, 11, :o7, 1509861600
-          tz.transition 2018, 3, :o6, 1520751600
-          tz.transition 2018, 11, :o7, 1541311200
-          tz.transition 2019, 3, :o6, 1552201200
-          tz.transition 2019, 11, :o7, 1572760800
-          tz.transition 2020, 3, :o6, 1583650800
-          tz.transition 2020, 11, :o7, 1604210400
-          tz.transition 2021, 3, :o6, 1615705200
-          tz.transition 2021, 11, :o7, 1636264800
-          tz.transition 2022, 3, :o6, 1647154800
-          tz.transition 2022, 11, :o7, 1667714400
-          tz.transition 2023, 3, :o6, 1678604400
-          tz.transition 2023, 11, :o7, 1699164000
-          tz.transition 2024, 3, :o6, 1710054000
-          tz.transition 2024, 11, :o7, 1730613600
-          tz.transition 2025, 3, :o6, 1741503600
-          tz.transition 2025, 11, :o7, 1762063200
-          tz.transition 2026, 3, :o6, 1772953200
-          tz.transition 2026, 11, :o7, 1793512800
-          tz.transition 2027, 3, :o6, 1805007600
-          tz.transition 2027, 11, :o7, 1825567200
-          tz.transition 2028, 3, :o6, 1836457200
-          tz.transition 2028, 11, :o7, 1857016800
-          tz.transition 2029, 3, :o6, 1867906800
-          tz.transition 2029, 11, :o7, 1888466400
-          tz.transition 2030, 3, :o6, 1899356400
-          tz.transition 2030, 11, :o7, 1919916000
-          tz.transition 2031, 3, :o6, 1930806000
-          tz.transition 2031, 11, :o7, 1951365600
-          tz.transition 2032, 3, :o6, 1962860400
-          tz.transition 2032, 11, :o7, 1983420000
-          tz.transition 2033, 3, :o6, 1994310000
-          tz.transition 2033, 11, :o7, 2014869600
-          tz.transition 2034, 3, :o6, 2025759600
-          tz.transition 2034, 11, :o7, 2046319200
-          tz.transition 2035, 3, :o6, 2057209200
-          tz.transition 2035, 11, :o7, 2077768800
-          tz.transition 2036, 3, :o6, 2088658800
-          tz.transition 2036, 11, :o7, 2109218400
-          tz.transition 2037, 3, :o6, 2120108400
-          tz.transition 2037, 11, :o7, 2140668000
-          tz.transition 2038, 3, :o6, 59171923, 24
-          tz.transition 2038, 11, :o7, 9862939, 4
-          tz.transition 2039, 3, :o6, 59180659, 24
-          tz.transition 2039, 11, :o7, 9864395, 4
-          tz.transition 2040, 3, :o6, 59189395, 24
-          tz.transition 2040, 11, :o7, 9865851, 4
-          tz.transition 2041, 3, :o6, 59198131, 24
-          tz.transition 2041, 11, :o7, 9867307, 4
-          tz.transition 2042, 3, :o6, 59206867, 24
-          tz.transition 2042, 11, :o7, 9868763, 4
-          tz.transition 2043, 3, :o6, 59215603, 24
-          tz.transition 2043, 11, :o7, 9870219, 4
-          tz.transition 2044, 3, :o6, 59224507, 24
-          tz.transition 2044, 11, :o7, 9871703, 4
-          tz.transition 2045, 3, :o6, 59233243, 24
-          tz.transition 2045, 11, :o7, 9873159, 4
-          tz.transition 2046, 3, :o6, 59241979, 24
-          tz.transition 2046, 11, :o7, 9874615, 4
-          tz.transition 2047, 3, :o6, 59250715, 24
-          tz.transition 2047, 11, :o7, 9876071, 4
-          tz.transition 2048, 3, :o6, 59259451, 24
-          tz.transition 2048, 11, :o7, 9877527, 4
-          tz.transition 2049, 3, :o6, 59268355, 24
-          tz.transition 2049, 11, :o7, 9879011, 4
-          tz.transition 2050, 3, :o6, 59277091, 24
-          tz.transition 2050, 11, :o7, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Paramaribo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Paramaribo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Paramaribo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Paramaribo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,26 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Paramaribo
-        include TimezoneDefinition
-        
-        timezone 'America/Paramaribo' do |tz|
-          tz.offset :o0, -13240, 0, :LMT
-          tz.offset :o1, -13252, 0, :PMT
-          tz.offset :o2, -13236, 0, :PMT
-          tz.offset :o3, -12600, 0, :NEGT
-          tz.offset :o4, -12600, 0, :SRT
-          tz.offset :o5, -10800, 0, :SRT
-          
-          tz.transition 1911, 1, :o1, 5225121331, 2160
-          tz.transition 1935, 1, :o2, 52440558913, 21600
-          tz.transition 1945, 10, :o3, 17508453503, 7200
-          tz.transition 1975, 11, :o4, 185686200
-          tz.transition 1984, 10, :o5, 465449400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Phoenix.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Phoenix.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Phoenix.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Phoenix.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Phoenix
-        include TimezoneDefinition
-        
-        timezone 'America/Phoenix' do |tz|
-          tz.offset :o0, -26898, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          
-          tz.transition 1883, 11, :o1, 57819199, 24
-          tz.transition 1918, 3, :o2, 19373471, 8
-          tz.transition 1918, 10, :o1, 14531363, 6
-          tz.transition 1919, 3, :o2, 19376383, 8
-          tz.transition 1919, 10, :o1, 14533547, 6
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1944, 1, :o1, 3500770681, 1440
-          tz.transition 1944, 4, :o3, 3500901781, 1440
-          tz.transition 1944, 10, :o1, 3501165241, 1440
-          tz.transition 1967, 4, :o2, 19516887, 8
-          tz.transition 1967, 10, :o1, 14638757, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port__m__au__m__Prince.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port__m__au__m__Prince.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port__m__au__m__Prince.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port__m__au__m__Prince.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,143 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Port__m__au__m__Prince
-        include TimezoneDefinition
-        
-        timezone 'America/Port-au-Prince' do |tz|
-          tz.offset :o0, -17360, 0, :LMT
-          tz.offset :o1, -17340, 0, :PPMT
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -18000, 3600, :EDT
-          
-          tz.transition 1890, 1, :o1, 2604278197, 1080
-          tz.transition 1917, 1, :o2, 3486604609, 1440
-          tz.transition 1983, 5, :o3, 421218000
-          tz.transition 1983, 10, :o2, 436334400
-          tz.transition 1984, 4, :o3, 452062800
-          tz.transition 1984, 10, :o2, 467784000
-          tz.transition 1985, 4, :o3, 483512400
-          tz.transition 1985, 10, :o2, 499233600
-          tz.transition 1986, 4, :o3, 514962000
-          tz.transition 1986, 10, :o2, 530683200
-          tz.transition 1987, 4, :o3, 546411600
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 4, :o3, 576050400
-          tz.transition 1988, 10, :o2, 594194400
-          tz.transition 1989, 4, :o3, 607500000
-          tz.transition 1989, 10, :o2, 625644000
-          tz.transition 1990, 4, :o3, 638949600
-          tz.transition 1990, 10, :o2, 657093600
-          tz.transition 1991, 4, :o3, 671004000
-          tz.transition 1991, 10, :o2, 688543200
-          tz.transition 1992, 4, :o3, 702453600
-          tz.transition 1992, 10, :o2, 719992800
-          tz.transition 1993, 4, :o3, 733903200
-          tz.transition 1993, 10, :o2, 752047200
-          tz.transition 1994, 4, :o3, 765352800
-          tz.transition 1994, 10, :o2, 783496800
-          tz.transition 1995, 4, :o3, 796802400
-          tz.transition 1995, 10, :o2, 814946400
-          tz.transition 1996, 4, :o3, 828856800
-          tz.transition 1996, 10, :o2, 846396000
-          tz.transition 1997, 4, :o3, 860306400
-          tz.transition 1997, 10, :o2, 877845600
-          tz.transition 2005, 4, :o3, 1112504400
-          tz.transition 2005, 10, :o2, 1130644800
-          tz.transition 2006, 4, :o3, 1143954000
-          tz.transition 2006, 10, :o2, 1162094400
-          tz.transition 2007, 4, :o3, 1175403600
-          tz.transition 2007, 10, :o2, 1193544000
-          tz.transition 2008, 4, :o3, 1207458000
-          tz.transition 2008, 10, :o2, 1224993600
-          tz.transition 2009, 4, :o3, 1238907600
-          tz.transition 2009, 10, :o2, 1256443200
-          tz.transition 2010, 4, :o3, 1270357200
-          tz.transition 2010, 10, :o2, 1288497600
-          tz.transition 2011, 4, :o3, 1301806800
-          tz.transition 2011, 10, :o2, 1319947200
-          tz.transition 2012, 4, :o3, 1333256400
-          tz.transition 2012, 10, :o2, 1351396800
-          tz.transition 2013, 4, :o3, 1365310800
-          tz.transition 2013, 10, :o2, 1382846400
-          tz.transition 2014, 4, :o3, 1396760400
-          tz.transition 2014, 10, :o2, 1414296000
-          tz.transition 2015, 4, :o3, 1428210000
-          tz.transition 2015, 10, :o2, 1445745600
-          tz.transition 2016, 4, :o3, 1459659600
-          tz.transition 2016, 10, :o2, 1477800000
-          tz.transition 2017, 4, :o3, 1491109200
-          tz.transition 2017, 10, :o2, 1509249600
-          tz.transition 2018, 4, :o3, 1522558800
-          tz.transition 2018, 10, :o2, 1540699200
-          tz.transition 2019, 4, :o3, 1554613200
-          tz.transition 2019, 10, :o2, 1572148800
-          tz.transition 2020, 4, :o3, 1586062800
-          tz.transition 2020, 10, :o2, 1603598400
-          tz.transition 2021, 4, :o3, 1617512400
-          tz.transition 2021, 10, :o2, 1635652800
-          tz.transition 2022, 4, :o3, 1648962000
-          tz.transition 2022, 10, :o2, 1667102400
-          tz.transition 2023, 4, :o3, 1680411600
-          tz.transition 2023, 10, :o2, 1698552000
-          tz.transition 2024, 4, :o3, 1712466000
-          tz.transition 2024, 10, :o2, 1730001600
-          tz.transition 2025, 4, :o3, 1743915600
-          tz.transition 2025, 10, :o2, 1761451200
-          tz.transition 2026, 4, :o3, 1775365200
-          tz.transition 2026, 10, :o2, 1792900800
-          tz.transition 2027, 4, :o3, 1806814800
-          tz.transition 2027, 10, :o2, 1824955200
-          tz.transition 2028, 4, :o3, 1838264400
-          tz.transition 2028, 10, :o2, 1856404800
-          tz.transition 2029, 4, :o3, 1869714000
-          tz.transition 2029, 10, :o2, 1887854400
-          tz.transition 2030, 4, :o3, 1901768400
-          tz.transition 2030, 10, :o2, 1919304000
-          tz.transition 2031, 4, :o3, 1933218000
-          tz.transition 2031, 10, :o2, 1950753600
-          tz.transition 2032, 4, :o3, 1964667600
-          tz.transition 2032, 10, :o2, 1982808000
-          tz.transition 2033, 4, :o3, 1996117200
-          tz.transition 2033, 10, :o2, 2014257600
-          tz.transition 2034, 4, :o3, 2027566800
-          tz.transition 2034, 10, :o2, 2045707200
-          tz.transition 2035, 4, :o3, 2059016400
-          tz.transition 2035, 10, :o2, 2077156800
-          tz.transition 2036, 4, :o3, 2091070800
-          tz.transition 2036, 10, :o2, 2108606400
-          tz.transition 2037, 4, :o3, 2122520400
-          tz.transition 2037, 10, :o2, 2140056000
-          tz.transition 2038, 4, :o3, 59172425, 24
-          tz.transition 2038, 10, :o2, 7397183, 3
-          tz.transition 2039, 4, :o3, 59181161, 24
-          tz.transition 2039, 10, :o2, 7398275, 3
-          tz.transition 2040, 4, :o3, 59189897, 24
-          tz.transition 2040, 10, :o2, 7399367, 3
-          tz.transition 2041, 4, :o3, 59198801, 24
-          tz.transition 2041, 10, :o2, 7400459, 3
-          tz.transition 2042, 4, :o3, 59207537, 24
-          tz.transition 2042, 10, :o2, 7401551, 3
-          tz.transition 2043, 4, :o3, 59216273, 24
-          tz.transition 2043, 10, :o2, 7402643, 3
-          tz.transition 2044, 4, :o3, 59225009, 24
-          tz.transition 2044, 10, :o2, 7403756, 3
-          tz.transition 2045, 4, :o3, 59233745, 24
-          tz.transition 2045, 10, :o2, 7404848, 3
-          tz.transition 2046, 4, :o3, 59242481, 24
-          tz.transition 2046, 10, :o2, 7405940, 3
-          tz.transition 2047, 4, :o3, 59251385, 24
-          tz.transition 2047, 10, :o2, 7407032, 3
-          tz.transition 2048, 4, :o3, 59260121, 24
-          tz.transition 2048, 10, :o2, 7408124, 3
-          tz.transition 2049, 4, :o3, 59268857, 24
-          tz.transition 2049, 10, :o2, 7409237, 3
-          tz.transition 2050, 4, :o3, 59277593, 24
-          tz.transition 2050, 10, :o2, 7410329, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port_of_Spain.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port_of_Spain.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port_of_Spain.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Port_of_Spain.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Port_of_Spain
-        include TimezoneDefinition
-        
-        timezone 'America/Port_of_Spain' do |tz|
-          tz.offset :o0, -14764, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1912, 3, :o1, 52260415291, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Acre.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Acre.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Acre.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Acre.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Porto_Acre
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Porto_Acre', 'America/Rio_Branco'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Velho.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Velho.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Velho.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Porto_Velho.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Porto_Velho
-        include TimezoneDefinition
-        
-        timezone 'America/Porto_Velho' do |tz|
-          tz.offset :o0, -15336, 0, :LMT
-          tz.offset :o1, -14400, 0, :AMT
-          tz.offset :o2, -14400, 3600, :AMST
-          
-          tz.transition 1914, 1, :o1, 968053471, 400
-          tz.transition 1931, 10, :o2, 19412945, 8
-          tz.transition 1932, 4, :o1, 19414389, 8
-          tz.transition 1932, 10, :o2, 7280951, 3
-          tz.transition 1933, 4, :o1, 19417309, 8
-          tz.transition 1949, 12, :o2, 7299755, 3
-          tz.transition 1950, 4, :o1, 7300163, 3
-          tz.transition 1950, 12, :o2, 7300850, 3
-          tz.transition 1951, 4, :o1, 19469901, 8
-          tz.transition 1951, 12, :o2, 7301945, 3
-          tz.transition 1952, 4, :o1, 19472829, 8
-          tz.transition 1952, 12, :o2, 7303043, 3
-          tz.transition 1953, 3, :o1, 19475501, 8
-          tz.transition 1963, 12, :o2, 7315118, 3
-          tz.transition 1964, 3, :o1, 19507645, 8
-          tz.transition 1965, 1, :o2, 7316375, 3
-          tz.transition 1965, 3, :o1, 19510805, 8
-          tz.transition 1965, 12, :o2, 7317287, 3
-          tz.transition 1966, 3, :o1, 19513485, 8
-          tz.transition 1966, 11, :o2, 7318292, 3
-          tz.transition 1967, 3, :o1, 19516405, 8
-          tz.transition 1967, 11, :o2, 7319387, 3
-          tz.transition 1968, 3, :o1, 19519333, 8
-          tz.transition 1985, 11, :o2, 499752000
-          tz.transition 1986, 3, :o1, 511239600
-          tz.transition 1986, 10, :o2, 530596800
-          tz.transition 1987, 2, :o1, 540270000
-          tz.transition 1987, 10, :o2, 562132800
-          tz.transition 1988, 2, :o1, 571201200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Puerto_Rico.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Puerto_Rico.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Puerto_Rico.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Puerto_Rico.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Puerto_Rico
-        include TimezoneDefinition
-        
-        timezone 'America/Puerto_Rico' do |tz|
-          tz.offset :o0, -15865, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :AWT
-          tz.offset :o3, -14400, 3600, :APT
-          
-          tz.transition 1899, 3, :o1, 41726744933, 17280
-          tz.transition 1942, 5, :o2, 7291448, 3
-          tz.transition 1945, 8, :o3, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361489, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rainy_River.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rainy_River.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rainy_River.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rainy_River.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,181 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Rainy_River
-        include TimezoneDefinition
-        
-        timezone 'America/Rainy_River' do |tz|
-          tz.offset :o0, -22696, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -21600, 3600, :CWT
-          tz.offset :o4, -21600, 3600, :CPT
-          
-          tz.transition 1895, 1, :o1, 26062503437, 10800
-          tz.transition 1918, 4, :o2, 14530187, 6
-          tz.transition 1918, 10, :o1, 58125547, 24
-          tz.transition 1940, 9, :o2, 9719607, 4
-          tz.transition 1942, 2, :o3, 14582399, 6
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361491, 24
-          tz.transition 1974, 4, :o2, 136368000
-          tz.transition 1974, 10, :o1, 152089200
-          tz.transition 1975, 4, :o2, 167817600
-          tz.transition 1975, 10, :o1, 183538800
-          tz.transition 1976, 4, :o2, 199267200
-          tz.transition 1976, 10, :o1, 215593200
-          tz.transition 1977, 4, :o2, 230716800
-          tz.transition 1977, 10, :o1, 247042800
-          tz.transition 1978, 4, :o2, 262771200
-          tz.transition 1978, 10, :o1, 278492400
-          tz.transition 1979, 4, :o2, 294220800
-          tz.transition 1979, 10, :o1, 309942000
-          tz.transition 1980, 4, :o2, 325670400
-          tz.transition 1980, 10, :o1, 341391600
-          tz.transition 1981, 4, :o2, 357120000
-          tz.transition 1981, 10, :o1, 372841200
-          tz.transition 1982, 4, :o2, 388569600
-          tz.transition 1982, 10, :o1, 404895600
-          tz.transition 1983, 4, :o2, 420019200
-          tz.transition 1983, 10, :o1, 436345200
-          tz.transition 1984, 4, :o2, 452073600
-          tz.transition 1984, 10, :o1, 467794800
-          tz.transition 1985, 4, :o2, 483523200
-          tz.transition 1985, 10, :o1, 499244400
-          tz.transition 1986, 4, :o2, 514972800
-          tz.transition 1986, 10, :o1, 530694000
-          tz.transition 1987, 4, :o2, 544608000
-          tz.transition 1987, 10, :o1, 562143600
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594198000
-          tz.transition 1989, 4, :o2, 607507200
-          tz.transition 1989, 10, :o1, 625647600
-          tz.transition 1990, 4, :o2, 638956800
-          tz.transition 1990, 10, :o1, 657097200
-          tz.transition 1991, 4, :o2, 671011200
-          tz.transition 1991, 10, :o1, 688546800
-          tz.transition 1992, 4, :o2, 702460800
-          tz.transition 1992, 10, :o1, 719996400
-          tz.transition 1993, 4, :o2, 733910400
-          tz.transition 1993, 10, :o1, 752050800
-          tz.transition 1994, 4, :o2, 765360000
-          tz.transition 1994, 10, :o1, 783500400
-          tz.transition 1995, 4, :o2, 796809600
-          tz.transition 1995, 10, :o1, 814950000
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 4, :o2, 986112000
-          tz.transition 2001, 10, :o1, 1004252400
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 3, :o2, 1173600000
-          tz.transition 2007, 11, :o1, 1194159600
-          tz.transition 2008, 3, :o2, 1205049600
-          tz.transition 2008, 11, :o1, 1225609200
-          tz.transition 2009, 3, :o2, 1236499200
-          tz.transition 2009, 11, :o1, 1257058800
-          tz.transition 2010, 3, :o2, 1268553600
-          tz.transition 2010, 11, :o1, 1289113200
-          tz.transition 2011, 3, :o2, 1300003200
-          tz.transition 2011, 11, :o1, 1320562800
-          tz.transition 2012, 3, :o2, 1331452800
-          tz.transition 2012, 11, :o1, 1352012400
-          tz.transition 2013, 3, :o2, 1362902400
-          tz.transition 2013, 11, :o1, 1383462000
-          tz.transition 2014, 3, :o2, 1394352000
-          tz.transition 2014, 11, :o1, 1414911600
-          tz.transition 2015, 3, :o2, 1425801600
-          tz.transition 2015, 11, :o1, 1446361200
-          tz.transition 2016, 3, :o2, 1457856000
-          tz.transition 2016, 11, :o1, 1478415600
-          tz.transition 2017, 3, :o2, 1489305600
-          tz.transition 2017, 11, :o1, 1509865200
-          tz.transition 2018, 3, :o2, 1520755200
-          tz.transition 2018, 11, :o1, 1541314800
-          tz.transition 2019, 3, :o2, 1552204800
-          tz.transition 2019, 11, :o1, 1572764400
-          tz.transition 2020, 3, :o2, 1583654400
-          tz.transition 2020, 11, :o1, 1604214000
-          tz.transition 2021, 3, :o2, 1615708800
-          tz.transition 2021, 11, :o1, 1636268400
-          tz.transition 2022, 3, :o2, 1647158400
-          tz.transition 2022, 11, :o1, 1667718000
-          tz.transition 2023, 3, :o2, 1678608000
-          tz.transition 2023, 11, :o1, 1699167600
-          tz.transition 2024, 3, :o2, 1710057600
-          tz.transition 2024, 11, :o1, 1730617200
-          tz.transition 2025, 3, :o2, 1741507200
-          tz.transition 2025, 11, :o1, 1762066800
-          tz.transition 2026, 3, :o2, 1772956800
-          tz.transition 2026, 11, :o1, 1793516400
-          tz.transition 2027, 3, :o2, 1805011200
-          tz.transition 2027, 11, :o1, 1825570800
-          tz.transition 2028, 3, :o2, 1836460800
-          tz.transition 2028, 11, :o1, 1857020400
-          tz.transition 2029, 3, :o2, 1867910400
-          tz.transition 2029, 11, :o1, 1888470000
-          tz.transition 2030, 3, :o2, 1899360000
-          tz.transition 2030, 11, :o1, 1919919600
-          tz.transition 2031, 3, :o2, 1930809600
-          tz.transition 2031, 11, :o1, 1951369200
-          tz.transition 2032, 3, :o2, 1962864000
-          tz.transition 2032, 11, :o1, 1983423600
-          tz.transition 2033, 3, :o2, 1994313600
-          tz.transition 2033, 11, :o1, 2014873200
-          tz.transition 2034, 3, :o2, 2025763200
-          tz.transition 2034, 11, :o1, 2046322800
-          tz.transition 2035, 3, :o2, 2057212800
-          tz.transition 2035, 11, :o1, 2077772400
-          tz.transition 2036, 3, :o2, 2088662400
-          tz.transition 2036, 11, :o1, 2109222000
-          tz.transition 2037, 3, :o2, 2120112000
-          tz.transition 2037, 11, :o1, 2140671600
-          tz.transition 2038, 3, :o2, 14792981, 6
-          tz.transition 2038, 11, :o1, 59177635, 24
-          tz.transition 2039, 3, :o2, 14795165, 6
-          tz.transition 2039, 11, :o1, 59186371, 24
-          tz.transition 2040, 3, :o2, 14797349, 6
-          tz.transition 2040, 11, :o1, 59195107, 24
-          tz.transition 2041, 3, :o2, 14799533, 6
-          tz.transition 2041, 11, :o1, 59203843, 24
-          tz.transition 2042, 3, :o2, 14801717, 6
-          tz.transition 2042, 11, :o1, 59212579, 24
-          tz.transition 2043, 3, :o2, 14803901, 6
-          tz.transition 2043, 11, :o1, 59221315, 24
-          tz.transition 2044, 3, :o2, 14806127, 6
-          tz.transition 2044, 11, :o1, 59230219, 24
-          tz.transition 2045, 3, :o2, 14808311, 6
-          tz.transition 2045, 11, :o1, 59238955, 24
-          tz.transition 2046, 3, :o2, 14810495, 6
-          tz.transition 2046, 11, :o1, 59247691, 24
-          tz.transition 2047, 3, :o2, 14812679, 6
-          tz.transition 2047, 11, :o1, 59256427, 24
-          tz.transition 2048, 3, :o2, 14814863, 6
-          tz.transition 2048, 11, :o1, 59265163, 24
-          tz.transition 2049, 3, :o2, 14817089, 6
-          tz.transition 2049, 11, :o1, 59274067, 24
-          tz.transition 2050, 3, :o2, 14819273, 6
-          tz.transition 2050, 11, :o1, 59282803, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rankin_Inlet.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rankin_Inlet.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rankin_Inlet.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rankin_Inlet.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,174 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Rankin_Inlet
-        include TimezoneDefinition
-        
-        timezone 'America/Rankin_Inlet' do |tz|
-          tz.offset :o0, -22100, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -21600, 3600, :CWT
-          tz.offset :o4, -21600, 3600, :CPT
-          tz.offset :o5, -21600, 7200, :CDDT
-          tz.offset :o6, -18000, 0, :EST
-          
-          tz.transition 1884, 1, :o1, 2081528717, 864
-          tz.transition 1918, 4, :o2, 14530187, 6
-          tz.transition 1918, 10, :o1, 58125451, 24
-          tz.transition 1919, 5, :o2, 14532623, 6
-          tz.transition 1919, 11, :o1, 58134329, 24
-          tz.transition 1942, 2, :o3, 14582399, 6
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361491, 24
-          tz.transition 1965, 4, :o5, 9755503, 4
-          tz.transition 1965, 10, :o1, 9756259, 4
-          tz.transition 1980, 4, :o2, 325670400
-          tz.transition 1980, 10, :o1, 341391600
-          tz.transition 1981, 4, :o2, 357120000
-          tz.transition 1981, 10, :o1, 372841200
-          tz.transition 1982, 4, :o2, 388569600
-          tz.transition 1982, 10, :o1, 404895600
-          tz.transition 1983, 4, :o2, 420019200
-          tz.transition 1983, 10, :o1, 436345200
-          tz.transition 1984, 4, :o2, 452073600
-          tz.transition 1984, 10, :o1, 467794800
-          tz.transition 1985, 4, :o2, 483523200
-          tz.transition 1985, 10, :o1, 499244400
-          tz.transition 1986, 4, :o2, 514972800
-          tz.transition 1986, 10, :o1, 530694000
-          tz.transition 1987, 4, :o2, 544608000
-          tz.transition 1987, 10, :o1, 562143600
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594198000
-          tz.transition 1989, 4, :o2, 607507200
-          tz.transition 1989, 10, :o1, 625647600
-          tz.transition 1990, 4, :o2, 638956800
-          tz.transition 1990, 10, :o1, 657097200
-          tz.transition 1991, 4, :o2, 671011200
-          tz.transition 1991, 10, :o1, 688546800
-          tz.transition 1992, 4, :o2, 702460800
-          tz.transition 1992, 10, :o1, 719996400
-          tz.transition 1993, 4, :o2, 733910400
-          tz.transition 1993, 10, :o1, 752050800
-          tz.transition 1994, 4, :o2, 765360000
-          tz.transition 1994, 10, :o1, 783500400
-          tz.transition 1995, 4, :o2, 796809600
-          tz.transition 1995, 10, :o1, 814950000
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o6, 972802800
-          tz.transition 2001, 4, :o2, 986112000
-          tz.transition 2001, 10, :o1, 1004252400
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 3, :o2, 1173600000
-          tz.transition 2007, 11, :o1, 1194159600
-          tz.transition 2008, 3, :o2, 1205049600
-          tz.transition 2008, 11, :o1, 1225609200
-          tz.transition 2009, 3, :o2, 1236499200
-          tz.transition 2009, 11, :o1, 1257058800
-          tz.transition 2010, 3, :o2, 1268553600
-          tz.transition 2010, 11, :o1, 1289113200
-          tz.transition 2011, 3, :o2, 1300003200
-          tz.transition 2011, 11, :o1, 1320562800
-          tz.transition 2012, 3, :o2, 1331452800
-          tz.transition 2012, 11, :o1, 1352012400
-          tz.transition 2013, 3, :o2, 1362902400
-          tz.transition 2013, 11, :o1, 1383462000
-          tz.transition 2014, 3, :o2, 1394352000
-          tz.transition 2014, 11, :o1, 1414911600
-          tz.transition 2015, 3, :o2, 1425801600
-          tz.transition 2015, 11, :o1, 1446361200
-          tz.transition 2016, 3, :o2, 1457856000
-          tz.transition 2016, 11, :o1, 1478415600
-          tz.transition 2017, 3, :o2, 1489305600
-          tz.transition 2017, 11, :o1, 1509865200
-          tz.transition 2018, 3, :o2, 1520755200
-          tz.transition 2018, 11, :o1, 1541314800
-          tz.transition 2019, 3, :o2, 1552204800
-          tz.transition 2019, 11, :o1, 1572764400
-          tz.transition 2020, 3, :o2, 1583654400
-          tz.transition 2020, 11, :o1, 1604214000
-          tz.transition 2021, 3, :o2, 1615708800
-          tz.transition 2021, 11, :o1, 1636268400
-          tz.transition 2022, 3, :o2, 1647158400
-          tz.transition 2022, 11, :o1, 1667718000
-          tz.transition 2023, 3, :o2, 1678608000
-          tz.transition 2023, 11, :o1, 1699167600
-          tz.transition 2024, 3, :o2, 1710057600
-          tz.transition 2024, 11, :o1, 1730617200
-          tz.transition 2025, 3, :o2, 1741507200
-          tz.transition 2025, 11, :o1, 1762066800
-          tz.transition 2026, 3, :o2, 1772956800
-          tz.transition 2026, 11, :o1, 1793516400
-          tz.transition 2027, 3, :o2, 1805011200
-          tz.transition 2027, 11, :o1, 1825570800
-          tz.transition 2028, 3, :o2, 1836460800
-          tz.transition 2028, 11, :o1, 1857020400
-          tz.transition 2029, 3, :o2, 1867910400
-          tz.transition 2029, 11, :o1, 1888470000
-          tz.transition 2030, 3, :o2, 1899360000
-          tz.transition 2030, 11, :o1, 1919919600
-          tz.transition 2031, 3, :o2, 1930809600
-          tz.transition 2031, 11, :o1, 1951369200
-          tz.transition 2032, 3, :o2, 1962864000
-          tz.transition 2032, 11, :o1, 1983423600
-          tz.transition 2033, 3, :o2, 1994313600
-          tz.transition 2033, 11, :o1, 2014873200
-          tz.transition 2034, 3, :o2, 2025763200
-          tz.transition 2034, 11, :o1, 2046322800
-          tz.transition 2035, 3, :o2, 2057212800
-          tz.transition 2035, 11, :o1, 2077772400
-          tz.transition 2036, 3, :o2, 2088662400
-          tz.transition 2036, 11, :o1, 2109222000
-          tz.transition 2037, 3, :o2, 2120112000
-          tz.transition 2037, 11, :o1, 2140671600
-          tz.transition 2038, 3, :o2, 14792981, 6
-          tz.transition 2038, 11, :o1, 59177635, 24
-          tz.transition 2039, 3, :o2, 14795165, 6
-          tz.transition 2039, 11, :o1, 59186371, 24
-          tz.transition 2040, 3, :o2, 14797349, 6
-          tz.transition 2040, 11, :o1, 59195107, 24
-          tz.transition 2041, 3, :o2, 14799533, 6
-          tz.transition 2041, 11, :o1, 59203843, 24
-          tz.transition 2042, 3, :o2, 14801717, 6
-          tz.transition 2042, 11, :o1, 59212579, 24
-          tz.transition 2043, 3, :o2, 14803901, 6
-          tz.transition 2043, 11, :o1, 59221315, 24
-          tz.transition 2044, 3, :o2, 14806127, 6
-          tz.transition 2044, 11, :o1, 59230219, 24
-          tz.transition 2045, 3, :o2, 14808311, 6
-          tz.transition 2045, 11, :o1, 59238955, 24
-          tz.transition 2046, 3, :o2, 14810495, 6
-          tz.transition 2046, 11, :o1, 59247691, 24
-          tz.transition 2047, 3, :o2, 14812679, 6
-          tz.transition 2047, 11, :o1, 59256427, 24
-          tz.transition 2048, 3, :o2, 14814863, 6
-          tz.transition 2048, 11, :o1, 59265163, 24
-          tz.transition 2049, 3, :o2, 14817089, 6
-          tz.transition 2049, 11, :o1, 59274067, 24
-          tz.transition 2050, 3, :o2, 14819273, 6
-          tz.transition 2050, 11, :o1, 59282803, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Recife.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Recife.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Recife.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Recife.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,57 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Recife
-        include TimezoneDefinition
-        
-        timezone 'America/Recife' do |tz|
-          tz.offset :o0, -8376, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 8712480949, 3600
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 12, :o2, 19506981, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-          tz.transition 1988, 10, :o2, 592974000
-          tz.transition 1989, 1, :o1, 602042400
-          tz.transition 1989, 10, :o2, 624423600
-          tz.transition 1990, 2, :o1, 634701600
-          tz.transition 1999, 10, :o2, 938919600
-          tz.transition 2000, 2, :o1, 951616800
-          tz.transition 2000, 10, :o2, 970974000
-          tz.transition 2000, 10, :o1, 971575200
-          tz.transition 2001, 10, :o2, 1003028400
-          tz.transition 2002, 2, :o1, 1013911200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Regina.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Regina.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Regina.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Regina.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,74 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Regina
-        include TimezoneDefinition
-        
-        timezone 'America/Regina' do |tz|
-          tz.offset :o0, -25116, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          tz.offset :o5, -21600, 0, :CST
-          
-          tz.transition 1905, 9, :o1, 17403046493, 7200
-          tz.transition 1918, 4, :o2, 19373583, 8
-          tz.transition 1918, 10, :o1, 14531387, 6
-          tz.transition 1930, 5, :o2, 58226419, 24
-          tz.transition 1930, 10, :o1, 9705019, 4
-          tz.transition 1931, 5, :o2, 58235155, 24
-          tz.transition 1931, 10, :o1, 9706475, 4
-          tz.transition 1932, 5, :o2, 58243891, 24
-          tz.transition 1932, 10, :o1, 9707931, 4
-          tz.transition 1933, 5, :o2, 58252795, 24
-          tz.transition 1933, 10, :o1, 9709387, 4
-          tz.transition 1934, 5, :o2, 58261531, 24
-          tz.transition 1934, 10, :o1, 9710871, 4
-          tz.transition 1937, 4, :o2, 58287235, 24
-          tz.transition 1937, 10, :o1, 9715267, 4
-          tz.transition 1938, 4, :o2, 58295971, 24
-          tz.transition 1938, 10, :o1, 9716695, 4
-          tz.transition 1939, 4, :o2, 58304707, 24
-          tz.transition 1939, 10, :o1, 9718179, 4
-          tz.transition 1940, 4, :o2, 58313611, 24
-          tz.transition 1940, 10, :o1, 9719663, 4
-          tz.transition 1941, 4, :o2, 58322347, 24
-          tz.transition 1941, 10, :o1, 9721119, 4
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1946, 4, :o2, 19455399, 8
-          tz.transition 1946, 10, :o1, 14592641, 6
-          tz.transition 1947, 4, :o2, 19458423, 8
-          tz.transition 1947, 9, :o1, 14594741, 6
-          tz.transition 1948, 4, :o2, 19461335, 8
-          tz.transition 1948, 9, :o1, 14596925, 6
-          tz.transition 1949, 4, :o2, 19464247, 8
-          tz.transition 1949, 9, :o1, 14599109, 6
-          tz.transition 1950, 4, :o2, 19467215, 8
-          tz.transition 1950, 9, :o1, 14601293, 6
-          tz.transition 1951, 4, :o2, 19470127, 8
-          tz.transition 1951, 9, :o1, 14603519, 6
-          tz.transition 1952, 4, :o2, 19473039, 8
-          tz.transition 1952, 9, :o1, 14605703, 6
-          tz.transition 1953, 4, :o2, 19475951, 8
-          tz.transition 1953, 9, :o1, 14607887, 6
-          tz.transition 1954, 4, :o2, 19478863, 8
-          tz.transition 1954, 9, :o1, 14610071, 6
-          tz.transition 1955, 4, :o2, 19481775, 8
-          tz.transition 1955, 9, :o1, 14612255, 6
-          tz.transition 1956, 4, :o2, 19484743, 8
-          tz.transition 1956, 9, :o1, 14614481, 6
-          tz.transition 1957, 4, :o2, 19487655, 8
-          tz.transition 1957, 9, :o1, 14616665, 6
-          tz.transition 1959, 4, :o2, 19493479, 8
-          tz.transition 1959, 10, :o1, 14621201, 6
-          tz.transition 1960, 4, :o5, 19496391, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rio_Branco.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rio_Branco.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rio_Branco.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rio_Branco.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Rio_Branco
-        include TimezoneDefinition
-        
-        timezone 'America/Rio_Branco' do |tz|
-          tz.offset :o0, -16272, 0, :LMT
-          tz.offset :o1, -18000, 0, :ACT
-          tz.offset :o2, -18000, 3600, :ACST
-          
-          tz.transition 1914, 1, :o1, 1452080213, 600
-          tz.transition 1931, 10, :o2, 14559709, 6
-          tz.transition 1932, 4, :o1, 7280396, 3
-          tz.transition 1932, 10, :o2, 58247609, 24
-          tz.transition 1933, 4, :o1, 7281491, 3
-          tz.transition 1949, 12, :o2, 58398041, 24
-          tz.transition 1950, 4, :o1, 58401305, 24
-          tz.transition 1950, 12, :o2, 58406801, 24
-          tz.transition 1951, 4, :o1, 7301213, 3
-          tz.transition 1951, 12, :o2, 58415561, 24
-          tz.transition 1952, 4, :o1, 7302311, 3
-          tz.transition 1952, 12, :o2, 58424345, 24
-          tz.transition 1953, 3, :o1, 7303313, 3
-          tz.transition 1963, 12, :o2, 58520945, 24
-          tz.transition 1964, 3, :o1, 7315367, 3
-          tz.transition 1965, 1, :o2, 58531001, 24
-          tz.transition 1965, 3, :o1, 7316552, 3
-          tz.transition 1965, 12, :o2, 58538297, 24
-          tz.transition 1966, 3, :o1, 7317557, 3
-          tz.transition 1966, 11, :o2, 58546337, 24
-          tz.transition 1967, 3, :o1, 7318652, 3
-          tz.transition 1967, 11, :o2, 58555097, 24
-          tz.transition 1968, 3, :o1, 7319750, 3
-          tz.transition 1985, 11, :o2, 499755600
-          tz.transition 1986, 3, :o1, 511243200
-          tz.transition 1986, 10, :o2, 530600400
-          tz.transition 1987, 2, :o1, 540273600
-          tz.transition 1987, 10, :o2, 562136400
-          tz.transition 1988, 2, :o1, 571204800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rosario.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rosario.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rosario.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Rosario.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Rosario
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Rosario', 'America/Argentina/Cordoba'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santiago.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santiago.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santiago.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santiago.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,204 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Santiago
-        include TimezoneDefinition
-        
-        timezone 'America/Santiago' do |tz|
-          tz.offset :o0, -16960, 0, :LMT
-          tz.offset :o1, -16960, 0, :SMT
-          tz.offset :o2, -18000, 0, :CLT
-          tz.offset :o3, -18000, 3600, :CLST
-          tz.offset :o4, -14400, 0, :CLT
-          tz.offset :o5, -14400, 3600, :CLST
-          
-          tz.transition 1890, 1, :o1, 325534774, 135
-          tz.transition 1910, 1, :o2, 326520814, 135
-          tz.transition 1918, 9, :o3, 58124105, 24
-          tz.transition 1919, 7, :o2, 7266425, 3
-          tz.transition 1927, 9, :o3, 58202993, 24
-          tz.transition 1928, 4, :o2, 7276013, 3
-          tz.transition 1928, 9, :o3, 58211777, 24
-          tz.transition 1929, 4, :o2, 7277108, 3
-          tz.transition 1929, 9, :o3, 58220537, 24
-          tz.transition 1930, 4, :o2, 7278203, 3
-          tz.transition 1930, 9, :o3, 58229297, 24
-          tz.transition 1931, 4, :o2, 7279298, 3
-          tz.transition 1931, 9, :o3, 58238057, 24
-          tz.transition 1932, 4, :o2, 7280396, 3
-          tz.transition 1932, 9, :o4, 58246841, 24
-          tz.transition 1966, 10, :o5, 7318223, 3
-          tz.transition 1967, 3, :o4, 19516493, 8
-          tz.transition 1967, 10, :o5, 7319336, 3
-          tz.transition 1968, 3, :o4, 19519405, 8
-          tz.transition 1968, 10, :o5, 7320428, 3
-          tz.transition 1969, 3, :o4, 19522317, 8
-          tz.transition 1969, 10, :o5, 7321520, 3
-          tz.transition 1970, 3, :o4, 6318000
-          tz.transition 1970, 10, :o5, 24465600
-          tz.transition 1971, 3, :o4, 37767600
-          tz.transition 1971, 10, :o5, 55915200
-          tz.transition 1972, 3, :o4, 69217200
-          tz.transition 1972, 10, :o5, 87969600
-          tz.transition 1973, 3, :o4, 100666800
-          tz.transition 1973, 10, :o5, 119419200
-          tz.transition 1974, 3, :o4, 132116400
-          tz.transition 1974, 10, :o5, 150868800
-          tz.transition 1975, 3, :o4, 163566000
-          tz.transition 1975, 10, :o5, 182318400
-          tz.transition 1976, 3, :o4, 195620400
-          tz.transition 1976, 10, :o5, 213768000
-          tz.transition 1977, 3, :o4, 227070000
-          tz.transition 1977, 10, :o5, 245217600
-          tz.transition 1978, 3, :o4, 258519600
-          tz.transition 1978, 10, :o5, 277272000
-          tz.transition 1979, 3, :o4, 289969200
-          tz.transition 1979, 10, :o5, 308721600
-          tz.transition 1980, 3, :o4, 321418800
-          tz.transition 1980, 10, :o5, 340171200
-          tz.transition 1981, 3, :o4, 353473200
-          tz.transition 1981, 10, :o5, 371620800
-          tz.transition 1982, 3, :o4, 384922800
-          tz.transition 1982, 10, :o5, 403070400
-          tz.transition 1983, 3, :o4, 416372400
-          tz.transition 1983, 10, :o5, 434520000
-          tz.transition 1984, 3, :o4, 447822000
-          tz.transition 1984, 10, :o5, 466574400
-          tz.transition 1985, 3, :o4, 479271600
-          tz.transition 1985, 10, :o5, 498024000
-          tz.transition 1986, 3, :o4, 510721200
-          tz.transition 1986, 10, :o5, 529473600
-          tz.transition 1987, 3, :o4, 542775600
-          tz.transition 1987, 10, :o5, 560923200
-          tz.transition 1988, 3, :o4, 574225200
-          tz.transition 1988, 10, :o5, 592372800
-          tz.transition 1989, 3, :o4, 605674800
-          tz.transition 1989, 10, :o5, 624427200
-          tz.transition 1990, 3, :o4, 637124400
-          tz.transition 1990, 10, :o5, 655876800
-          tz.transition 1991, 3, :o4, 668574000
-          tz.transition 1991, 10, :o5, 687326400
-          tz.transition 1992, 3, :o4, 700628400
-          tz.transition 1992, 10, :o5, 718776000
-          tz.transition 1993, 3, :o4, 732078000
-          tz.transition 1993, 10, :o5, 750225600
-          tz.transition 1994, 3, :o4, 763527600
-          tz.transition 1994, 10, :o5, 781675200
-          tz.transition 1995, 3, :o4, 794977200
-          tz.transition 1995, 10, :o5, 813729600
-          tz.transition 1996, 3, :o4, 826426800
-          tz.transition 1996, 10, :o5, 845179200
-          tz.transition 1997, 3, :o4, 857876400
-          tz.transition 1997, 10, :o5, 876628800
-          tz.transition 1998, 3, :o4, 889930800
-          tz.transition 1998, 9, :o5, 906868800
-          tz.transition 1999, 4, :o4, 923194800
-          tz.transition 1999, 10, :o5, 939528000
-          tz.transition 2000, 3, :o4, 952830000
-          tz.transition 2000, 10, :o5, 971582400
-          tz.transition 2001, 3, :o4, 984279600
-          tz.transition 2001, 10, :o5, 1003032000
-          tz.transition 2002, 3, :o4, 1015729200
-          tz.transition 2002, 10, :o5, 1034481600
-          tz.transition 2003, 3, :o4, 1047178800
-          tz.transition 2003, 10, :o5, 1065931200
-          tz.transition 2004, 3, :o4, 1079233200
-          tz.transition 2004, 10, :o5, 1097380800
-          tz.transition 2005, 3, :o4, 1110682800
-          tz.transition 2005, 10, :o5, 1128830400
-          tz.transition 2006, 3, :o4, 1142132400
-          tz.transition 2006, 10, :o5, 1160884800
-          tz.transition 2007, 3, :o4, 1173582000
-          tz.transition 2007, 10, :o5, 1192334400
-          tz.transition 2008, 3, :o4, 1205031600
-          tz.transition 2008, 10, :o5, 1223784000
-          tz.transition 2009, 3, :o4, 1237086000
-          tz.transition 2009, 10, :o5, 1255233600
-          tz.transition 2010, 3, :o4, 1268535600
-          tz.transition 2010, 10, :o5, 1286683200
-          tz.transition 2011, 3, :o4, 1299985200
-          tz.transition 2011, 10, :o5, 1318132800
-          tz.transition 2012, 3, :o4, 1331434800
-          tz.transition 2012, 10, :o5, 1350187200
-          tz.transition 2013, 3, :o4, 1362884400
-          tz.transition 2013, 10, :o5, 1381636800
-          tz.transition 2014, 3, :o4, 1394334000
-          tz.transition 2014, 10, :o5, 1413086400
-          tz.transition 2015, 3, :o4, 1426388400
-          tz.transition 2015, 10, :o5, 1444536000
-          tz.transition 2016, 3, :o4, 1457838000
-          tz.transition 2016, 10, :o5, 1475985600
-          tz.transition 2017, 3, :o4, 1489287600
-          tz.transition 2017, 10, :o5, 1508040000
-          tz.transition 2018, 3, :o4, 1520737200
-          tz.transition 2018, 10, :o5, 1539489600
-          tz.transition 2019, 3, :o4, 1552186800
-          tz.transition 2019, 10, :o5, 1570939200
-          tz.transition 2020, 3, :o4, 1584241200
-          tz.transition 2020, 10, :o5, 1602388800
-          tz.transition 2021, 3, :o4, 1615690800
-          tz.transition 2021, 10, :o5, 1633838400
-          tz.transition 2022, 3, :o4, 1647140400
-          tz.transition 2022, 10, :o5, 1665288000
-          tz.transition 2023, 3, :o4, 1678590000
-          tz.transition 2023, 10, :o5, 1697342400
-          tz.transition 2024, 3, :o4, 1710039600
-          tz.transition 2024, 10, :o5, 1728792000
-          tz.transition 2025, 3, :o4, 1741489200
-          tz.transition 2025, 10, :o5, 1760241600
-          tz.transition 2026, 3, :o4, 1773543600
-          tz.transition 2026, 10, :o5, 1791691200
-          tz.transition 2027, 3, :o4, 1804993200
-          tz.transition 2027, 10, :o5, 1823140800
-          tz.transition 2028, 3, :o4, 1836442800
-          tz.transition 2028, 10, :o5, 1855195200
-          tz.transition 2029, 3, :o4, 1867892400
-          tz.transition 2029, 10, :o5, 1886644800
-          tz.transition 2030, 3, :o4, 1899342000
-          tz.transition 2030, 10, :o5, 1918094400
-          tz.transition 2031, 3, :o4, 1930791600
-          tz.transition 2031, 10, :o5, 1949544000
-          tz.transition 2032, 3, :o4, 1962846000
-          tz.transition 2032, 10, :o5, 1980993600
-          tz.transition 2033, 3, :o4, 1994295600
-          tz.transition 2033, 10, :o5, 2012443200
-          tz.transition 2034, 3, :o4, 2025745200
-          tz.transition 2034, 10, :o5, 2044497600
-          tz.transition 2035, 3, :o4, 2057194800
-          tz.transition 2035, 10, :o5, 2075947200
-          tz.transition 2036, 3, :o4, 2088644400
-          tz.transition 2036, 10, :o5, 2107396800
-          tz.transition 2037, 3, :o4, 2120698800
-          tz.transition 2037, 10, :o5, 2138846400
-          tz.transition 2038, 3, :o4, 19723973, 8
-          tz.transition 2038, 10, :o5, 7397120, 3
-          tz.transition 2039, 3, :o4, 19726885, 8
-          tz.transition 2039, 10, :o5, 7398212, 3
-          tz.transition 2040, 3, :o4, 19729797, 8
-          tz.transition 2040, 10, :o5, 7399325, 3
-          tz.transition 2041, 3, :o4, 19732709, 8
-          tz.transition 2041, 10, :o5, 7400417, 3
-          tz.transition 2042, 3, :o4, 19735621, 8
-          tz.transition 2042, 10, :o5, 7401509, 3
-          tz.transition 2043, 3, :o4, 19738589, 8
-          tz.transition 2043, 10, :o5, 7402601, 3
-          tz.transition 2044, 3, :o4, 19741501, 8
-          tz.transition 2044, 10, :o5, 7403693, 3
-          tz.transition 2045, 3, :o4, 19744413, 8
-          tz.transition 2045, 10, :o5, 7404806, 3
-          tz.transition 2046, 3, :o4, 19747325, 8
-          tz.transition 2046, 10, :o5, 7405898, 3
-          tz.transition 2047, 3, :o4, 19750237, 8
-          tz.transition 2047, 10, :o5, 7406990, 3
-          tz.transition 2048, 3, :o4, 19753205, 8
-          tz.transition 2048, 10, :o5, 7408082, 3
-          tz.transition 2049, 3, :o4, 19756117, 8
-          tz.transition 2049, 10, :o5, 7409174, 3
-          tz.transition 2050, 3, :o4, 19759029, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santo_Domingo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santo_Domingo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santo_Domingo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Santo_Domingo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,38 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Santo_Domingo
-        include TimezoneDefinition
-        
-        timezone 'America/Santo_Domingo' do |tz|
-          tz.offset :o0, -16776, 0, :LMT
-          tz.offset :o1, -16800, 0, :SDMT
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -18000, 3600, :EDT
-          tz.offset :o4, -18000, 1800, :EHDT
-          tz.offset :o5, -14400, 0, :AST
-          
-          tz.transition 1890, 1, :o1, 2893642433, 1200
-          tz.transition 1933, 4, :o2, 87377911, 36
-          tz.transition 1966, 10, :o3, 58546289, 24
-          tz.transition 1967, 2, :o2, 7318649, 3
-          tz.transition 1969, 10, :o4, 58572497, 24
-          tz.transition 1970, 2, :o2, 4422600
-          tz.transition 1970, 10, :o4, 25678800
-          tz.transition 1971, 1, :o2, 33193800
-          tz.transition 1971, 10, :o4, 57733200
-          tz.transition 1972, 1, :o2, 64816200
-          tz.transition 1972, 10, :o4, 89182800
-          tz.transition 1973, 1, :o2, 96438600
-          tz.transition 1973, 10, :o4, 120632400
-          tz.transition 1974, 1, :o2, 127974600
-          tz.transition 1974, 10, :o5, 152082000
-          tz.transition 2000, 10, :o2, 972799200
-          tz.transition 2000, 12, :o5, 975823200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Sao_Paulo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Sao_Paulo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Sao_Paulo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Sao_Paulo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,171 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Sao_Paulo
-        include TimezoneDefinition
-        
-        timezone 'America/Sao_Paulo' do |tz|
-          tz.offset :o0, -11188, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 52274886397, 21600
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 10, :o2, 19506605, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-          tz.transition 1988, 10, :o2, 592974000
-          tz.transition 1989, 1, :o1, 602042400
-          tz.transition 1989, 10, :o2, 624423600
-          tz.transition 1990, 2, :o1, 634701600
-          tz.transition 1990, 10, :o2, 656478000
-          tz.transition 1991, 2, :o1, 666756000
-          tz.transition 1991, 10, :o2, 687927600
-          tz.transition 1992, 2, :o1, 697600800
-          tz.transition 1992, 10, :o2, 719982000
-          tz.transition 1993, 1, :o1, 728445600
-          tz.transition 1993, 10, :o2, 750826800
-          tz.transition 1994, 2, :o1, 761709600
-          tz.transition 1994, 10, :o2, 782276400
-          tz.transition 1995, 2, :o1, 793159200
-          tz.transition 1995, 10, :o2, 813726000
-          tz.transition 1996, 2, :o1, 824004000
-          tz.transition 1996, 10, :o2, 844570800
-          tz.transition 1997, 2, :o1, 856058400
-          tz.transition 1997, 10, :o2, 876106800
-          tz.transition 1998, 3, :o1, 888717600
-          tz.transition 1998, 10, :o2, 908074800
-          tz.transition 1999, 2, :o1, 919562400
-          tz.transition 1999, 10, :o2, 938919600
-          tz.transition 2000, 2, :o1, 951616800
-          tz.transition 2000, 10, :o2, 970974000
-          tz.transition 2001, 2, :o1, 982461600
-          tz.transition 2001, 10, :o2, 1003028400
-          tz.transition 2002, 2, :o1, 1013911200
-          tz.transition 2002, 11, :o2, 1036292400
-          tz.transition 2003, 2, :o1, 1045360800
-          tz.transition 2003, 10, :o2, 1066532400
-          tz.transition 2004, 2, :o1, 1076810400
-          tz.transition 2004, 11, :o2, 1099364400
-          tz.transition 2005, 2, :o1, 1108864800
-          tz.transition 2005, 10, :o2, 1129431600
-          tz.transition 2006, 2, :o1, 1140314400
-          tz.transition 2006, 11, :o2, 1162695600
-          tz.transition 2007, 2, :o1, 1172368800
-          tz.transition 2007, 11, :o2, 1194145200
-          tz.transition 2008, 2, :o1, 1203818400
-          tz.transition 2008, 11, :o2, 1225594800
-          tz.transition 2009, 2, :o1, 1235268000
-          tz.transition 2009, 11, :o2, 1257044400
-          tz.transition 2010, 2, :o1, 1267322400
-          tz.transition 2010, 11, :o2, 1289098800
-          tz.transition 2011, 2, :o1, 1298772000
-          tz.transition 2011, 11, :o2, 1320548400
-          tz.transition 2012, 2, :o1, 1330221600
-          tz.transition 2012, 11, :o2, 1351998000
-          tz.transition 2013, 2, :o1, 1361671200
-          tz.transition 2013, 11, :o2, 1383447600
-          tz.transition 2014, 2, :o1, 1393120800
-          tz.transition 2014, 11, :o2, 1414897200
-          tz.transition 2015, 2, :o1, 1424570400
-          tz.transition 2015, 11, :o2, 1446346800
-          tz.transition 2016, 2, :o1, 1456624800
-          tz.transition 2016, 11, :o2, 1478401200
-          tz.transition 2017, 2, :o1, 1488074400
-          tz.transition 2017, 11, :o2, 1509850800
-          tz.transition 2018, 2, :o1, 1519524000
-          tz.transition 2018, 11, :o2, 1541300400
-          tz.transition 2019, 2, :o1, 1550973600
-          tz.transition 2019, 11, :o2, 1572750000
-          tz.transition 2020, 2, :o1, 1582423200
-          tz.transition 2020, 11, :o2, 1604199600
-          tz.transition 2021, 2, :o1, 1614477600
-          tz.transition 2021, 11, :o2, 1636254000
-          tz.transition 2022, 2, :o1, 1645927200
-          tz.transition 2022, 11, :o2, 1667703600
-          tz.transition 2023, 2, :o1, 1677376800
-          tz.transition 2023, 11, :o2, 1699153200
-          tz.transition 2024, 2, :o1, 1708826400
-          tz.transition 2024, 11, :o2, 1730602800
-          tz.transition 2025, 2, :o1, 1740276000
-          tz.transition 2025, 11, :o2, 1762052400
-          tz.transition 2026, 2, :o1, 1771725600
-          tz.transition 2026, 11, :o2, 1793502000
-          tz.transition 2027, 2, :o1, 1803780000
-          tz.transition 2027, 11, :o2, 1825556400
-          tz.transition 2028, 2, :o1, 1835229600
-          tz.transition 2028, 11, :o2, 1857006000
-          tz.transition 2029, 2, :o1, 1866679200
-          tz.transition 2029, 11, :o2, 1888455600
-          tz.transition 2030, 2, :o1, 1898128800
-          tz.transition 2030, 11, :o2, 1919905200
-          tz.transition 2031, 2, :o1, 1929578400
-          tz.transition 2031, 11, :o2, 1951354800
-          tz.transition 2032, 2, :o1, 1961632800
-          tz.transition 2032, 11, :o2, 1983409200
-          tz.transition 2033, 2, :o1, 1993082400
-          tz.transition 2033, 11, :o2, 2014858800
-          tz.transition 2034, 2, :o1, 2024532000
-          tz.transition 2034, 11, :o2, 2046308400
-          tz.transition 2035, 2, :o1, 2055981600
-          tz.transition 2035, 11, :o2, 2077758000
-          tz.transition 2036, 2, :o1, 2087431200
-          tz.transition 2036, 11, :o2, 2109207600
-          tz.transition 2037, 2, :o1, 2118880800
-          tz.transition 2037, 11, :o2, 2140657200
-          tz.transition 2038, 2, :o1, 29585791, 12
-          tz.transition 2038, 11, :o2, 19725877, 8
-          tz.transition 2039, 2, :o1, 29590159, 12
-          tz.transition 2039, 11, :o2, 19728789, 8
-          tz.transition 2040, 2, :o1, 29594527, 12
-          tz.transition 2040, 11, :o2, 19731701, 8
-          tz.transition 2041, 2, :o1, 29598895, 12
-          tz.transition 2041, 11, :o2, 19734613, 8
-          tz.transition 2042, 2, :o1, 29603263, 12
-          tz.transition 2042, 11, :o2, 19737525, 8
-          tz.transition 2043, 2, :o1, 29607631, 12
-          tz.transition 2043, 11, :o2, 19740437, 8
-          tz.transition 2044, 2, :o1, 29612083, 12
-          tz.transition 2044, 11, :o2, 19743405, 8
-          tz.transition 2045, 2, :o1, 29616451, 12
-          tz.transition 2045, 11, :o2, 19746317, 8
-          tz.transition 2046, 2, :o1, 29620819, 12
-          tz.transition 2046, 11, :o2, 19749229, 8
-          tz.transition 2047, 2, :o1, 29625187, 12
-          tz.transition 2047, 11, :o2, 19752141, 8
-          tz.transition 2048, 2, :o1, 29629555, 12
-          tz.transition 2048, 11, :o2, 19755053, 8
-          tz.transition 2049, 2, :o1, 29634007, 12
-          tz.transition 2049, 11, :o2, 19758021, 8
-          tz.transition 2050, 2, :o1, 29638375, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Scoresbysund.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Scoresbysund.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Scoresbysund.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Scoresbysund.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Scoresbysund
-        include TimezoneDefinition
-        
-        timezone 'America/Scoresbysund' do |tz|
-          tz.offset :o0, -5272, 0, :LMT
-          tz.offset :o1, -7200, 0, :CGT
-          tz.offset :o2, -7200, 3600, :CGST
-          tz.offset :o3, -3600, 3600, :EGST
-          tz.offset :o4, -3600, 0, :EGT
-          
-          tz.transition 1916, 7, :o1, 26147583659, 10800
-          tz.transition 1980, 4, :o2, 323841600
-          tz.transition 1980, 9, :o1, 338961600
-          tz.transition 1981, 3, :o3, 354679200
-          tz.transition 1981, 9, :o4, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o4, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o4, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o4, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o4, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o4, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o4, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o4, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o4, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o4, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o4, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o4, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o4, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o4, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o4, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o4, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o4, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o4, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o4, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o4, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o4, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Shiprock.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Shiprock.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Shiprock.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Shiprock.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Shiprock
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Shiprock', 'America/Denver'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Johns.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Johns.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Johns.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Johns.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,288 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module St_Johns
-        include TimezoneDefinition
-        
-        timezone 'America/St_Johns' do |tz|
-          tz.offset :o0, -12652, 0, :LMT
-          tz.offset :o1, -12652, 0, :NST
-          tz.offset :o2, -12652, 3600, :NDT
-          tz.offset :o3, -12600, 0, :NST
-          tz.offset :o4, -12600, 3600, :NDT
-          tz.offset :o5, -12600, 3600, :NWT
-          tz.offset :o6, -12600, 3600, :NPT
-          tz.offset :o7, -12600, 7200, :NDDT
-          
-          tz.transition 1884, 1, :o1, 52038215563, 21600
-          tz.transition 1917, 4, :o2, 52300657363, 21600
-          tz.transition 1917, 9, :o1, 52304155663, 21600
-          tz.transition 1918, 4, :o2, 52308670963, 21600
-          tz.transition 1918, 10, :o1, 52312990063, 21600
-          tz.transition 1919, 5, :o2, 52317027463, 21600
-          tz.transition 1919, 8, :o1, 52319164963, 21600
-          tz.transition 1920, 5, :o2, 52324868263, 21600
-          tz.transition 1920, 11, :o1, 52328798563, 21600
-          tz.transition 1921, 5, :o2, 52332730663, 21600
-          tz.transition 1921, 10, :o1, 52336660963, 21600
-          tz.transition 1922, 5, :o2, 52340744263, 21600
-          tz.transition 1922, 10, :o1, 52344523363, 21600
-          tz.transition 1923, 5, :o2, 52348606663, 21600
-          tz.transition 1923, 10, :o1, 52352385763, 21600
-          tz.transition 1924, 5, :o2, 52356469063, 21600
-          tz.transition 1924, 10, :o1, 52360248163, 21600
-          tz.transition 1925, 5, :o2, 52364331463, 21600
-          tz.transition 1925, 10, :o1, 52368110563, 21600
-          tz.transition 1926, 5, :o2, 52372193863, 21600
-          tz.transition 1926, 11, :o1, 52376124163, 21600
-          tz.transition 1927, 5, :o2, 52380056263, 21600
-          tz.transition 1927, 10, :o1, 52383986563, 21600
-          tz.transition 1928, 5, :o2, 52388069863, 21600
-          tz.transition 1928, 10, :o1, 52391848963, 21600
-          tz.transition 1929, 5, :o2, 52395932263, 21600
-          tz.transition 1929, 10, :o1, 52399711363, 21600
-          tz.transition 1930, 5, :o2, 52403794663, 21600
-          tz.transition 1930, 10, :o1, 52407573763, 21600
-          tz.transition 1931, 5, :o2, 52411657063, 21600
-          tz.transition 1931, 10, :o1, 52415436163, 21600
-          tz.transition 1932, 5, :o2, 52419519463, 21600
-          tz.transition 1932, 10, :o1, 52423449763, 21600
-          tz.transition 1933, 5, :o2, 52427533063, 21600
-          tz.transition 1933, 10, :o1, 52431312163, 21600
-          tz.transition 1934, 5, :o2, 52435395463, 21600
-          tz.transition 1934, 10, :o1, 52439174563, 21600
-          tz.transition 1935, 3, :o3, 52442459563, 21600
-          tz.transition 1935, 5, :o4, 116540573, 48
-          tz.transition 1935, 10, :o3, 38849657, 16
-          tz.transition 1936, 5, :o4, 116558383, 48
-          tz.transition 1936, 10, :o3, 116565437, 48
-          tz.transition 1937, 5, :o4, 116575855, 48
-          tz.transition 1937, 10, :o3, 116582909, 48
-          tz.transition 1938, 5, :o4, 116593327, 48
-          tz.transition 1938, 10, :o3, 116600381, 48
-          tz.transition 1939, 5, :o4, 116611135, 48
-          tz.transition 1939, 10, :o3, 116617853, 48
-          tz.transition 1940, 5, :o4, 116628607, 48
-          tz.transition 1940, 10, :o3, 116635661, 48
-          tz.transition 1941, 5, :o4, 116646079, 48
-          tz.transition 1941, 10, :o3, 116653133, 48
-          tz.transition 1942, 5, :o5, 116663551, 48
-          tz.transition 1945, 8, :o6, 58360379, 24
-          tz.transition 1945, 9, :o3, 38907659, 16
-          tz.transition 1946, 5, :o4, 116733731, 48
-          tz.transition 1946, 10, :o3, 38913595, 16
-          tz.transition 1947, 5, :o4, 116751203, 48
-          tz.transition 1947, 10, :o3, 38919419, 16
-          tz.transition 1948, 5, :o4, 116768675, 48
-          tz.transition 1948, 10, :o3, 38925243, 16
-          tz.transition 1949, 5, :o4, 116786147, 48
-          tz.transition 1949, 10, :o3, 38931067, 16
-          tz.transition 1950, 5, :o4, 116803955, 48
-          tz.transition 1950, 10, :o3, 38937003, 16
-          tz.transition 1951, 4, :o4, 116820755, 48
-          tz.transition 1951, 9, :o3, 38942715, 16
-          tz.transition 1952, 4, :o4, 116838227, 48
-          tz.transition 1952, 9, :o3, 38948539, 16
-          tz.transition 1953, 4, :o4, 116855699, 48
-          tz.transition 1953, 9, :o3, 38954363, 16
-          tz.transition 1954, 4, :o4, 116873171, 48
-          tz.transition 1954, 9, :o3, 38960187, 16
-          tz.transition 1955, 4, :o4, 116890643, 48
-          tz.transition 1955, 9, :o3, 38966011, 16
-          tz.transition 1956, 4, :o4, 116908451, 48
-          tz.transition 1956, 9, :o3, 38971947, 16
-          tz.transition 1957, 4, :o4, 116925923, 48
-          tz.transition 1957, 9, :o3, 38977771, 16
-          tz.transition 1958, 4, :o4, 116943395, 48
-          tz.transition 1958, 9, :o3, 38983595, 16
-          tz.transition 1959, 4, :o4, 116960867, 48
-          tz.transition 1959, 9, :o3, 38989419, 16
-          tz.transition 1960, 4, :o4, 116978339, 48
-          tz.transition 1960, 10, :o3, 38995803, 16
-          tz.transition 1961, 4, :o4, 116996147, 48
-          tz.transition 1961, 10, :o3, 39001627, 16
-          tz.transition 1962, 4, :o4, 117013619, 48
-          tz.transition 1962, 10, :o3, 39007451, 16
-          tz.transition 1963, 4, :o4, 117031091, 48
-          tz.transition 1963, 10, :o3, 39013275, 16
-          tz.transition 1964, 4, :o4, 117048563, 48
-          tz.transition 1964, 10, :o3, 39019099, 16
-          tz.transition 1965, 4, :o4, 117066035, 48
-          tz.transition 1965, 10, :o3, 39025035, 16
-          tz.transition 1966, 4, :o4, 117083507, 48
-          tz.transition 1966, 10, :o3, 39030859, 16
-          tz.transition 1967, 4, :o4, 117101315, 48
-          tz.transition 1967, 10, :o3, 39036683, 16
-          tz.transition 1968, 4, :o4, 117118787, 48
-          tz.transition 1968, 10, :o3, 39042507, 16
-          tz.transition 1969, 4, :o4, 117136259, 48
-          tz.transition 1969, 10, :o3, 39048331, 16
-          tz.transition 1970, 4, :o4, 9955800
-          tz.transition 1970, 10, :o3, 25677000
-          tz.transition 1971, 4, :o4, 41405400
-          tz.transition 1971, 10, :o3, 57731400
-          tz.transition 1972, 4, :o4, 73459800
-          tz.transition 1972, 10, :o3, 89181000
-          tz.transition 1973, 4, :o4, 104909400
-          tz.transition 1973, 10, :o3, 120630600
-          tz.transition 1974, 4, :o4, 136359000
-          tz.transition 1974, 10, :o3, 152080200
-          tz.transition 1975, 4, :o4, 167808600
-          tz.transition 1975, 10, :o3, 183529800
-          tz.transition 1976, 4, :o4, 199258200
-          tz.transition 1976, 10, :o3, 215584200
-          tz.transition 1977, 4, :o4, 230707800
-          tz.transition 1977, 10, :o3, 247033800
-          tz.transition 1978, 4, :o4, 262762200
-          tz.transition 1978, 10, :o3, 278483400
-          tz.transition 1979, 4, :o4, 294211800
-          tz.transition 1979, 10, :o3, 309933000
-          tz.transition 1980, 4, :o4, 325661400
-          tz.transition 1980, 10, :o3, 341382600
-          tz.transition 1981, 4, :o4, 357111000
-          tz.transition 1981, 10, :o3, 372832200
-          tz.transition 1982, 4, :o4, 388560600
-          tz.transition 1982, 10, :o3, 404886600
-          tz.transition 1983, 4, :o4, 420010200
-          tz.transition 1983, 10, :o3, 436336200
-          tz.transition 1984, 4, :o4, 452064600
-          tz.transition 1984, 10, :o3, 467785800
-          tz.transition 1985, 4, :o4, 483514200
-          tz.transition 1985, 10, :o3, 499235400
-          tz.transition 1986, 4, :o4, 514963800
-          tz.transition 1986, 10, :o3, 530685000
-          tz.transition 1987, 4, :o4, 544591860
-          tz.transition 1987, 10, :o3, 562127460
-          tz.transition 1988, 4, :o7, 576041460
-          tz.transition 1988, 10, :o3, 594178260
-          tz.transition 1989, 4, :o4, 607491060
-          tz.transition 1989, 10, :o3, 625631460
-          tz.transition 1990, 4, :o4, 638940660
-          tz.transition 1990, 10, :o3, 657081060
-          tz.transition 1991, 4, :o4, 670995060
-          tz.transition 1991, 10, :o3, 688530660
-          tz.transition 1992, 4, :o4, 702444660
-          tz.transition 1992, 10, :o3, 719980260
-          tz.transition 1993, 4, :o4, 733894260
-          tz.transition 1993, 10, :o3, 752034660
-          tz.transition 1994, 4, :o4, 765343860
-          tz.transition 1994, 10, :o3, 783484260
-          tz.transition 1995, 4, :o4, 796793460
-          tz.transition 1995, 10, :o3, 814933860
-          tz.transition 1996, 4, :o4, 828847860
-          tz.transition 1996, 10, :o3, 846383460
-          tz.transition 1997, 4, :o4, 860297460
-          tz.transition 1997, 10, :o3, 877833060
-          tz.transition 1998, 4, :o4, 891747060
-          tz.transition 1998, 10, :o3, 909282660
-          tz.transition 1999, 4, :o4, 923196660
-          tz.transition 1999, 10, :o3, 941337060
-          tz.transition 2000, 4, :o4, 954646260
-          tz.transition 2000, 10, :o3, 972786660
-          tz.transition 2001, 4, :o4, 986095860
-          tz.transition 2001, 10, :o3, 1004236260
-          tz.transition 2002, 4, :o4, 1018150260
-          tz.transition 2002, 10, :o3, 1035685860
-          tz.transition 2003, 4, :o4, 1049599860
-          tz.transition 2003, 10, :o3, 1067135460
-          tz.transition 2004, 4, :o4, 1081049460
-          tz.transition 2004, 10, :o3, 1099189860
-          tz.transition 2005, 4, :o4, 1112499060
-          tz.transition 2005, 10, :o3, 1130639460
-          tz.transition 2006, 4, :o4, 1143948660
-          tz.transition 2006, 10, :o3, 1162089060
-          tz.transition 2007, 3, :o4, 1173583860
-          tz.transition 2007, 11, :o3, 1194143460
-          tz.transition 2008, 3, :o4, 1205033460
-          tz.transition 2008, 11, :o3, 1225593060
-          tz.transition 2009, 3, :o4, 1236483060
-          tz.transition 2009, 11, :o3, 1257042660
-          tz.transition 2010, 3, :o4, 1268537460
-          tz.transition 2010, 11, :o3, 1289097060
-          tz.transition 2011, 3, :o4, 1299987060
-          tz.transition 2011, 11, :o3, 1320546660
-          tz.transition 2012, 3, :o4, 1331436660
-          tz.transition 2012, 11, :o3, 1351996260
-          tz.transition 2013, 3, :o4, 1362886260
-          tz.transition 2013, 11, :o3, 1383445860
-          tz.transition 2014, 3, :o4, 1394335860
-          tz.transition 2014, 11, :o3, 1414895460
-          tz.transition 2015, 3, :o4, 1425785460
-          tz.transition 2015, 11, :o3, 1446345060
-          tz.transition 2016, 3, :o4, 1457839860
-          tz.transition 2016, 11, :o3, 1478399460
-          tz.transition 2017, 3, :o4, 1489289460
-          tz.transition 2017, 11, :o3, 1509849060
-          tz.transition 2018, 3, :o4, 1520739060
-          tz.transition 2018, 11, :o3, 1541298660
-          tz.transition 2019, 3, :o4, 1552188660
-          tz.transition 2019, 11, :o3, 1572748260
-          tz.transition 2020, 3, :o4, 1583638260
-          tz.transition 2020, 11, :o3, 1604197860
-          tz.transition 2021, 3, :o4, 1615692660
-          tz.transition 2021, 11, :o3, 1636252260
-          tz.transition 2022, 3, :o4, 1647142260
-          tz.transition 2022, 11, :o3, 1667701860
-          tz.transition 2023, 3, :o4, 1678591860
-          tz.transition 2023, 11, :o3, 1699151460
-          tz.transition 2024, 3, :o4, 1710041460
-          tz.transition 2024, 11, :o3, 1730601060
-          tz.transition 2025, 3, :o4, 1741491060
-          tz.transition 2025, 11, :o3, 1762050660
-          tz.transition 2026, 3, :o4, 1772940660
-          tz.transition 2026, 11, :o3, 1793500260
-          tz.transition 2027, 3, :o4, 1804995060
-          tz.transition 2027, 11, :o3, 1825554660
-          tz.transition 2028, 3, :o4, 1836444660
-          tz.transition 2028, 11, :o3, 1857004260
-          tz.transition 2029, 3, :o4, 1867894260
-          tz.transition 2029, 11, :o3, 1888453860
-          tz.transition 2030, 3, :o4, 1899343860
-          tz.transition 2030, 11, :o3, 1919903460
-          tz.transition 2031, 3, :o4, 1930793460
-          tz.transition 2031, 11, :o3, 1951353060
-          tz.transition 2032, 3, :o4, 1962847860
-          tz.transition 2032, 11, :o3, 1983407460
-          tz.transition 2033, 3, :o4, 1994297460
-          tz.transition 2033, 11, :o3, 2014857060
-          tz.transition 2034, 3, :o4, 2025747060
-          tz.transition 2034, 11, :o3, 2046306660
-          tz.transition 2035, 3, :o4, 2057196660
-          tz.transition 2035, 11, :o3, 2077756260
-          tz.transition 2036, 3, :o4, 2088646260
-          tz.transition 2036, 11, :o3, 2109205860
-          tz.transition 2037, 3, :o4, 2120095860
-          tz.transition 2037, 11, :o3, 2140655460
-          tz.transition 2038, 3, :o4, 3550315171, 1440
-          tz.transition 2038, 11, :o3, 3550657831, 1440
-          tz.transition 2039, 3, :o4, 3550839331, 1440
-          tz.transition 2039, 11, :o3, 3551181991, 1440
-          tz.transition 2040, 3, :o4, 3551363491, 1440
-          tz.transition 2040, 11, :o3, 3551706151, 1440
-          tz.transition 2041, 3, :o4, 3551887651, 1440
-          tz.transition 2041, 11, :o3, 3552230311, 1440
-          tz.transition 2042, 3, :o4, 3552411811, 1440
-          tz.transition 2042, 11, :o3, 3552754471, 1440
-          tz.transition 2043, 3, :o4, 3552935971, 1440
-          tz.transition 2043, 11, :o3, 3553278631, 1440
-          tz.transition 2044, 3, :o4, 3553470211, 1440
-          tz.transition 2044, 11, :o3, 3553812871, 1440
-          tz.transition 2045, 3, :o4, 3553994371, 1440
-          tz.transition 2045, 11, :o3, 3554337031, 1440
-          tz.transition 2046, 3, :o4, 3554518531, 1440
-          tz.transition 2046, 11, :o3, 3554861191, 1440
-          tz.transition 2047, 3, :o4, 3555042691, 1440
-          tz.transition 2047, 11, :o3, 3555385351, 1440
-          tz.transition 2048, 3, :o4, 3555566851, 1440
-          tz.transition 2048, 11, :o3, 3555909511, 1440
-          tz.transition 2049, 3, :o4, 3556101091, 1440
-          tz.transition 2049, 11, :o3, 3556443751, 1440
-          tz.transition 2050, 3, :o4, 3556625251, 1440
-          tz.transition 2050, 11, :o3, 3556967911, 1440
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Kitts.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Kitts.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Kitts.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Kitts.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module St_Kitts
-        include TimezoneDefinition
-        
-        timezone 'America/St_Kitts' do |tz|
-          tz.offset :o0, -15052, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1912, 3, :o1, 52260415363, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Lucia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Lucia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Lucia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Lucia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module St_Lucia
-        include TimezoneDefinition
-        
-        timezone 'America/St_Lucia' do |tz|
-          tz.offset :o0, -14640, 0, :LMT
-          tz.offset :o1, -14640, 0, :CMT
-          tz.offset :o2, -14400, 0, :AST
-          
-          tz.transition 1890, 1, :o1, 868092721, 360
-          tz.transition 1912, 1, :o2, 870984961, 360
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Thomas.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Thomas.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Thomas.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Thomas.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module St_Thomas
-        include TimezoneDefinition
-        
-        timezone 'America/St_Thomas' do |tz|
-          tz.offset :o0, -15584, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1911, 7, :o1, 6531890437, 2700
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Vincent.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Vincent.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Vincent.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/St_Vincent.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module St_Vincent
-        include TimezoneDefinition
-        
-        timezone 'America/St_Vincent' do |tz|
-          tz.offset :o0, -14696, 0, :LMT
-          tz.offset :o1, -14696, 0, :KMT
-          tz.offset :o2, -14400, 0, :AST
-          
-          tz.transition 1890, 1, :o1, 26042781637, 10800
-          tz.transition 1912, 1, :o2, 26129548837, 10800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Swift_Current.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Swift_Current.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Swift_Current.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Swift_Current.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,44 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Swift_Current
-        include TimezoneDefinition
-        
-        timezone 'America/Swift_Current' do |tz|
-          tz.offset :o0, -25880, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          tz.offset :o5, -21600, 0, :CST
-          
-          tz.transition 1905, 9, :o1, 5220913967, 2160
-          tz.transition 1918, 4, :o2, 19373583, 8
-          tz.transition 1918, 10, :o1, 14531387, 6
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1946, 4, :o2, 19455511, 8
-          tz.transition 1946, 10, :o1, 14592641, 6
-          tz.transition 1947, 4, :o2, 19458423, 8
-          tz.transition 1947, 9, :o1, 14594741, 6
-          tz.transition 1948, 4, :o2, 19461335, 8
-          tz.transition 1948, 9, :o1, 14596925, 6
-          tz.transition 1949, 4, :o2, 19464247, 8
-          tz.transition 1949, 9, :o1, 14599109, 6
-          tz.transition 1957, 4, :o2, 19487655, 8
-          tz.transition 1957, 10, :o1, 14616833, 6
-          tz.transition 1959, 4, :o2, 19493479, 8
-          tz.transition 1959, 10, :o1, 14621201, 6
-          tz.transition 1960, 4, :o2, 19496391, 8
-          tz.transition 1960, 9, :o1, 14623217, 6
-          tz.transition 1961, 4, :o2, 19499359, 8
-          tz.transition 1961, 9, :o1, 14625401, 6
-          tz.transition 1972, 4, :o5, 73472400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tegucigalpa.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tegucigalpa.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tegucigalpa.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tegucigalpa.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,31 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Tegucigalpa
-        include TimezoneDefinition
-        
-        timezone 'America/Tegucigalpa' do |tz|
-          tz.offset :o0, -20932, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          
-          tz.transition 1921, 4, :o1, 52332064033, 21600
-          tz.transition 1987, 5, :o2, 547020000
-          tz.transition 1987, 9, :o1, 559717200
-          tz.transition 1988, 5, :o2, 578469600
-          tz.transition 1988, 9, :o1, 591166800
-          tz.transition 2006, 5, :o2, 1146981600
-          tz.transition 2006, 8, :o1, 1154926800
-          tz.transition 2007, 5, :o2, 1178431200
-          tz.transition 2007, 8, :o1, 1186376400
-          tz.transition 2008, 5, :o2, 1209880800
-          tz.transition 2008, 8, :o1, 1217826000
-          tz.transition 2009, 5, :o2, 1241330400
-          tz.transition 2009, 8, :o1, 1249275600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thule.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thule.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thule.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thule.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,139 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Thule
-        include TimezoneDefinition
-        
-        timezone 'America/Thule' do |tz|
-          tz.offset :o0, -16508, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          
-          tz.transition 1916, 7, :o1, 52295170127, 21600
-          tz.transition 1991, 3, :o2, 670399200
-          tz.transition 1991, 9, :o1, 686120400
-          tz.transition 1992, 3, :o2, 701848800
-          tz.transition 1992, 9, :o1, 717570000
-          tz.transition 1993, 4, :o2, 733903200
-          tz.transition 1993, 10, :o1, 752043600
-          tz.transition 1994, 4, :o2, 765352800
-          tz.transition 1994, 10, :o1, 783493200
-          tz.transition 1995, 4, :o2, 796802400
-          tz.transition 1995, 10, :o1, 814942800
-          tz.transition 1996, 4, :o2, 828856800
-          tz.transition 1996, 10, :o1, 846392400
-          tz.transition 1997, 4, :o2, 860306400
-          tz.transition 1997, 10, :o1, 877842000
-          tz.transition 1998, 4, :o2, 891756000
-          tz.transition 1998, 10, :o1, 909291600
-          tz.transition 1999, 4, :o2, 923205600
-          tz.transition 1999, 10, :o1, 941346000
-          tz.transition 2000, 4, :o2, 954655200
-          tz.transition 2000, 10, :o1, 972795600
-          tz.transition 2001, 4, :o2, 986104800
-          tz.transition 2001, 10, :o1, 1004245200
-          tz.transition 2002, 4, :o2, 1018159200
-          tz.transition 2002, 10, :o1, 1035694800
-          tz.transition 2003, 4, :o2, 1049608800
-          tz.transition 2003, 10, :o1, 1067144400
-          tz.transition 2004, 4, :o2, 1081058400
-          tz.transition 2004, 10, :o1, 1099198800
-          tz.transition 2005, 4, :o2, 1112508000
-          tz.transition 2005, 10, :o1, 1130648400
-          tz.transition 2006, 4, :o2, 1143957600
-          tz.transition 2006, 10, :o1, 1162098000
-          tz.transition 2007, 3, :o2, 1173592800
-          tz.transition 2007, 11, :o1, 1194152400
-          tz.transition 2008, 3, :o2, 1205042400
-          tz.transition 2008, 11, :o1, 1225602000
-          tz.transition 2009, 3, :o2, 1236492000
-          tz.transition 2009, 11, :o1, 1257051600
-          tz.transition 2010, 3, :o2, 1268546400
-          tz.transition 2010, 11, :o1, 1289106000
-          tz.transition 2011, 3, :o2, 1299996000
-          tz.transition 2011, 11, :o1, 1320555600
-          tz.transition 2012, 3, :o2, 1331445600
-          tz.transition 2012, 11, :o1, 1352005200
-          tz.transition 2013, 3, :o2, 1362895200
-          tz.transition 2013, 11, :o1, 1383454800
-          tz.transition 2014, 3, :o2, 1394344800
-          tz.transition 2014, 11, :o1, 1414904400
-          tz.transition 2015, 3, :o2, 1425794400
-          tz.transition 2015, 11, :o1, 1446354000
-          tz.transition 2016, 3, :o2, 1457848800
-          tz.transition 2016, 11, :o1, 1478408400
-          tz.transition 2017, 3, :o2, 1489298400
-          tz.transition 2017, 11, :o1, 1509858000
-          tz.transition 2018, 3, :o2, 1520748000
-          tz.transition 2018, 11, :o1, 1541307600
-          tz.transition 2019, 3, :o2, 1552197600
-          tz.transition 2019, 11, :o1, 1572757200
-          tz.transition 2020, 3, :o2, 1583647200
-          tz.transition 2020, 11, :o1, 1604206800
-          tz.transition 2021, 3, :o2, 1615701600
-          tz.transition 2021, 11, :o1, 1636261200
-          tz.transition 2022, 3, :o2, 1647151200
-          tz.transition 2022, 11, :o1, 1667710800
-          tz.transition 2023, 3, :o2, 1678600800
-          tz.transition 2023, 11, :o1, 1699160400
-          tz.transition 2024, 3, :o2, 1710050400
-          tz.transition 2024, 11, :o1, 1730610000
-          tz.transition 2025, 3, :o2, 1741500000
-          tz.transition 2025, 11, :o1, 1762059600
-          tz.transition 2026, 3, :o2, 1772949600
-          tz.transition 2026, 11, :o1, 1793509200
-          tz.transition 2027, 3, :o2, 1805004000
-          tz.transition 2027, 11, :o1, 1825563600
-          tz.transition 2028, 3, :o2, 1836453600
-          tz.transition 2028, 11, :o1, 1857013200
-          tz.transition 2029, 3, :o2, 1867903200
-          tz.transition 2029, 11, :o1, 1888462800
-          tz.transition 2030, 3, :o2, 1899352800
-          tz.transition 2030, 11, :o1, 1919912400
-          tz.transition 2031, 3, :o2, 1930802400
-          tz.transition 2031, 11, :o1, 1951362000
-          tz.transition 2032, 3, :o2, 1962856800
-          tz.transition 2032, 11, :o1, 1983416400
-          tz.transition 2033, 3, :o2, 1994306400
-          tz.transition 2033, 11, :o1, 2014866000
-          tz.transition 2034, 3, :o2, 2025756000
-          tz.transition 2034, 11, :o1, 2046315600
-          tz.transition 2035, 3, :o2, 2057205600
-          tz.transition 2035, 11, :o1, 2077765200
-          tz.transition 2036, 3, :o2, 2088655200
-          tz.transition 2036, 11, :o1, 2109214800
-          tz.transition 2037, 3, :o2, 2120104800
-          tz.transition 2037, 11, :o1, 2140664400
-          tz.transition 2038, 3, :o2, 9861987, 4
-          tz.transition 2038, 11, :o1, 59177633, 24
-          tz.transition 2039, 3, :o2, 9863443, 4
-          tz.transition 2039, 11, :o1, 59186369, 24
-          tz.transition 2040, 3, :o2, 9864899, 4
-          tz.transition 2040, 11, :o1, 59195105, 24
-          tz.transition 2041, 3, :o2, 9866355, 4
-          tz.transition 2041, 11, :o1, 59203841, 24
-          tz.transition 2042, 3, :o2, 9867811, 4
-          tz.transition 2042, 11, :o1, 59212577, 24
-          tz.transition 2043, 3, :o2, 9869267, 4
-          tz.transition 2043, 11, :o1, 59221313, 24
-          tz.transition 2044, 3, :o2, 9870751, 4
-          tz.transition 2044, 11, :o1, 59230217, 24
-          tz.transition 2045, 3, :o2, 9872207, 4
-          tz.transition 2045, 11, :o1, 59238953, 24
-          tz.transition 2046, 3, :o2, 9873663, 4
-          tz.transition 2046, 11, :o1, 59247689, 24
-          tz.transition 2047, 3, :o2, 9875119, 4
-          tz.transition 2047, 11, :o1, 59256425, 24
-          tz.transition 2048, 3, :o2, 9876575, 4
-          tz.transition 2048, 11, :o1, 59265161, 24
-          tz.transition 2049, 3, :o2, 9878059, 4
-          tz.transition 2049, 11, :o1, 59274065, 24
-          tz.transition 2050, 3, :o2, 9879515, 4
-          tz.transition 2050, 11, :o1, 59282801, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thunder_Bay.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thunder_Bay.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thunder_Bay.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Thunder_Bay.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,186 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Thunder_Bay
-        include TimezoneDefinition
-        
-        timezone 'America/Thunder_Bay' do |tz|
-          tz.offset :o0, -21420, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -18000, 0, :EST
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          tz.offset :o5, -18000, 3600, :EDT
-          
-          tz.transition 1895, 1, :o1, 1158333479, 480
-          tz.transition 1910, 1, :o2, 9674691, 4
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 9726915, 4
-          tz.transition 1970, 4, :o5, 9961200
-          tz.transition 1970, 10, :o2, 25682400
-          tz.transition 1971, 4, :o5, 41410800
-          tz.transition 1971, 10, :o2, 57736800
-          tz.transition 1972, 4, :o5, 73465200
-          tz.transition 1972, 10, :o2, 89186400
-          tz.transition 1974, 4, :o5, 136364400
-          tz.transition 1974, 10, :o2, 152085600
-          tz.transition 1975, 4, :o5, 167814000
-          tz.transition 1975, 10, :o2, 183535200
-          tz.transition 1976, 4, :o5, 199263600
-          tz.transition 1976, 10, :o2, 215589600
-          tz.transition 1977, 4, :o5, 230713200
-          tz.transition 1977, 10, :o2, 247039200
-          tz.transition 1978, 4, :o5, 262767600
-          tz.transition 1978, 10, :o2, 278488800
-          tz.transition 1979, 4, :o5, 294217200
-          tz.transition 1979, 10, :o2, 309938400
-          tz.transition 1980, 4, :o5, 325666800
-          tz.transition 1980, 10, :o2, 341388000
-          tz.transition 1981, 4, :o5, 357116400
-          tz.transition 1981, 10, :o2, 372837600
-          tz.transition 1982, 4, :o5, 388566000
-          tz.transition 1982, 10, :o2, 404892000
-          tz.transition 1983, 4, :o5, 420015600
-          tz.transition 1983, 10, :o2, 436341600
-          tz.transition 1984, 4, :o5, 452070000
-          tz.transition 1984, 10, :o2, 467791200
-          tz.transition 1985, 4, :o5, 483519600
-          tz.transition 1985, 10, :o2, 499240800
-          tz.transition 1986, 4, :o5, 514969200
-          tz.transition 1986, 10, :o2, 530690400
-          tz.transition 1987, 4, :o5, 544604400
-          tz.transition 1987, 10, :o2, 562140000
-          tz.transition 1988, 4, :o5, 576054000
-          tz.transition 1988, 10, :o2, 594194400
-          tz.transition 1989, 4, :o5, 607503600
-          tz.transition 1989, 10, :o2, 625644000
-          tz.transition 1990, 4, :o5, 638953200
-          tz.transition 1990, 10, :o2, 657093600
-          tz.transition 1991, 4, :o5, 671007600
-          tz.transition 1991, 10, :o2, 688543200
-          tz.transition 1992, 4, :o5, 702457200
-          tz.transition 1992, 10, :o2, 719992800
-          tz.transition 1993, 4, :o5, 733906800
-          tz.transition 1993, 10, :o2, 752047200
-          tz.transition 1994, 4, :o5, 765356400
-          tz.transition 1994, 10, :o2, 783496800
-          tz.transition 1995, 4, :o5, 796806000
-          tz.transition 1995, 10, :o2, 814946400
-          tz.transition 1996, 4, :o5, 828860400
-          tz.transition 1996, 10, :o2, 846396000
-          tz.transition 1997, 4, :o5, 860310000
-          tz.transition 1997, 10, :o2, 877845600
-          tz.transition 1998, 4, :o5, 891759600
-          tz.transition 1998, 10, :o2, 909295200
-          tz.transition 1999, 4, :o5, 923209200
-          tz.transition 1999, 10, :o2, 941349600
-          tz.transition 2000, 4, :o5, 954658800
-          tz.transition 2000, 10, :o2, 972799200
-          tz.transition 2001, 4, :o5, 986108400
-          tz.transition 2001, 10, :o2, 1004248800
-          tz.transition 2002, 4, :o5, 1018162800
-          tz.transition 2002, 10, :o2, 1035698400
-          tz.transition 2003, 4, :o5, 1049612400
-          tz.transition 2003, 10, :o2, 1067148000
-          tz.transition 2004, 4, :o5, 1081062000
-          tz.transition 2004, 10, :o2, 1099202400
-          tz.transition 2005, 4, :o5, 1112511600
-          tz.transition 2005, 10, :o2, 1130652000
-          tz.transition 2006, 4, :o5, 1143961200
-          tz.transition 2006, 10, :o2, 1162101600
-          tz.transition 2007, 3, :o5, 1173596400
-          tz.transition 2007, 11, :o2, 1194156000
-          tz.transition 2008, 3, :o5, 1205046000
-          tz.transition 2008, 11, :o2, 1225605600
-          tz.transition 2009, 3, :o5, 1236495600
-          tz.transition 2009, 11, :o2, 1257055200
-          tz.transition 2010, 3, :o5, 1268550000
-          tz.transition 2010, 11, :o2, 1289109600
-          tz.transition 2011, 3, :o5, 1299999600
-          tz.transition 2011, 11, :o2, 1320559200
-          tz.transition 2012, 3, :o5, 1331449200
-          tz.transition 2012, 11, :o2, 1352008800
-          tz.transition 2013, 3, :o5, 1362898800
-          tz.transition 2013, 11, :o2, 1383458400
-          tz.transition 2014, 3, :o5, 1394348400
-          tz.transition 2014, 11, :o2, 1414908000
-          tz.transition 2015, 3, :o5, 1425798000
-          tz.transition 2015, 11, :o2, 1446357600
-          tz.transition 2016, 3, :o5, 1457852400
-          tz.transition 2016, 11, :o2, 1478412000
-          tz.transition 2017, 3, :o5, 1489302000
-          tz.transition 2017, 11, :o2, 1509861600
-          tz.transition 2018, 3, :o5, 1520751600
-          tz.transition 2018, 11, :o2, 1541311200
-          tz.transition 2019, 3, :o5, 1552201200
-          tz.transition 2019, 11, :o2, 1572760800
-          tz.transition 2020, 3, :o5, 1583650800
-          tz.transition 2020, 11, :o2, 1604210400
-          tz.transition 2021, 3, :o5, 1615705200
-          tz.transition 2021, 11, :o2, 1636264800
-          tz.transition 2022, 3, :o5, 1647154800
-          tz.transition 2022, 11, :o2, 1667714400
-          tz.transition 2023, 3, :o5, 1678604400
-          tz.transition 2023, 11, :o2, 1699164000
-          tz.transition 2024, 3, :o5, 1710054000
-          tz.transition 2024, 11, :o2, 1730613600
-          tz.transition 2025, 3, :o5, 1741503600
-          tz.transition 2025, 11, :o2, 1762063200
-          tz.transition 2026, 3, :o5, 1772953200
-          tz.transition 2026, 11, :o2, 1793512800
-          tz.transition 2027, 3, :o5, 1805007600
-          tz.transition 2027, 11, :o2, 1825567200
-          tz.transition 2028, 3, :o5, 1836457200
-          tz.transition 2028, 11, :o2, 1857016800
-          tz.transition 2029, 3, :o5, 1867906800
-          tz.transition 2029, 11, :o2, 1888466400
-          tz.transition 2030, 3, :o5, 1899356400
-          tz.transition 2030, 11, :o2, 1919916000
-          tz.transition 2031, 3, :o5, 1930806000
-          tz.transition 2031, 11, :o2, 1951365600
-          tz.transition 2032, 3, :o5, 1962860400
-          tz.transition 2032, 11, :o2, 1983420000
-          tz.transition 2033, 3, :o5, 1994310000
-          tz.transition 2033, 11, :o2, 2014869600
-          tz.transition 2034, 3, :o5, 2025759600
-          tz.transition 2034, 11, :o2, 2046319200
-          tz.transition 2035, 3, :o5, 2057209200
-          tz.transition 2035, 11, :o2, 2077768800
-          tz.transition 2036, 3, :o5, 2088658800
-          tz.transition 2036, 11, :o2, 2109218400
-          tz.transition 2037, 3, :o5, 2120108400
-          tz.transition 2037, 11, :o2, 2140668000
-          tz.transition 2038, 3, :o5, 59171923, 24
-          tz.transition 2038, 11, :o2, 9862939, 4
-          tz.transition 2039, 3, :o5, 59180659, 24
-          tz.transition 2039, 11, :o2, 9864395, 4
-          tz.transition 2040, 3, :o5, 59189395, 24
-          tz.transition 2040, 11, :o2, 9865851, 4
-          tz.transition 2041, 3, :o5, 59198131, 24
-          tz.transition 2041, 11, :o2, 9867307, 4
-          tz.transition 2042, 3, :o5, 59206867, 24
-          tz.transition 2042, 11, :o2, 9868763, 4
-          tz.transition 2043, 3, :o5, 59215603, 24
-          tz.transition 2043, 11, :o2, 9870219, 4
-          tz.transition 2044, 3, :o5, 59224507, 24
-          tz.transition 2044, 11, :o2, 9871703, 4
-          tz.transition 2045, 3, :o5, 59233243, 24
-          tz.transition 2045, 11, :o2, 9873159, 4
-          tz.transition 2046, 3, :o5, 59241979, 24
-          tz.transition 2046, 11, :o2, 9874615, 4
-          tz.transition 2047, 3, :o5, 59250715, 24
-          tz.transition 2047, 11, :o2, 9876071, 4
-          tz.transition 2048, 3, :o5, 59259451, 24
-          tz.transition 2048, 11, :o2, 9877527, 4
-          tz.transition 2049, 3, :o5, 59268355, 24
-          tz.transition 2049, 11, :o2, 9879011, 4
-          tz.transition 2050, 3, :o5, 59277091, 24
-          tz.transition 2050, 11, :o2, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tijuana.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tijuana.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tijuana.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tijuana.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,196 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Tijuana
-        include TimezoneDefinition
-        
-        timezone 'America/Tijuana' do |tz|
-          tz.offset :o0, -28084, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -28800, 0, :PST
-          tz.offset :o3, -28800, 3600, :PDT
-          tz.offset :o4, -28800, 3600, :PWT
-          tz.offset :o5, -28800, 3600, :PPT
-          
-          tz.transition 1922, 1, :o1, 14538335, 6
-          tz.transition 1924, 1, :o2, 58170859, 24
-          tz.transition 1927, 6, :o1, 58201027, 24
-          tz.transition 1930, 11, :o2, 58231099, 24
-          tz.transition 1931, 4, :o3, 14558597, 6
-          tz.transition 1931, 9, :o2, 58238755, 24
-          tz.transition 1942, 4, :o4, 14582843, 6
-          tz.transition 1945, 8, :o5, 58360379, 24
-          tz.transition 1945, 11, :o2, 58362523, 24
-          tz.transition 1948, 4, :o3, 14595881, 6
-          tz.transition 1949, 1, :o2, 58390339, 24
-          tz.transition 1954, 4, :o3, 29218295, 12
-          tz.transition 1954, 9, :o2, 19480095, 8
-          tz.transition 1955, 4, :o3, 29222663, 12
-          tz.transition 1955, 9, :o2, 19483007, 8
-          tz.transition 1956, 4, :o3, 29227115, 12
-          tz.transition 1956, 9, :o2, 19485975, 8
-          tz.transition 1957, 4, :o3, 29231483, 12
-          tz.transition 1957, 9, :o2, 19488887, 8
-          tz.transition 1958, 4, :o3, 29235851, 12
-          tz.transition 1958, 9, :o2, 19491799, 8
-          tz.transition 1959, 4, :o3, 29240219, 12
-          tz.transition 1959, 9, :o2, 19494711, 8
-          tz.transition 1960, 4, :o3, 29244587, 12
-          tz.transition 1960, 9, :o2, 19497623, 8
-          tz.transition 1976, 4, :o3, 199274400
-          tz.transition 1976, 10, :o2, 215600400
-          tz.transition 1977, 4, :o3, 230724000
-          tz.transition 1977, 10, :o2, 247050000
-          tz.transition 1978, 4, :o3, 262778400
-          tz.transition 1978, 10, :o2, 278499600
-          tz.transition 1979, 4, :o3, 294228000
-          tz.transition 1979, 10, :o2, 309949200
-          tz.transition 1980, 4, :o3, 325677600
-          tz.transition 1980, 10, :o2, 341398800
-          tz.transition 1981, 4, :o3, 357127200
-          tz.transition 1981, 10, :o2, 372848400
-          tz.transition 1982, 4, :o3, 388576800
-          tz.transition 1982, 10, :o2, 404902800
-          tz.transition 1983, 4, :o3, 420026400
-          tz.transition 1983, 10, :o2, 436352400
-          tz.transition 1984, 4, :o3, 452080800
-          tz.transition 1984, 10, :o2, 467802000
-          tz.transition 1985, 4, :o3, 483530400
-          tz.transition 1985, 10, :o2, 499251600
-          tz.transition 1986, 4, :o3, 514980000
-          tz.transition 1986, 10, :o2, 530701200
-          tz.transition 1987, 4, :o3, 544615200
-          tz.transition 1987, 10, :o2, 562150800
-          tz.transition 1988, 4, :o3, 576064800
-          tz.transition 1988, 10, :o2, 594205200
-          tz.transition 1989, 4, :o3, 607514400
-          tz.transition 1989, 10, :o2, 625654800
-          tz.transition 1990, 4, :o3, 638964000
-          tz.transition 1990, 10, :o2, 657104400
-          tz.transition 1991, 4, :o3, 671018400
-          tz.transition 1991, 10, :o2, 688554000
-          tz.transition 1992, 4, :o3, 702468000
-          tz.transition 1992, 10, :o2, 720003600
-          tz.transition 1993, 4, :o3, 733917600
-          tz.transition 1993, 10, :o2, 752058000
-          tz.transition 1994, 4, :o3, 765367200
-          tz.transition 1994, 10, :o2, 783507600
-          tz.transition 1995, 4, :o3, 796816800
-          tz.transition 1995, 10, :o2, 814957200
-          tz.transition 1996, 4, :o3, 828871200
-          tz.transition 1996, 10, :o2, 846406800
-          tz.transition 1997, 4, :o3, 860320800
-          tz.transition 1997, 10, :o2, 877856400
-          tz.transition 1998, 4, :o3, 891770400
-          tz.transition 1998, 10, :o2, 909306000
-          tz.transition 1999, 4, :o3, 923220000
-          tz.transition 1999, 10, :o2, 941360400
-          tz.transition 2000, 4, :o3, 954669600
-          tz.transition 2000, 10, :o2, 972810000
-          tz.transition 2001, 4, :o3, 986119200
-          tz.transition 2001, 10, :o2, 1004259600
-          tz.transition 2002, 4, :o3, 1018173600
-          tz.transition 2002, 10, :o2, 1035709200
-          tz.transition 2003, 4, :o3, 1049623200
-          tz.transition 2003, 10, :o2, 1067158800
-          tz.transition 2004, 4, :o3, 1081072800
-          tz.transition 2004, 10, :o2, 1099213200
-          tz.transition 2005, 4, :o3, 1112522400
-          tz.transition 2005, 10, :o2, 1130662800
-          tz.transition 2006, 4, :o3, 1143972000
-          tz.transition 2006, 10, :o2, 1162112400
-          tz.transition 2007, 4, :o3, 1175421600
-          tz.transition 2007, 10, :o2, 1193562000
-          tz.transition 2008, 4, :o3, 1207476000
-          tz.transition 2008, 10, :o2, 1225011600
-          tz.transition 2009, 4, :o3, 1238925600
-          tz.transition 2009, 10, :o2, 1256461200
-          tz.transition 2010, 4, :o3, 1270375200
-          tz.transition 2010, 10, :o2, 1288515600
-          tz.transition 2011, 4, :o3, 1301824800
-          tz.transition 2011, 10, :o2, 1319965200
-          tz.transition 2012, 4, :o3, 1333274400
-          tz.transition 2012, 10, :o2, 1351414800
-          tz.transition 2013, 4, :o3, 1365328800
-          tz.transition 2013, 10, :o2, 1382864400
-          tz.transition 2014, 4, :o3, 1396778400
-          tz.transition 2014, 10, :o2, 1414314000
-          tz.transition 2015, 4, :o3, 1428228000
-          tz.transition 2015, 10, :o2, 1445763600
-          tz.transition 2016, 4, :o3, 1459677600
-          tz.transition 2016, 10, :o2, 1477818000
-          tz.transition 2017, 4, :o3, 1491127200
-          tz.transition 2017, 10, :o2, 1509267600
-          tz.transition 2018, 4, :o3, 1522576800
-          tz.transition 2018, 10, :o2, 1540717200
-          tz.transition 2019, 4, :o3, 1554631200
-          tz.transition 2019, 10, :o2, 1572166800
-          tz.transition 2020, 4, :o3, 1586080800
-          tz.transition 2020, 10, :o2, 1603616400
-          tz.transition 2021, 4, :o3, 1617530400
-          tz.transition 2021, 10, :o2, 1635670800
-          tz.transition 2022, 4, :o3, 1648980000
-          tz.transition 2022, 10, :o2, 1667120400
-          tz.transition 2023, 4, :o3, 1680429600
-          tz.transition 2023, 10, :o2, 1698570000
-          tz.transition 2024, 4, :o3, 1712484000
-          tz.transition 2024, 10, :o2, 1730019600
-          tz.transition 2025, 4, :o3, 1743933600
-          tz.transition 2025, 10, :o2, 1761469200
-          tz.transition 2026, 4, :o3, 1775383200
-          tz.transition 2026, 10, :o2, 1792918800
-          tz.transition 2027, 4, :o3, 1806832800
-          tz.transition 2027, 10, :o2, 1824973200
-          tz.transition 2028, 4, :o3, 1838282400
-          tz.transition 2028, 10, :o2, 1856422800
-          tz.transition 2029, 4, :o3, 1869732000
-          tz.transition 2029, 10, :o2, 1887872400
-          tz.transition 2030, 4, :o3, 1901786400
-          tz.transition 2030, 10, :o2, 1919322000
-          tz.transition 2031, 4, :o3, 1933236000
-          tz.transition 2031, 10, :o2, 1950771600
-          tz.transition 2032, 4, :o3, 1964685600
-          tz.transition 2032, 10, :o2, 1982826000
-          tz.transition 2033, 4, :o3, 1996135200
-          tz.transition 2033, 10, :o2, 2014275600
-          tz.transition 2034, 4, :o3, 2027584800
-          tz.transition 2034, 10, :o2, 2045725200
-          tz.transition 2035, 4, :o3, 2059034400
-          tz.transition 2035, 10, :o2, 2077174800
-          tz.transition 2036, 4, :o3, 2091088800
-          tz.transition 2036, 10, :o2, 2108624400
-          tz.transition 2037, 4, :o3, 2122538400
-          tz.transition 2037, 10, :o2, 2140074000
-          tz.transition 2038, 4, :o3, 29586215, 12
-          tz.transition 2038, 10, :o2, 19725823, 8
-          tz.transition 2039, 4, :o3, 29590583, 12
-          tz.transition 2039, 10, :o2, 19728735, 8
-          tz.transition 2040, 4, :o3, 29594951, 12
-          tz.transition 2040, 10, :o2, 19731647, 8
-          tz.transition 2041, 4, :o3, 29599403, 12
-          tz.transition 2041, 10, :o2, 19734559, 8
-          tz.transition 2042, 4, :o3, 29603771, 12
-          tz.transition 2042, 10, :o2, 19737471, 8
-          tz.transition 2043, 4, :o3, 29608139, 12
-          tz.transition 2043, 10, :o2, 19740383, 8
-          tz.transition 2044, 4, :o3, 29612507, 12
-          tz.transition 2044, 10, :o2, 19743351, 8
-          tz.transition 2045, 4, :o3, 29616875, 12
-          tz.transition 2045, 10, :o2, 19746263, 8
-          tz.transition 2046, 4, :o3, 29621243, 12
-          tz.transition 2046, 10, :o2, 19749175, 8
-          tz.transition 2047, 4, :o3, 29625695, 12
-          tz.transition 2047, 10, :o2, 19752087, 8
-          tz.transition 2048, 4, :o3, 29630063, 12
-          tz.transition 2048, 10, :o2, 19754999, 8
-          tz.transition 2049, 4, :o3, 29634431, 12
-          tz.transition 2049, 10, :o2, 19757967, 8
-          tz.transition 2050, 4, :o3, 29638799, 12
-          tz.transition 2050, 10, :o2, 19760879, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Toronto.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Toronto.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Toronto.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Toronto.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,279 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Toronto
-        include TimezoneDefinition
-        
-        timezone 'America/Toronto' do |tz|
-          tz.offset :o0, -19052, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EDT
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          
-          tz.transition 1895, 1, :o1, 52125005963, 21600
-          tz.transition 1918, 4, :o2, 58120747, 24
-          tz.transition 1918, 10, :o1, 9687591, 4
-          tz.transition 1919, 3, :o2, 38752779, 16
-          tz.transition 1919, 10, :o1, 7266773, 3
-          tz.transition 1920, 5, :o2, 58138723, 24
-          tz.transition 1920, 9, :o1, 7267781, 3
-          tz.transition 1921, 5, :o2, 58147795, 24
-          tz.transition 1921, 9, :o1, 9691791, 4
-          tz.transition 1922, 5, :o2, 58156531, 24
-          tz.transition 1922, 9, :o1, 9693259, 4
-          tz.transition 1923, 5, :o2, 58165267, 24
-          tz.transition 1923, 9, :o1, 9694715, 4
-          tz.transition 1924, 5, :o2, 58173835, 24
-          tz.transition 1924, 9, :o1, 9696199, 4
-          tz.transition 1925, 5, :o2, 58182571, 24
-          tz.transition 1925, 9, :o1, 9697655, 4
-          tz.transition 1926, 5, :o2, 58191307, 24
-          tz.transition 1926, 9, :o1, 9699111, 4
-          tz.transition 1927, 5, :o2, 58200043, 24
-          tz.transition 1927, 9, :o1, 9700595, 4
-          tz.transition 1928, 4, :o2, 58208779, 24
-          tz.transition 1928, 9, :o1, 9702079, 4
-          tz.transition 1929, 4, :o2, 58217515, 24
-          tz.transition 1929, 9, :o1, 9703535, 4
-          tz.transition 1930, 4, :o2, 58226251, 24
-          tz.transition 1930, 9, :o1, 9704991, 4
-          tz.transition 1931, 4, :o2, 58234987, 24
-          tz.transition 1931, 9, :o1, 9706447, 4
-          tz.transition 1932, 5, :o2, 58243891, 24
-          tz.transition 1932, 9, :o1, 9707903, 4
-          tz.transition 1933, 4, :o2, 58252627, 24
-          tz.transition 1933, 10, :o1, 9709387, 4
-          tz.transition 1934, 4, :o2, 58261363, 24
-          tz.transition 1934, 9, :o1, 9710843, 4
-          tz.transition 1935, 4, :o2, 58270099, 24
-          tz.transition 1935, 9, :o1, 9712299, 4
-          tz.transition 1936, 4, :o2, 58278835, 24
-          tz.transition 1936, 9, :o1, 9713755, 4
-          tz.transition 1937, 4, :o2, 58287571, 24
-          tz.transition 1937, 9, :o1, 9715211, 4
-          tz.transition 1938, 4, :o2, 58296307, 24
-          tz.transition 1938, 9, :o1, 9716667, 4
-          tz.transition 1939, 4, :o2, 58305211, 24
-          tz.transition 1939, 9, :o1, 9718123, 4
-          tz.transition 1940, 4, :o2, 58313947, 24
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 9726915, 4
-          tz.transition 1946, 4, :o2, 58366531, 24
-          tz.transition 1946, 9, :o1, 9728371, 4
-          tz.transition 1947, 4, :o2, 58375265, 24
-          tz.transition 1947, 9, :o1, 7297370, 3
-          tz.transition 1948, 4, :o2, 58384001, 24
-          tz.transition 1948, 9, :o1, 7298462, 3
-          tz.transition 1949, 4, :o2, 58392737, 24
-          tz.transition 1949, 11, :o1, 7299743, 3
-          tz.transition 1950, 4, :o2, 58401643, 24
-          tz.transition 1950, 11, :o1, 9734447, 4
-          tz.transition 1951, 4, :o2, 58410379, 24
-          tz.transition 1951, 9, :o1, 9735679, 4
-          tz.transition 1952, 4, :o2, 58419115, 24
-          tz.transition 1952, 9, :o1, 9737135, 4
-          tz.transition 1953, 4, :o2, 58427851, 24
-          tz.transition 1953, 9, :o1, 9738591, 4
-          tz.transition 1954, 4, :o2, 58436587, 24
-          tz.transition 1954, 9, :o1, 9740047, 4
-          tz.transition 1955, 4, :o2, 58445323, 24
-          tz.transition 1955, 9, :o1, 9741503, 4
-          tz.transition 1956, 4, :o2, 58454227, 24
-          tz.transition 1956, 9, :o1, 9742987, 4
-          tz.transition 1957, 4, :o2, 58462963, 24
-          tz.transition 1957, 10, :o1, 9744555, 4
-          tz.transition 1958, 4, :o2, 58471699, 24
-          tz.transition 1958, 10, :o1, 9746011, 4
-          tz.transition 1959, 4, :o2, 58480435, 24
-          tz.transition 1959, 10, :o1, 9747467, 4
-          tz.transition 1960, 4, :o2, 58489171, 24
-          tz.transition 1960, 10, :o1, 9748951, 4
-          tz.transition 1961, 4, :o2, 58498075, 24
-          tz.transition 1961, 10, :o1, 9750407, 4
-          tz.transition 1962, 4, :o2, 58506811, 24
-          tz.transition 1962, 10, :o1, 9751863, 4
-          tz.transition 1963, 4, :o2, 58515547, 24
-          tz.transition 1963, 10, :o1, 9753319, 4
-          tz.transition 1964, 4, :o2, 58524283, 24
-          tz.transition 1964, 10, :o1, 9754775, 4
-          tz.transition 1965, 4, :o2, 58533019, 24
-          tz.transition 1965, 10, :o1, 9756259, 4
-          tz.transition 1966, 4, :o2, 58541755, 24
-          tz.transition 1966, 10, :o1, 9757715, 4
-          tz.transition 1967, 4, :o2, 58550659, 24
-          tz.transition 1967, 10, :o1, 9759171, 4
-          tz.transition 1968, 4, :o2, 58559395, 24
-          tz.transition 1968, 10, :o1, 9760627, 4
-          tz.transition 1969, 4, :o2, 58568131, 24
-          tz.transition 1969, 10, :o1, 9762083, 4
-          tz.transition 1970, 4, :o2, 9961200
-          tz.transition 1970, 10, :o1, 25682400
-          tz.transition 1971, 4, :o2, 41410800
-          tz.transition 1971, 10, :o1, 57736800
-          tz.transition 1972, 4, :o2, 73465200
-          tz.transition 1972, 10, :o1, 89186400
-          tz.transition 1973, 4, :o2, 104914800
-          tz.transition 1973, 10, :o1, 120636000
-          tz.transition 1974, 4, :o2, 136364400
-          tz.transition 1974, 10, :o1, 152085600
-          tz.transition 1975, 4, :o2, 167814000
-          tz.transition 1975, 10, :o1, 183535200
-          tz.transition 1976, 4, :o2, 199263600
-          tz.transition 1976, 10, :o1, 215589600
-          tz.transition 1977, 4, :o2, 230713200
-          tz.transition 1977, 10, :o1, 247039200
-          tz.transition 1978, 4, :o2, 262767600
-          tz.transition 1978, 10, :o1, 278488800
-          tz.transition 1979, 4, :o2, 294217200
-          tz.transition 1979, 10, :o1, 309938400
-          tz.transition 1980, 4, :o2, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o2, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o2, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o2, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o2, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o2, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o2, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o2, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o2, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o2, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o2, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o2, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o2, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o2, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o2, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o2, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o2, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o2, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o2, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o2, 923209200
-          tz.transition 1999, 10, :o1, 941349600
-          tz.transition 2000, 4, :o2, 954658800
-          tz.transition 2000, 10, :o1, 972799200
-          tz.transition 2001, 4, :o2, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o2, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o2, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o2, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o2, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o2, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 3, :o2, 1173596400
-          tz.transition 2007, 11, :o1, 1194156000
-          tz.transition 2008, 3, :o2, 1205046000
-          tz.transition 2008, 11, :o1, 1225605600
-          tz.transition 2009, 3, :o2, 1236495600
-          tz.transition 2009, 11, :o1, 1257055200
-          tz.transition 2010, 3, :o2, 1268550000
-          tz.transition 2010, 11, :o1, 1289109600
-          tz.transition 2011, 3, :o2, 1299999600
-          tz.transition 2011, 11, :o1, 1320559200
-          tz.transition 2012, 3, :o2, 1331449200
-          tz.transition 2012, 11, :o1, 1352008800
-          tz.transition 2013, 3, :o2, 1362898800
-          tz.transition 2013, 11, :o1, 1383458400
-          tz.transition 2014, 3, :o2, 1394348400
-          tz.transition 2014, 11, :o1, 1414908000
-          tz.transition 2015, 3, :o2, 1425798000
-          tz.transition 2015, 11, :o1, 1446357600
-          tz.transition 2016, 3, :o2, 1457852400
-          tz.transition 2016, 11, :o1, 1478412000
-          tz.transition 2017, 3, :o2, 1489302000
-          tz.transition 2017, 11, :o1, 1509861600
-          tz.transition 2018, 3, :o2, 1520751600
-          tz.transition 2018, 11, :o1, 1541311200
-          tz.transition 2019, 3, :o2, 1552201200
-          tz.transition 2019, 11, :o1, 1572760800
-          tz.transition 2020, 3, :o2, 1583650800
-          tz.transition 2020, 11, :o1, 1604210400
-          tz.transition 2021, 3, :o2, 1615705200
-          tz.transition 2021, 11, :o1, 1636264800
-          tz.transition 2022, 3, :o2, 1647154800
-          tz.transition 2022, 11, :o1, 1667714400
-          tz.transition 2023, 3, :o2, 1678604400
-          tz.transition 2023, 11, :o1, 1699164000
-          tz.transition 2024, 3, :o2, 1710054000
-          tz.transition 2024, 11, :o1, 1730613600
-          tz.transition 2025, 3, :o2, 1741503600
-          tz.transition 2025, 11, :o1, 1762063200
-          tz.transition 2026, 3, :o2, 1772953200
-          tz.transition 2026, 11, :o1, 1793512800
-          tz.transition 2027, 3, :o2, 1805007600
-          tz.transition 2027, 11, :o1, 1825567200
-          tz.transition 2028, 3, :o2, 1836457200
-          tz.transition 2028, 11, :o1, 1857016800
-          tz.transition 2029, 3, :o2, 1867906800
-          tz.transition 2029, 11, :o1, 1888466400
-          tz.transition 2030, 3, :o2, 1899356400
-          tz.transition 2030, 11, :o1, 1919916000
-          tz.transition 2031, 3, :o2, 1930806000
-          tz.transition 2031, 11, :o1, 1951365600
-          tz.transition 2032, 3, :o2, 1962860400
-          tz.transition 2032, 11, :o1, 1983420000
-          tz.transition 2033, 3, :o2, 1994310000
-          tz.transition 2033, 11, :o1, 2014869600
-          tz.transition 2034, 3, :o2, 2025759600
-          tz.transition 2034, 11, :o1, 2046319200
-          tz.transition 2035, 3, :o2, 2057209200
-          tz.transition 2035, 11, :o1, 2077768800
-          tz.transition 2036, 3, :o2, 2088658800
-          tz.transition 2036, 11, :o1, 2109218400
-          tz.transition 2037, 3, :o2, 2120108400
-          tz.transition 2037, 11, :o1, 2140668000
-          tz.transition 2038, 3, :o2, 59171923, 24
-          tz.transition 2038, 11, :o1, 9862939, 4
-          tz.transition 2039, 3, :o2, 59180659, 24
-          tz.transition 2039, 11, :o1, 9864395, 4
-          tz.transition 2040, 3, :o2, 59189395, 24
-          tz.transition 2040, 11, :o1, 9865851, 4
-          tz.transition 2041, 3, :o2, 59198131, 24
-          tz.transition 2041, 11, :o1, 9867307, 4
-          tz.transition 2042, 3, :o2, 59206867, 24
-          tz.transition 2042, 11, :o1, 9868763, 4
-          tz.transition 2043, 3, :o2, 59215603, 24
-          tz.transition 2043, 11, :o1, 9870219, 4
-          tz.transition 2044, 3, :o2, 59224507, 24
-          tz.transition 2044, 11, :o1, 9871703, 4
-          tz.transition 2045, 3, :o2, 59233243, 24
-          tz.transition 2045, 11, :o1, 9873159, 4
-          tz.transition 2046, 3, :o2, 59241979, 24
-          tz.transition 2046, 11, :o1, 9874615, 4
-          tz.transition 2047, 3, :o2, 59250715, 24
-          tz.transition 2047, 11, :o1, 9876071, 4
-          tz.transition 2048, 3, :o2, 59259451, 24
-          tz.transition 2048, 11, :o1, 9877527, 4
-          tz.transition 2049, 3, :o2, 59268355, 24
-          tz.transition 2049, 11, :o1, 9879011, 4
-          tz.transition 2050, 3, :o2, 59277091, 24
-          tz.transition 2050, 11, :o1, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tortola.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tortola.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tortola.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Tortola.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Tortola
-        include TimezoneDefinition
-        
-        timezone 'America/Tortola' do |tz|
-          tz.offset :o0, -15508, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1911, 7, :o1, 52255123477, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Vancouver.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Vancouver.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Vancouver.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Vancouver.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,236 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Vancouver
-        include TimezoneDefinition
-        
-        timezone 'America/Vancouver' do |tz|
-          tz.offset :o0, -29548, 0, :LMT
-          tz.offset :o1, -28800, 0, :PST
-          tz.offset :o2, -28800, 3600, :PDT
-          tz.offset :o3, -28800, 3600, :PWT
-          tz.offset :o4, -28800, 3600, :PPT
-          
-          tz.transition 1884, 1, :o1, 52038219787, 21600
-          tz.transition 1918, 4, :o2, 29060375, 12
-          tz.transition 1918, 10, :o1, 19375183, 8
-          tz.transition 1942, 2, :o3, 29164799, 12
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 19453831, 8
-          tz.transition 1946, 4, :o2, 29183267, 12
-          tz.transition 1946, 10, :o1, 19456855, 8
-          tz.transition 1947, 4, :o2, 29187635, 12
-          tz.transition 1947, 9, :o1, 19459655, 8
-          tz.transition 1948, 4, :o2, 29192003, 12
-          tz.transition 1948, 9, :o1, 19462567, 8
-          tz.transition 1949, 4, :o2, 29196371, 12
-          tz.transition 1949, 9, :o1, 19465479, 8
-          tz.transition 1950, 4, :o2, 29200823, 12
-          tz.transition 1950, 9, :o1, 19468391, 8
-          tz.transition 1951, 4, :o2, 29205191, 12
-          tz.transition 1951, 9, :o1, 19471359, 8
-          tz.transition 1952, 4, :o2, 29209559, 12
-          tz.transition 1952, 9, :o1, 19474271, 8
-          tz.transition 1953, 4, :o2, 29213927, 12
-          tz.transition 1953, 9, :o1, 19477183, 8
-          tz.transition 1954, 4, :o2, 29218295, 12
-          tz.transition 1954, 9, :o1, 19480095, 8
-          tz.transition 1955, 4, :o2, 29222663, 12
-          tz.transition 1955, 9, :o1, 19483007, 8
-          tz.transition 1956, 4, :o2, 29227115, 12
-          tz.transition 1956, 9, :o1, 19485975, 8
-          tz.transition 1957, 4, :o2, 29231483, 12
-          tz.transition 1957, 9, :o1, 19488887, 8
-          tz.transition 1958, 4, :o2, 29235851, 12
-          tz.transition 1958, 9, :o1, 19491799, 8
-          tz.transition 1959, 4, :o2, 29240219, 12
-          tz.transition 1959, 9, :o1, 19494711, 8
-          tz.transition 1960, 4, :o2, 29244587, 12
-          tz.transition 1960, 9, :o1, 19497623, 8
-          tz.transition 1961, 4, :o2, 29249039, 12
-          tz.transition 1961, 9, :o1, 19500535, 8
-          tz.transition 1962, 4, :o2, 29253407, 12
-          tz.transition 1962, 10, :o1, 19503727, 8
-          tz.transition 1963, 4, :o2, 29257775, 12
-          tz.transition 1963, 10, :o1, 19506639, 8
-          tz.transition 1964, 4, :o2, 29262143, 12
-          tz.transition 1964, 10, :o1, 19509551, 8
-          tz.transition 1965, 4, :o2, 29266511, 12
-          tz.transition 1965, 10, :o1, 19512519, 8
-          tz.transition 1966, 4, :o2, 29270879, 12
-          tz.transition 1966, 10, :o1, 19515431, 8
-          tz.transition 1967, 4, :o2, 29275331, 12
-          tz.transition 1967, 10, :o1, 19518343, 8
-          tz.transition 1968, 4, :o2, 29279699, 12
-          tz.transition 1968, 10, :o1, 19521255, 8
-          tz.transition 1969, 4, :o2, 29284067, 12
-          tz.transition 1969, 10, :o1, 19524167, 8
-          tz.transition 1970, 4, :o2, 9972000
-          tz.transition 1970, 10, :o1, 25693200
-          tz.transition 1971, 4, :o2, 41421600
-          tz.transition 1971, 10, :o1, 57747600
-          tz.transition 1972, 4, :o2, 73476000
-          tz.transition 1972, 10, :o1, 89197200
-          tz.transition 1973, 4, :o2, 104925600
-          tz.transition 1973, 10, :o1, 120646800
-          tz.transition 1974, 4, :o2, 136375200
-          tz.transition 1974, 10, :o1, 152096400
-          tz.transition 1975, 4, :o2, 167824800
-          tz.transition 1975, 10, :o1, 183546000
-          tz.transition 1976, 4, :o2, 199274400
-          tz.transition 1976, 10, :o1, 215600400
-          tz.transition 1977, 4, :o2, 230724000
-          tz.transition 1977, 10, :o1, 247050000
-          tz.transition 1978, 4, :o2, 262778400
-          tz.transition 1978, 10, :o1, 278499600
-          tz.transition 1979, 4, :o2, 294228000
-          tz.transition 1979, 10, :o1, 309949200
-          tz.transition 1980, 4, :o2, 325677600
-          tz.transition 1980, 10, :o1, 341398800
-          tz.transition 1981, 4, :o2, 357127200
-          tz.transition 1981, 10, :o1, 372848400
-          tz.transition 1982, 4, :o2, 388576800
-          tz.transition 1982, 10, :o1, 404902800
-          tz.transition 1983, 4, :o2, 420026400
-          tz.transition 1983, 10, :o1, 436352400
-          tz.transition 1984, 4, :o2, 452080800
-          tz.transition 1984, 10, :o1, 467802000
-          tz.transition 1985, 4, :o2, 483530400
-          tz.transition 1985, 10, :o1, 499251600
-          tz.transition 1986, 4, :o2, 514980000
-          tz.transition 1986, 10, :o1, 530701200
-          tz.transition 1987, 4, :o2, 544615200
-          tz.transition 1987, 10, :o1, 562150800
-          tz.transition 1988, 4, :o2, 576064800
-          tz.transition 1988, 10, :o1, 594205200
-          tz.transition 1989, 4, :o2, 607514400
-          tz.transition 1989, 10, :o1, 625654800
-          tz.transition 1990, 4, :o2, 638964000
-          tz.transition 1990, 10, :o1, 657104400
-          tz.transition 1991, 4, :o2, 671018400
-          tz.transition 1991, 10, :o1, 688554000
-          tz.transition 1992, 4, :o2, 702468000
-          tz.transition 1992, 10, :o1, 720003600
-          tz.transition 1993, 4, :o2, 733917600
-          tz.transition 1993, 10, :o1, 752058000
-          tz.transition 1994, 4, :o2, 765367200
-          tz.transition 1994, 10, :o1, 783507600
-          tz.transition 1995, 4, :o2, 796816800
-          tz.transition 1995, 10, :o1, 814957200
-          tz.transition 1996, 4, :o2, 828871200
-          tz.transition 1996, 10, :o1, 846406800
-          tz.transition 1997, 4, :o2, 860320800
-          tz.transition 1997, 10, :o1, 877856400
-          tz.transition 1998, 4, :o2, 891770400
-          tz.transition 1998, 10, :o1, 909306000
-          tz.transition 1999, 4, :o2, 923220000
-          tz.transition 1999, 10, :o1, 941360400
-          tz.transition 2000, 4, :o2, 954669600
-          tz.transition 2000, 10, :o1, 972810000
-          tz.transition 2001, 4, :o2, 986119200
-          tz.transition 2001, 10, :o1, 1004259600
-          tz.transition 2002, 4, :o2, 1018173600
-          tz.transition 2002, 10, :o1, 1035709200
-          tz.transition 2003, 4, :o2, 1049623200
-          tz.transition 2003, 10, :o1, 1067158800
-          tz.transition 2004, 4, :o2, 1081072800
-          tz.transition 2004, 10, :o1, 1099213200
-          tz.transition 2005, 4, :o2, 1112522400
-          tz.transition 2005, 10, :o1, 1130662800
-          tz.transition 2006, 4, :o2, 1143972000
-          tz.transition 2006, 10, :o1, 1162112400
-          tz.transition 2007, 3, :o2, 1173607200
-          tz.transition 2007, 11, :o1, 1194166800
-          tz.transition 2008, 3, :o2, 1205056800
-          tz.transition 2008, 11, :o1, 1225616400
-          tz.transition 2009, 3, :o2, 1236506400
-          tz.transition 2009, 11, :o1, 1257066000
-          tz.transition 2010, 3, :o2, 1268560800
-          tz.transition 2010, 11, :o1, 1289120400
-          tz.transition 2011, 3, :o2, 1300010400
-          tz.transition 2011, 11, :o1, 1320570000
-          tz.transition 2012, 3, :o2, 1331460000
-          tz.transition 2012, 11, :o1, 1352019600
-          tz.transition 2013, 3, :o2, 1362909600
-          tz.transition 2013, 11, :o1, 1383469200
-          tz.transition 2014, 3, :o2, 1394359200
-          tz.transition 2014, 11, :o1, 1414918800
-          tz.transition 2015, 3, :o2, 1425808800
-          tz.transition 2015, 11, :o1, 1446368400
-          tz.transition 2016, 3, :o2, 1457863200
-          tz.transition 2016, 11, :o1, 1478422800
-          tz.transition 2017, 3, :o2, 1489312800
-          tz.transition 2017, 11, :o1, 1509872400
-          tz.transition 2018, 3, :o2, 1520762400
-          tz.transition 2018, 11, :o1, 1541322000
-          tz.transition 2019, 3, :o2, 1552212000
-          tz.transition 2019, 11, :o1, 1572771600
-          tz.transition 2020, 3, :o2, 1583661600
-          tz.transition 2020, 11, :o1, 1604221200
-          tz.transition 2021, 3, :o2, 1615716000
-          tz.transition 2021, 11, :o1, 1636275600
-          tz.transition 2022, 3, :o2, 1647165600
-          tz.transition 2022, 11, :o1, 1667725200
-          tz.transition 2023, 3, :o2, 1678615200
-          tz.transition 2023, 11, :o1, 1699174800
-          tz.transition 2024, 3, :o2, 1710064800
-          tz.transition 2024, 11, :o1, 1730624400
-          tz.transition 2025, 3, :o2, 1741514400
-          tz.transition 2025, 11, :o1, 1762074000
-          tz.transition 2026, 3, :o2, 1772964000
-          tz.transition 2026, 11, :o1, 1793523600
-          tz.transition 2027, 3, :o2, 1805018400
-          tz.transition 2027, 11, :o1, 1825578000
-          tz.transition 2028, 3, :o2, 1836468000
-          tz.transition 2028, 11, :o1, 1857027600
-          tz.transition 2029, 3, :o2, 1867917600
-          tz.transition 2029, 11, :o1, 1888477200
-          tz.transition 2030, 3, :o2, 1899367200
-          tz.transition 2030, 11, :o1, 1919926800
-          tz.transition 2031, 3, :o2, 1930816800
-          tz.transition 2031, 11, :o1, 1951376400
-          tz.transition 2032, 3, :o2, 1962871200
-          tz.transition 2032, 11, :o1, 1983430800
-          tz.transition 2033, 3, :o2, 1994320800
-          tz.transition 2033, 11, :o1, 2014880400
-          tz.transition 2034, 3, :o2, 2025770400
-          tz.transition 2034, 11, :o1, 2046330000
-          tz.transition 2035, 3, :o2, 2057220000
-          tz.transition 2035, 11, :o1, 2077779600
-          tz.transition 2036, 3, :o2, 2088669600
-          tz.transition 2036, 11, :o1, 2109229200
-          tz.transition 2037, 3, :o2, 2120119200
-          tz.transition 2037, 11, :o1, 2140678800
-          tz.transition 2038, 3, :o2, 29585963, 12
-          tz.transition 2038, 11, :o1, 19725879, 8
-          tz.transition 2039, 3, :o2, 29590331, 12
-          tz.transition 2039, 11, :o1, 19728791, 8
-          tz.transition 2040, 3, :o2, 29594699, 12
-          tz.transition 2040, 11, :o1, 19731703, 8
-          tz.transition 2041, 3, :o2, 29599067, 12
-          tz.transition 2041, 11, :o1, 19734615, 8
-          tz.transition 2042, 3, :o2, 29603435, 12
-          tz.transition 2042, 11, :o1, 19737527, 8
-          tz.transition 2043, 3, :o2, 29607803, 12
-          tz.transition 2043, 11, :o1, 19740439, 8
-          tz.transition 2044, 3, :o2, 29612255, 12
-          tz.transition 2044, 11, :o1, 19743407, 8
-          tz.transition 2045, 3, :o2, 29616623, 12
-          tz.transition 2045, 11, :o1, 19746319, 8
-          tz.transition 2046, 3, :o2, 29620991, 12
-          tz.transition 2046, 11, :o1, 19749231, 8
-          tz.transition 2047, 3, :o2, 29625359, 12
-          tz.transition 2047, 11, :o1, 19752143, 8
-          tz.transition 2048, 3, :o2, 29629727, 12
-          tz.transition 2048, 11, :o1, 19755055, 8
-          tz.transition 2049, 3, :o2, 29634179, 12
-          tz.transition 2049, 11, :o1, 19758023, 8
-          tz.transition 2050, 3, :o2, 29638547, 12
-          tz.transition 2050, 11, :o1, 19760935, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Virgin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Virgin.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Virgin.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Virgin.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Virgin
-        include TimezoneDefinition
-        
-        linked_timezone 'America/Virgin', 'America/St_Thomas'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Whitehorse.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Whitehorse.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Whitehorse.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Whitehorse.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,176 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Whitehorse
-        include TimezoneDefinition
-        
-        timezone 'America/Whitehorse' do |tz|
-          tz.offset :o0, -32412, 0, :LMT
-          tz.offset :o1, -32400, 0, :YST
-          tz.offset :o2, -32400, 3600, :YDT
-          tz.offset :o3, -32400, 3600, :YWT
-          tz.offset :o4, -32400, 3600, :YPT
-          tz.offset :o5, -32400, 7200, :YDDT
-          tz.offset :o6, -28800, 0, :PST
-          tz.offset :o7, -28800, 3600, :PDT
-          
-          tz.transition 1900, 8, :o1, 17389813501, 7200
-          tz.transition 1918, 4, :o2, 58120751, 24
-          tz.transition 1918, 10, :o1, 29062727, 12
-          tz.transition 1919, 5, :o2, 58130495, 24
-          tz.transition 1919, 11, :o1, 14533583, 6
-          tz.transition 1942, 2, :o3, 58329599, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 29180747, 12
-          tz.transition 1965, 4, :o5, 19511007, 8
-          tz.transition 1965, 10, :o1, 19512519, 8
-          tz.transition 1966, 7, :o6, 58543391, 24
-          tz.transition 1980, 4, :o7, 325677600
-          tz.transition 1980, 10, :o6, 341398800
-          tz.transition 1981, 4, :o7, 357127200
-          tz.transition 1981, 10, :o6, 372848400
-          tz.transition 1982, 4, :o7, 388576800
-          tz.transition 1982, 10, :o6, 404902800
-          tz.transition 1983, 4, :o7, 420026400
-          tz.transition 1983, 10, :o6, 436352400
-          tz.transition 1984, 4, :o7, 452080800
-          tz.transition 1984, 10, :o6, 467802000
-          tz.transition 1985, 4, :o7, 483530400
-          tz.transition 1985, 10, :o6, 499251600
-          tz.transition 1986, 4, :o7, 514980000
-          tz.transition 1986, 10, :o6, 530701200
-          tz.transition 1987, 4, :o7, 544615200
-          tz.transition 1987, 10, :o6, 562150800
-          tz.transition 1988, 4, :o7, 576064800
-          tz.transition 1988, 10, :o6, 594205200
-          tz.transition 1989, 4, :o7, 607514400
-          tz.transition 1989, 10, :o6, 625654800
-          tz.transition 1990, 4, :o7, 638964000
-          tz.transition 1990, 10, :o6, 657104400
-          tz.transition 1991, 4, :o7, 671018400
-          tz.transition 1991, 10, :o6, 688554000
-          tz.transition 1992, 4, :o7, 702468000
-          tz.transition 1992, 10, :o6, 720003600
-          tz.transition 1993, 4, :o7, 733917600
-          tz.transition 1993, 10, :o6, 752058000
-          tz.transition 1994, 4, :o7, 765367200
-          tz.transition 1994, 10, :o6, 783507600
-          tz.transition 1995, 4, :o7, 796816800
-          tz.transition 1995, 10, :o6, 814957200
-          tz.transition 1996, 4, :o7, 828871200
-          tz.transition 1996, 10, :o6, 846406800
-          tz.transition 1997, 4, :o7, 860320800
-          tz.transition 1997, 10, :o6, 877856400
-          tz.transition 1998, 4, :o7, 891770400
-          tz.transition 1998, 10, :o6, 909306000
-          tz.transition 1999, 4, :o7, 923220000
-          tz.transition 1999, 10, :o6, 941360400
-          tz.transition 2000, 4, :o7, 954669600
-          tz.transition 2000, 10, :o6, 972810000
-          tz.transition 2001, 4, :o7, 986119200
-          tz.transition 2001, 10, :o6, 1004259600
-          tz.transition 2002, 4, :o7, 1018173600
-          tz.transition 2002, 10, :o6, 1035709200
-          tz.transition 2003, 4, :o7, 1049623200
-          tz.transition 2003, 10, :o6, 1067158800
-          tz.transition 2004, 4, :o7, 1081072800
-          tz.transition 2004, 10, :o6, 1099213200
-          tz.transition 2005, 4, :o7, 1112522400
-          tz.transition 2005, 10, :o6, 1130662800
-          tz.transition 2006, 4, :o7, 1143972000
-          tz.transition 2006, 10, :o6, 1162112400
-          tz.transition 2007, 3, :o7, 1173607200
-          tz.transition 2007, 11, :o6, 1194166800
-          tz.transition 2008, 3, :o7, 1205056800
-          tz.transition 2008, 11, :o6, 1225616400
-          tz.transition 2009, 3, :o7, 1236506400
-          tz.transition 2009, 11, :o6, 1257066000
-          tz.transition 2010, 3, :o7, 1268560800
-          tz.transition 2010, 11, :o6, 1289120400
-          tz.transition 2011, 3, :o7, 1300010400
-          tz.transition 2011, 11, :o6, 1320570000
-          tz.transition 2012, 3, :o7, 1331460000
-          tz.transition 2012, 11, :o6, 1352019600
-          tz.transition 2013, 3, :o7, 1362909600
-          tz.transition 2013, 11, :o6, 1383469200
-          tz.transition 2014, 3, :o7, 1394359200
-          tz.transition 2014, 11, :o6, 1414918800
-          tz.transition 2015, 3, :o7, 1425808800
-          tz.transition 2015, 11, :o6, 1446368400
-          tz.transition 2016, 3, :o7, 1457863200
-          tz.transition 2016, 11, :o6, 1478422800
-          tz.transition 2017, 3, :o7, 1489312800
-          tz.transition 2017, 11, :o6, 1509872400
-          tz.transition 2018, 3, :o7, 1520762400
-          tz.transition 2018, 11, :o6, 1541322000
-          tz.transition 2019, 3, :o7, 1552212000
-          tz.transition 2019, 11, :o6, 1572771600
-          tz.transition 2020, 3, :o7, 1583661600
-          tz.transition 2020, 11, :o6, 1604221200
-          tz.transition 2021, 3, :o7, 1615716000
-          tz.transition 2021, 11, :o6, 1636275600
-          tz.transition 2022, 3, :o7, 1647165600
-          tz.transition 2022, 11, :o6, 1667725200
-          tz.transition 2023, 3, :o7, 1678615200
-          tz.transition 2023, 11, :o6, 1699174800
-          tz.transition 2024, 3, :o7, 1710064800
-          tz.transition 2024, 11, :o6, 1730624400
-          tz.transition 2025, 3, :o7, 1741514400
-          tz.transition 2025, 11, :o6, 1762074000
-          tz.transition 2026, 3, :o7, 1772964000
-          tz.transition 2026, 11, :o6, 1793523600
-          tz.transition 2027, 3, :o7, 1805018400
-          tz.transition 2027, 11, :o6, 1825578000
-          tz.transition 2028, 3, :o7, 1836468000
-          tz.transition 2028, 11, :o6, 1857027600
-          tz.transition 2029, 3, :o7, 1867917600
-          tz.transition 2029, 11, :o6, 1888477200
-          tz.transition 2030, 3, :o7, 1899367200
-          tz.transition 2030, 11, :o6, 1919926800
-          tz.transition 2031, 3, :o7, 1930816800
-          tz.transition 2031, 11, :o6, 1951376400
-          tz.transition 2032, 3, :o7, 1962871200
-          tz.transition 2032, 11, :o6, 1983430800
-          tz.transition 2033, 3, :o7, 1994320800
-          tz.transition 2033, 11, :o6, 2014880400
-          tz.transition 2034, 3, :o7, 2025770400
-          tz.transition 2034, 11, :o6, 2046330000
-          tz.transition 2035, 3, :o7, 2057220000
-          tz.transition 2035, 11, :o6, 2077779600
-          tz.transition 2036, 3, :o7, 2088669600
-          tz.transition 2036, 11, :o6, 2109229200
-          tz.transition 2037, 3, :o7, 2120119200
-          tz.transition 2037, 11, :o6, 2140678800
-          tz.transition 2038, 3, :o7, 29585963, 12
-          tz.transition 2038, 11, :o6, 19725879, 8
-          tz.transition 2039, 3, :o7, 29590331, 12
-          tz.transition 2039, 11, :o6, 19728791, 8
-          tz.transition 2040, 3, :o7, 29594699, 12
-          tz.transition 2040, 11, :o6, 19731703, 8
-          tz.transition 2041, 3, :o7, 29599067, 12
-          tz.transition 2041, 11, :o6, 19734615, 8
-          tz.transition 2042, 3, :o7, 29603435, 12
-          tz.transition 2042, 11, :o6, 19737527, 8
-          tz.transition 2043, 3, :o7, 29607803, 12
-          tz.transition 2043, 11, :o6, 19740439, 8
-          tz.transition 2044, 3, :o7, 29612255, 12
-          tz.transition 2044, 11, :o6, 19743407, 8
-          tz.transition 2045, 3, :o7, 29616623, 12
-          tz.transition 2045, 11, :o6, 19746319, 8
-          tz.transition 2046, 3, :o7, 29620991, 12
-          tz.transition 2046, 11, :o6, 19749231, 8
-          tz.transition 2047, 3, :o7, 29625359, 12
-          tz.transition 2047, 11, :o6, 19752143, 8
-          tz.transition 2048, 3, :o7, 29629727, 12
-          tz.transition 2048, 11, :o6, 19755055, 8
-          tz.transition 2049, 3, :o7, 29634179, 12
-          tz.transition 2049, 11, :o6, 19758023, 8
-          tz.transition 2050, 3, :o7, 29638547, 12
-          tz.transition 2050, 11, :o6, 19760935, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Winnipeg.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Winnipeg.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Winnipeg.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Winnipeg.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,232 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Winnipeg
-        include TimezoneDefinition
-        
-        timezone 'America/Winnipeg' do |tz|
-          tz.offset :o0, -23316, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -21600, 3600, :CWT
-          tz.offset :o4, -21600, 3600, :CPT
-          
-          tz.transition 1887, 7, :o1, 17355375143, 7200
-          tz.transition 1916, 4, :o2, 9683907, 4
-          tz.transition 1916, 9, :o1, 58106969, 24
-          tz.transition 1918, 4, :o2, 14530187, 6
-          tz.transition 1918, 10, :o1, 58125547, 24
-          tz.transition 1937, 5, :o2, 14572019, 6
-          tz.transition 1937, 9, :o1, 58291267, 24
-          tz.transition 1942, 2, :o3, 14582399, 6
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361491, 24
-          tz.transition 1946, 5, :o2, 14591717, 6
-          tz.transition 1946, 10, :o1, 58370563, 24
-          tz.transition 1947, 4, :o2, 14593817, 6
-          tz.transition 1947, 9, :o1, 58378963, 24
-          tz.transition 1948, 4, :o2, 14596001, 6
-          tz.transition 1948, 9, :o1, 58387699, 24
-          tz.transition 1949, 4, :o2, 14598185, 6
-          tz.transition 1949, 9, :o1, 58396435, 24
-          tz.transition 1950, 5, :o2, 14600417, 6
-          tz.transition 1950, 9, :o1, 58405315, 24
-          tz.transition 1951, 4, :o2, 14602595, 6
-          tz.transition 1951, 9, :o1, 58414075, 24
-          tz.transition 1952, 4, :o2, 14604779, 6
-          tz.transition 1952, 9, :o1, 58422811, 24
-          tz.transition 1953, 4, :o2, 14606963, 6
-          tz.transition 1953, 9, :o1, 58431547, 24
-          tz.transition 1954, 4, :o2, 14609147, 6
-          tz.transition 1954, 9, :o1, 58440283, 24
-          tz.transition 1955, 4, :o2, 14611331, 6
-          tz.transition 1955, 9, :o1, 58449019, 24
-          tz.transition 1956, 4, :o2, 14613557, 6
-          tz.transition 1956, 9, :o1, 58457923, 24
-          tz.transition 1957, 4, :o2, 14615741, 6
-          tz.transition 1957, 9, :o1, 58466659, 24
-          tz.transition 1958, 4, :o2, 14617925, 6
-          tz.transition 1958, 9, :o1, 58475395, 24
-          tz.transition 1959, 4, :o2, 14620109, 6
-          tz.transition 1959, 10, :o1, 58484803, 24
-          tz.transition 1960, 4, :o2, 14622293, 6
-          tz.transition 1960, 9, :o1, 58492867, 24
-          tz.transition 1963, 4, :o2, 14628887, 6
-          tz.transition 1963, 9, :o1, 58519075, 24
-          tz.transition 1966, 4, :o2, 14635439, 6
-          tz.transition 1966, 10, :o1, 14636573, 6
-          tz.transition 1967, 4, :o2, 14637665, 6
-          tz.transition 1967, 10, :o1, 14638757, 6
-          tz.transition 1968, 4, :o2, 14639849, 6
-          tz.transition 1968, 10, :o1, 14640941, 6
-          tz.transition 1969, 4, :o2, 14642033, 6
-          tz.transition 1969, 10, :o1, 14643125, 6
-          tz.transition 1970, 4, :o2, 9964800
-          tz.transition 1970, 10, :o1, 25689600
-          tz.transition 1971, 4, :o2, 41414400
-          tz.transition 1971, 10, :o1, 57744000
-          tz.transition 1972, 4, :o2, 73468800
-          tz.transition 1972, 10, :o1, 89193600
-          tz.transition 1973, 4, :o2, 104918400
-          tz.transition 1973, 10, :o1, 120643200
-          tz.transition 1974, 4, :o2, 136368000
-          tz.transition 1974, 10, :o1, 152092800
-          tz.transition 1975, 4, :o2, 167817600
-          tz.transition 1975, 10, :o1, 183542400
-          tz.transition 1976, 4, :o2, 199267200
-          tz.transition 1976, 10, :o1, 215596800
-          tz.transition 1977, 4, :o2, 230716800
-          tz.transition 1977, 10, :o1, 247046400
-          tz.transition 1978, 4, :o2, 262771200
-          tz.transition 1978, 10, :o1, 278496000
-          tz.transition 1979, 4, :o2, 294220800
-          tz.transition 1979, 10, :o1, 309945600
-          tz.transition 1980, 4, :o2, 325670400
-          tz.transition 1980, 10, :o1, 341395200
-          tz.transition 1981, 4, :o2, 357120000
-          tz.transition 1981, 10, :o1, 372844800
-          tz.transition 1982, 4, :o2, 388569600
-          tz.transition 1982, 10, :o1, 404899200
-          tz.transition 1983, 4, :o2, 420019200
-          tz.transition 1983, 10, :o1, 436348800
-          tz.transition 1984, 4, :o2, 452073600
-          tz.transition 1984, 10, :o1, 467798400
-          tz.transition 1985, 4, :o2, 483523200
-          tz.transition 1985, 10, :o1, 499248000
-          tz.transition 1986, 4, :o2, 514972800
-          tz.transition 1986, 10, :o1, 530697600
-          tz.transition 1987, 4, :o2, 544608000
-          tz.transition 1987, 10, :o1, 562147200
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594201600
-          tz.transition 1989, 4, :o2, 607507200
-          tz.transition 1989, 10, :o1, 625651200
-          tz.transition 1990, 4, :o2, 638956800
-          tz.transition 1990, 10, :o1, 657100800
-          tz.transition 1991, 4, :o2, 671011200
-          tz.transition 1991, 10, :o1, 688550400
-          tz.transition 1992, 4, :o2, 702460800
-          tz.transition 1992, 10, :o1, 720000000
-          tz.transition 1993, 4, :o2, 733910400
-          tz.transition 1993, 10, :o1, 752054400
-          tz.transition 1994, 4, :o2, 765360000
-          tz.transition 1994, 10, :o1, 783504000
-          tz.transition 1995, 4, :o2, 796809600
-          tz.transition 1995, 10, :o1, 814953600
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 4, :o2, 986112000
-          tz.transition 2001, 10, :o1, 1004256000
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 3, :o2, 1173600000
-          tz.transition 2007, 11, :o1, 1194159600
-          tz.transition 2008, 3, :o2, 1205049600
-          tz.transition 2008, 11, :o1, 1225609200
-          tz.transition 2009, 3, :o2, 1236499200
-          tz.transition 2009, 11, :o1, 1257058800
-          tz.transition 2010, 3, :o2, 1268553600
-          tz.transition 2010, 11, :o1, 1289113200
-          tz.transition 2011, 3, :o2, 1300003200
-          tz.transition 2011, 11, :o1, 1320562800
-          tz.transition 2012, 3, :o2, 1331452800
-          tz.transition 2012, 11, :o1, 1352012400
-          tz.transition 2013, 3, :o2, 1362902400
-          tz.transition 2013, 11, :o1, 1383462000
-          tz.transition 2014, 3, :o2, 1394352000
-          tz.transition 2014, 11, :o1, 1414911600
-          tz.transition 2015, 3, :o2, 1425801600
-          tz.transition 2015, 11, :o1, 1446361200
-          tz.transition 2016, 3, :o2, 1457856000
-          tz.transition 2016, 11, :o1, 1478415600
-          tz.transition 2017, 3, :o2, 1489305600
-          tz.transition 2017, 11, :o1, 1509865200
-          tz.transition 2018, 3, :o2, 1520755200
-          tz.transition 2018, 11, :o1, 1541314800
-          tz.transition 2019, 3, :o2, 1552204800
-          tz.transition 2019, 11, :o1, 1572764400
-          tz.transition 2020, 3, :o2, 1583654400
-          tz.transition 2020, 11, :o1, 1604214000
-          tz.transition 2021, 3, :o2, 1615708800
-          tz.transition 2021, 11, :o1, 1636268400
-          tz.transition 2022, 3, :o2, 1647158400
-          tz.transition 2022, 11, :o1, 1667718000
-          tz.transition 2023, 3, :o2, 1678608000
-          tz.transition 2023, 11, :o1, 1699167600
-          tz.transition 2024, 3, :o2, 1710057600
-          tz.transition 2024, 11, :o1, 1730617200
-          tz.transition 2025, 3, :o2, 1741507200
-          tz.transition 2025, 11, :o1, 1762066800
-          tz.transition 2026, 3, :o2, 1772956800
-          tz.transition 2026, 11, :o1, 1793516400
-          tz.transition 2027, 3, :o2, 1805011200
-          tz.transition 2027, 11, :o1, 1825570800
-          tz.transition 2028, 3, :o2, 1836460800
-          tz.transition 2028, 11, :o1, 1857020400
-          tz.transition 2029, 3, :o2, 1867910400
-          tz.transition 2029, 11, :o1, 1888470000
-          tz.transition 2030, 3, :o2, 1899360000
-          tz.transition 2030, 11, :o1, 1919919600
-          tz.transition 2031, 3, :o2, 1930809600
-          tz.transition 2031, 11, :o1, 1951369200
-          tz.transition 2032, 3, :o2, 1962864000
-          tz.transition 2032, 11, :o1, 1983423600
-          tz.transition 2033, 3, :o2, 1994313600
-          tz.transition 2033, 11, :o1, 2014873200
-          tz.transition 2034, 3, :o2, 2025763200
-          tz.transition 2034, 11, :o1, 2046322800
-          tz.transition 2035, 3, :o2, 2057212800
-          tz.transition 2035, 11, :o1, 2077772400
-          tz.transition 2036, 3, :o2, 2088662400
-          tz.transition 2036, 11, :o1, 2109222000
-          tz.transition 2037, 3, :o2, 2120112000
-          tz.transition 2037, 11, :o1, 2140671600
-          tz.transition 2038, 3, :o2, 14792981, 6
-          tz.transition 2038, 11, :o1, 59177635, 24
-          tz.transition 2039, 3, :o2, 14795165, 6
-          tz.transition 2039, 11, :o1, 59186371, 24
-          tz.transition 2040, 3, :o2, 14797349, 6
-          tz.transition 2040, 11, :o1, 59195107, 24
-          tz.transition 2041, 3, :o2, 14799533, 6
-          tz.transition 2041, 11, :o1, 59203843, 24
-          tz.transition 2042, 3, :o2, 14801717, 6
-          tz.transition 2042, 11, :o1, 59212579, 24
-          tz.transition 2043, 3, :o2, 14803901, 6
-          tz.transition 2043, 11, :o1, 59221315, 24
-          tz.transition 2044, 3, :o2, 14806127, 6
-          tz.transition 2044, 11, :o1, 59230219, 24
-          tz.transition 2045, 3, :o2, 14808311, 6
-          tz.transition 2045, 11, :o1, 59238955, 24
-          tz.transition 2046, 3, :o2, 14810495, 6
-          tz.transition 2046, 11, :o1, 59247691, 24
-          tz.transition 2047, 3, :o2, 14812679, 6
-          tz.transition 2047, 11, :o1, 59256427, 24
-          tz.transition 2048, 3, :o2, 14814863, 6
-          tz.transition 2048, 11, :o1, 59265163, 24
-          tz.transition 2049, 3, :o2, 14817089, 6
-          tz.transition 2049, 11, :o1, 59274067, 24
-          tz.transition 2050, 3, :o2, 14819273, 6
-          tz.transition 2050, 11, :o1, 59282803, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yakutat.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yakutat.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yakutat.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yakutat.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,193 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Yakutat
-        include TimezoneDefinition
-        
-        timezone 'America/Yakutat' do |tz|
-          tz.offset :o0, 52865, 0, :LMT
-          tz.offset :o1, -33535, 0, :LMT
-          tz.offset :o2, -32400, 0, :YST
-          tz.offset :o3, -32400, 3600, :YWT
-          tz.offset :o4, -32400, 3600, :YPT
-          tz.offset :o5, -32400, 3600, :YDT
-          tz.offset :o6, -32400, 0, :AKST
-          tz.offset :o7, -32400, 3600, :AKDT
-          
-          tz.transition 1867, 10, :o1, 41528279027, 17280
-          tz.transition 1900, 8, :o2, 41735561267, 17280
-          tz.transition 1942, 2, :o3, 58329599, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 29180747, 12
-          tz.transition 1969, 4, :o5, 58568135, 24
-          tz.transition 1969, 10, :o2, 29286251, 12
-          tz.transition 1970, 4, :o5, 9975600
-          tz.transition 1970, 10, :o2, 25696800
-          tz.transition 1971, 4, :o5, 41425200
-          tz.transition 1971, 10, :o2, 57751200
-          tz.transition 1972, 4, :o5, 73479600
-          tz.transition 1972, 10, :o2, 89200800
-          tz.transition 1973, 4, :o5, 104929200
-          tz.transition 1973, 10, :o2, 120650400
-          tz.transition 1974, 1, :o5, 126702000
-          tz.transition 1974, 10, :o2, 152100000
-          tz.transition 1975, 2, :o5, 162385200
-          tz.transition 1975, 10, :o2, 183549600
-          tz.transition 1976, 4, :o5, 199278000
-          tz.transition 1976, 10, :o2, 215604000
-          tz.transition 1977, 4, :o5, 230727600
-          tz.transition 1977, 10, :o2, 247053600
-          tz.transition 1978, 4, :o5, 262782000
-          tz.transition 1978, 10, :o2, 278503200
-          tz.transition 1979, 4, :o5, 294231600
-          tz.transition 1979, 10, :o2, 309952800
-          tz.transition 1980, 4, :o5, 325681200
-          tz.transition 1980, 10, :o2, 341402400
-          tz.transition 1981, 4, :o5, 357130800
-          tz.transition 1981, 10, :o2, 372852000
-          tz.transition 1982, 4, :o5, 388580400
-          tz.transition 1982, 10, :o2, 404906400
-          tz.transition 1983, 4, :o5, 420030000
-          tz.transition 1983, 10, :o2, 436356000
-          tz.transition 1983, 11, :o6, 439030800
-          tz.transition 1984, 4, :o7, 452084400
-          tz.transition 1984, 10, :o6, 467805600
-          tz.transition 1985, 4, :o7, 483534000
-          tz.transition 1985, 10, :o6, 499255200
-          tz.transition 1986, 4, :o7, 514983600
-          tz.transition 1986, 10, :o6, 530704800
-          tz.transition 1987, 4, :o7, 544618800
-          tz.transition 1987, 10, :o6, 562154400
-          tz.transition 1988, 4, :o7, 576068400
-          tz.transition 1988, 10, :o6, 594208800
-          tz.transition 1989, 4, :o7, 607518000
-          tz.transition 1989, 10, :o6, 625658400
-          tz.transition 1990, 4, :o7, 638967600
-          tz.transition 1990, 10, :o6, 657108000
-          tz.transition 1991, 4, :o7, 671022000
-          tz.transition 1991, 10, :o6, 688557600
-          tz.transition 1992, 4, :o7, 702471600
-          tz.transition 1992, 10, :o6, 720007200
-          tz.transition 1993, 4, :o7, 733921200
-          tz.transition 1993, 10, :o6, 752061600
-          tz.transition 1994, 4, :o7, 765370800
-          tz.transition 1994, 10, :o6, 783511200
-          tz.transition 1995, 4, :o7, 796820400
-          tz.transition 1995, 10, :o6, 814960800
-          tz.transition 1996, 4, :o7, 828874800
-          tz.transition 1996, 10, :o6, 846410400
-          tz.transition 1997, 4, :o7, 860324400
-          tz.transition 1997, 10, :o6, 877860000
-          tz.transition 1998, 4, :o7, 891774000
-          tz.transition 1998, 10, :o6, 909309600
-          tz.transition 1999, 4, :o7, 923223600
-          tz.transition 1999, 10, :o6, 941364000
-          tz.transition 2000, 4, :o7, 954673200
-          tz.transition 2000, 10, :o6, 972813600
-          tz.transition 2001, 4, :o7, 986122800
-          tz.transition 2001, 10, :o6, 1004263200
-          tz.transition 2002, 4, :o7, 1018177200
-          tz.transition 2002, 10, :o6, 1035712800
-          tz.transition 2003, 4, :o7, 1049626800
-          tz.transition 2003, 10, :o6, 1067162400
-          tz.transition 2004, 4, :o7, 1081076400
-          tz.transition 2004, 10, :o6, 1099216800
-          tz.transition 2005, 4, :o7, 1112526000
-          tz.transition 2005, 10, :o6, 1130666400
-          tz.transition 2006, 4, :o7, 1143975600
-          tz.transition 2006, 10, :o6, 1162116000
-          tz.transition 2007, 3, :o7, 1173610800
-          tz.transition 2007, 11, :o6, 1194170400
-          tz.transition 2008, 3, :o7, 1205060400
-          tz.transition 2008, 11, :o6, 1225620000
-          tz.transition 2009, 3, :o7, 1236510000
-          tz.transition 2009, 11, :o6, 1257069600
-          tz.transition 2010, 3, :o7, 1268564400
-          tz.transition 2010, 11, :o6, 1289124000
-          tz.transition 2011, 3, :o7, 1300014000
-          tz.transition 2011, 11, :o6, 1320573600
-          tz.transition 2012, 3, :o7, 1331463600
-          tz.transition 2012, 11, :o6, 1352023200
-          tz.transition 2013, 3, :o7, 1362913200
-          tz.transition 2013, 11, :o6, 1383472800
-          tz.transition 2014, 3, :o7, 1394362800
-          tz.transition 2014, 11, :o6, 1414922400
-          tz.transition 2015, 3, :o7, 1425812400
-          tz.transition 2015, 11, :o6, 1446372000
-          tz.transition 2016, 3, :o7, 1457866800
-          tz.transition 2016, 11, :o6, 1478426400
-          tz.transition 2017, 3, :o7, 1489316400
-          tz.transition 2017, 11, :o6, 1509876000
-          tz.transition 2018, 3, :o7, 1520766000
-          tz.transition 2018, 11, :o6, 1541325600
-          tz.transition 2019, 3, :o7, 1552215600
-          tz.transition 2019, 11, :o6, 1572775200
-          tz.transition 2020, 3, :o7, 1583665200
-          tz.transition 2020, 11, :o6, 1604224800
-          tz.transition 2021, 3, :o7, 1615719600
-          tz.transition 2021, 11, :o6, 1636279200
-          tz.transition 2022, 3, :o7, 1647169200
-          tz.transition 2022, 11, :o6, 1667728800
-          tz.transition 2023, 3, :o7, 1678618800
-          tz.transition 2023, 11, :o6, 1699178400
-          tz.transition 2024, 3, :o7, 1710068400
-          tz.transition 2024, 11, :o6, 1730628000
-          tz.transition 2025, 3, :o7, 1741518000
-          tz.transition 2025, 11, :o6, 1762077600
-          tz.transition 2026, 3, :o7, 1772967600
-          tz.transition 2026, 11, :o6, 1793527200
-          tz.transition 2027, 3, :o7, 1805022000
-          tz.transition 2027, 11, :o6, 1825581600
-          tz.transition 2028, 3, :o7, 1836471600
-          tz.transition 2028, 11, :o6, 1857031200
-          tz.transition 2029, 3, :o7, 1867921200
-          tz.transition 2029, 11, :o6, 1888480800
-          tz.transition 2030, 3, :o7, 1899370800
-          tz.transition 2030, 11, :o6, 1919930400
-          tz.transition 2031, 3, :o7, 1930820400
-          tz.transition 2031, 11, :o6, 1951380000
-          tz.transition 2032, 3, :o7, 1962874800
-          tz.transition 2032, 11, :o6, 1983434400
-          tz.transition 2033, 3, :o7, 1994324400
-          tz.transition 2033, 11, :o6, 2014884000
-          tz.transition 2034, 3, :o7, 2025774000
-          tz.transition 2034, 11, :o6, 2046333600
-          tz.transition 2035, 3, :o7, 2057223600
-          tz.transition 2035, 11, :o6, 2077783200
-          tz.transition 2036, 3, :o7, 2088673200
-          tz.transition 2036, 11, :o6, 2109232800
-          tz.transition 2037, 3, :o7, 2120122800
-          tz.transition 2037, 11, :o6, 2140682400
-          tz.transition 2038, 3, :o7, 59171927, 24
-          tz.transition 2038, 11, :o6, 29588819, 12
-          tz.transition 2039, 3, :o7, 59180663, 24
-          tz.transition 2039, 11, :o6, 29593187, 12
-          tz.transition 2040, 3, :o7, 59189399, 24
-          tz.transition 2040, 11, :o6, 29597555, 12
-          tz.transition 2041, 3, :o7, 59198135, 24
-          tz.transition 2041, 11, :o6, 29601923, 12
-          tz.transition 2042, 3, :o7, 59206871, 24
-          tz.transition 2042, 11, :o6, 29606291, 12
-          tz.transition 2043, 3, :o7, 59215607, 24
-          tz.transition 2043, 11, :o6, 29610659, 12
-          tz.transition 2044, 3, :o7, 59224511, 24
-          tz.transition 2044, 11, :o6, 29615111, 12
-          tz.transition 2045, 3, :o7, 59233247, 24
-          tz.transition 2045, 11, :o6, 29619479, 12
-          tz.transition 2046, 3, :o7, 59241983, 24
-          tz.transition 2046, 11, :o6, 29623847, 12
-          tz.transition 2047, 3, :o7, 59250719, 24
-          tz.transition 2047, 11, :o6, 29628215, 12
-          tz.transition 2048, 3, :o7, 59259455, 24
-          tz.transition 2048, 11, :o6, 29632583, 12
-          tz.transition 2049, 3, :o7, 59268359, 24
-          tz.transition 2049, 11, :o6, 29637035, 12
-          tz.transition 2050, 3, :o7, 59277095, 24
-          tz.transition 2050, 11, :o6, 29641403, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yellowknife.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yellowknife.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yellowknife.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/America/Yellowknife.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,173 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Yellowknife
-        include TimezoneDefinition
-        
-        timezone 'America/Yellowknife' do |tz|
-          tz.offset :o0, -27444, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          tz.offset :o5, -25200, 7200, :MDDT
-          
-          tz.transition 1884, 1, :o1, 17346073087, 7200
-          tz.transition 1918, 4, :o2, 19373583, 8
-          tz.transition 1918, 10, :o1, 14531363, 6
-          tz.transition 1919, 5, :o2, 19376831, 8
-          tz.transition 1919, 11, :o1, 9689055, 4
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1965, 4, :o5, 58533019, 24
-          tz.transition 1965, 10, :o1, 58537555, 24
-          tz.transition 1980, 4, :o2, 325674000
-          tz.transition 1980, 10, :o1, 341395200
-          tz.transition 1981, 4, :o2, 357123600
-          tz.transition 1981, 10, :o1, 372844800
-          tz.transition 1982, 4, :o2, 388573200
-          tz.transition 1982, 10, :o1, 404899200
-          tz.transition 1983, 4, :o2, 420022800
-          tz.transition 1983, 10, :o1, 436348800
-          tz.transition 1984, 4, :o2, 452077200
-          tz.transition 1984, 10, :o1, 467798400
-          tz.transition 1985, 4, :o2, 483526800
-          tz.transition 1985, 10, :o1, 499248000
-          tz.transition 1986, 4, :o2, 514976400
-          tz.transition 1986, 10, :o1, 530697600
-          tz.transition 1987, 4, :o2, 544611600
-          tz.transition 1987, 10, :o1, 562147200
-          tz.transition 1988, 4, :o2, 576061200
-          tz.transition 1988, 10, :o1, 594201600
-          tz.transition 1989, 4, :o2, 607510800
-          tz.transition 1989, 10, :o1, 625651200
-          tz.transition 1990, 4, :o2, 638960400
-          tz.transition 1990, 10, :o1, 657100800
-          tz.transition 1991, 4, :o2, 671014800
-          tz.transition 1991, 10, :o1, 688550400
-          tz.transition 1992, 4, :o2, 702464400
-          tz.transition 1992, 10, :o1, 720000000
-          tz.transition 1993, 4, :o2, 733914000
-          tz.transition 1993, 10, :o1, 752054400
-          tz.transition 1994, 4, :o2, 765363600
-          tz.transition 1994, 10, :o1, 783504000
-          tz.transition 1995, 4, :o2, 796813200
-          tz.transition 1995, 10, :o1, 814953600
-          tz.transition 1996, 4, :o2, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o2, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o2, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o2, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o2, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 4, :o2, 986115600
-          tz.transition 2001, 10, :o1, 1004256000
-          tz.transition 2002, 4, :o2, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o2, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o2, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o2, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o2, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 3, :o2, 1173603600
-          tz.transition 2007, 11, :o1, 1194163200
-          tz.transition 2008, 3, :o2, 1205053200
-          tz.transition 2008, 11, :o1, 1225612800
-          tz.transition 2009, 3, :o2, 1236502800
-          tz.transition 2009, 11, :o1, 1257062400
-          tz.transition 2010, 3, :o2, 1268557200
-          tz.transition 2010, 11, :o1, 1289116800
-          tz.transition 2011, 3, :o2, 1300006800
-          tz.transition 2011, 11, :o1, 1320566400
-          tz.transition 2012, 3, :o2, 1331456400
-          tz.transition 2012, 11, :o1, 1352016000
-          tz.transition 2013, 3, :o2, 1362906000
-          tz.transition 2013, 11, :o1, 1383465600
-          tz.transition 2014, 3, :o2, 1394355600
-          tz.transition 2014, 11, :o1, 1414915200
-          tz.transition 2015, 3, :o2, 1425805200
-          tz.transition 2015, 11, :o1, 1446364800
-          tz.transition 2016, 3, :o2, 1457859600
-          tz.transition 2016, 11, :o1, 1478419200
-          tz.transition 2017, 3, :o2, 1489309200
-          tz.transition 2017, 11, :o1, 1509868800
-          tz.transition 2018, 3, :o2, 1520758800
-          tz.transition 2018, 11, :o1, 1541318400
-          tz.transition 2019, 3, :o2, 1552208400
-          tz.transition 2019, 11, :o1, 1572768000
-          tz.transition 2020, 3, :o2, 1583658000
-          tz.transition 2020, 11, :o1, 1604217600
-          tz.transition 2021, 3, :o2, 1615712400
-          tz.transition 2021, 11, :o1, 1636272000
-          tz.transition 2022, 3, :o2, 1647162000
-          tz.transition 2022, 11, :o1, 1667721600
-          tz.transition 2023, 3, :o2, 1678611600
-          tz.transition 2023, 11, :o1, 1699171200
-          tz.transition 2024, 3, :o2, 1710061200
-          tz.transition 2024, 11, :o1, 1730620800
-          tz.transition 2025, 3, :o2, 1741510800
-          tz.transition 2025, 11, :o1, 1762070400
-          tz.transition 2026, 3, :o2, 1772960400
-          tz.transition 2026, 11, :o1, 1793520000
-          tz.transition 2027, 3, :o2, 1805014800
-          tz.transition 2027, 11, :o1, 1825574400
-          tz.transition 2028, 3, :o2, 1836464400
-          tz.transition 2028, 11, :o1, 1857024000
-          tz.transition 2029, 3, :o2, 1867914000
-          tz.transition 2029, 11, :o1, 1888473600
-          tz.transition 2030, 3, :o2, 1899363600
-          tz.transition 2030, 11, :o1, 1919923200
-          tz.transition 2031, 3, :o2, 1930813200
-          tz.transition 2031, 11, :o1, 1951372800
-          tz.transition 2032, 3, :o2, 1962867600
-          tz.transition 2032, 11, :o1, 1983427200
-          tz.transition 2033, 3, :o2, 1994317200
-          tz.transition 2033, 11, :o1, 2014876800
-          tz.transition 2034, 3, :o2, 2025766800
-          tz.transition 2034, 11, :o1, 2046326400
-          tz.transition 2035, 3, :o2, 2057216400
-          tz.transition 2035, 11, :o1, 2077776000
-          tz.transition 2036, 3, :o2, 2088666000
-          tz.transition 2036, 11, :o1, 2109225600
-          tz.transition 2037, 3, :o2, 2120115600
-          tz.transition 2037, 11, :o1, 2140675200
-          tz.transition 2038, 3, :o2, 19723975, 8
-          tz.transition 2038, 11, :o1, 14794409, 6
-          tz.transition 2039, 3, :o2, 19726887, 8
-          tz.transition 2039, 11, :o1, 14796593, 6
-          tz.transition 2040, 3, :o2, 19729799, 8
-          tz.transition 2040, 11, :o1, 14798777, 6
-          tz.transition 2041, 3, :o2, 19732711, 8
-          tz.transition 2041, 11, :o1, 14800961, 6
-          tz.transition 2042, 3, :o2, 19735623, 8
-          tz.transition 2042, 11, :o1, 14803145, 6
-          tz.transition 2043, 3, :o2, 19738535, 8
-          tz.transition 2043, 11, :o1, 14805329, 6
-          tz.transition 2044, 3, :o2, 19741503, 8
-          tz.transition 2044, 11, :o1, 14807555, 6
-          tz.transition 2045, 3, :o2, 19744415, 8
-          tz.transition 2045, 11, :o1, 14809739, 6
-          tz.transition 2046, 3, :o2, 19747327, 8
-          tz.transition 2046, 11, :o1, 14811923, 6
-          tz.transition 2047, 3, :o2, 19750239, 8
-          tz.transition 2047, 11, :o1, 14814107, 6
-          tz.transition 2048, 3, :o2, 19753151, 8
-          tz.transition 2048, 11, :o1, 14816291, 6
-          tz.transition 2049, 3, :o2, 19756119, 8
-          tz.transition 2049, 11, :o1, 14818517, 6
-          tz.transition 2050, 3, :o2, 19759031, 8
-          tz.transition 2050, 11, :o1, 14820701, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Casey.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Casey.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Casey.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Casey.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module Casey
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/Casey' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 28800, 0, :WST
-          
-          tz.transition 1969, 1, :o1, 4880445, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Davis.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Davis.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Davis.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Davis.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module Davis
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/Davis' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 25200, 0, :DAVT
-          
-          tz.transition 1957, 1, :o1, 4871703, 2
-          tz.transition 1964, 10, :o0, 58528805, 24
-          tz.transition 1969, 2, :o1, 4880507, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/DumontDUrville.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/DumontDUrville.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/DumontDUrville.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/DumontDUrville.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module DumontDUrville
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/DumontDUrville' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 36000, 0, :PMT
-          tz.offset :o2, 36000, 0, :DDUT
-          
-          tz.transition 1947, 1, :o1, 4864373, 2
-          tz.transition 1952, 1, :o0, 29208301, 12
-          tz.transition 1956, 11, :o2, 4871557, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Mawson.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Mawson.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Mawson.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Mawson.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module Mawson
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/Mawson' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 21600, 0, :MAWT
-          
-          tz.transition 1954, 2, :o1, 4869573, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/McMurdo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/McMurdo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/McMurdo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/McMurdo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,171 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module McMurdo
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/McMurdo' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 43200, 0, :NZST
-          tz.offset :o2, 43200, 3600, :NZDT
-          
-          tz.transition 1956, 1, :o1, 4870947, 2
-          tz.transition 1974, 11, :o2, 152632800
-          tz.transition 1975, 2, :o1, 162309600
-          tz.transition 1975, 10, :o2, 183477600
-          tz.transition 1976, 3, :o1, 194968800
-          tz.transition 1976, 10, :o2, 215532000
-          tz.transition 1977, 3, :o1, 226418400
-          tz.transition 1977, 10, :o2, 246981600
-          tz.transition 1978, 3, :o1, 257868000
-          tz.transition 1978, 10, :o2, 278431200
-          tz.transition 1979, 3, :o1, 289317600
-          tz.transition 1979, 10, :o2, 309880800
-          tz.transition 1980, 3, :o1, 320767200
-          tz.transition 1980, 10, :o2, 341330400
-          tz.transition 1981, 2, :o1, 352216800
-          tz.transition 1981, 10, :o2, 372780000
-          tz.transition 1982, 3, :o1, 384271200
-          tz.transition 1982, 10, :o2, 404834400
-          tz.transition 1983, 3, :o1, 415720800
-          tz.transition 1983, 10, :o2, 436284000
-          tz.transition 1984, 3, :o1, 447170400
-          tz.transition 1984, 10, :o2, 467733600
-          tz.transition 1985, 3, :o1, 478620000
-          tz.transition 1985, 10, :o2, 499183200
-          tz.transition 1986, 3, :o1, 510069600
-          tz.transition 1986, 10, :o2, 530632800
-          tz.transition 1987, 2, :o1, 541519200
-          tz.transition 1987, 10, :o2, 562082400
-          tz.transition 1988, 3, :o1, 573573600
-          tz.transition 1988, 10, :o2, 594136800
-          tz.transition 1989, 3, :o1, 605023200
-          tz.transition 1989, 10, :o2, 623772000
-          tz.transition 1990, 3, :o1, 637682400
-          tz.transition 1990, 10, :o2, 655221600
-          tz.transition 1991, 3, :o1, 669132000
-          tz.transition 1991, 10, :o2, 686671200
-          tz.transition 1992, 3, :o1, 700581600
-          tz.transition 1992, 10, :o2, 718120800
-          tz.transition 1993, 3, :o1, 732636000
-          tz.transition 1993, 10, :o2, 749570400
-          tz.transition 1994, 3, :o1, 764085600
-          tz.transition 1994, 10, :o2, 781020000
-          tz.transition 1995, 3, :o1, 795535200
-          tz.transition 1995, 9, :o2, 812469600
-          tz.transition 1996, 3, :o1, 826984800
-          tz.transition 1996, 10, :o2, 844524000
-          tz.transition 1997, 3, :o1, 858434400
-          tz.transition 1997, 10, :o2, 875973600
-          tz.transition 1998, 3, :o1, 889884000
-          tz.transition 1998, 10, :o2, 907423200
-          tz.transition 1999, 3, :o1, 921938400
-          tz.transition 1999, 10, :o2, 938872800
-          tz.transition 2000, 3, :o1, 953388000
-          tz.transition 2000, 9, :o2, 970322400
-          tz.transition 2001, 3, :o1, 984837600
-          tz.transition 2001, 10, :o2, 1002376800
-          tz.transition 2002, 3, :o1, 1016287200
-          tz.transition 2002, 10, :o2, 1033826400
-          tz.transition 2003, 3, :o1, 1047736800
-          tz.transition 2003, 10, :o2, 1065276000
-          tz.transition 2004, 3, :o1, 1079791200
-          tz.transition 2004, 10, :o2, 1096725600
-          tz.transition 2005, 3, :o1, 1111240800
-          tz.transition 2005, 10, :o2, 1128175200
-          tz.transition 2006, 3, :o1, 1142690400
-          tz.transition 2006, 9, :o2, 1159624800
-          tz.transition 2007, 3, :o1, 1174140000
-          tz.transition 2007, 10, :o2, 1191679200
-          tz.transition 2008, 3, :o1, 1205589600
-          tz.transition 2008, 10, :o2, 1223128800
-          tz.transition 2009, 3, :o1, 1237039200
-          tz.transition 2009, 10, :o2, 1254578400
-          tz.transition 2010, 3, :o1, 1269093600
-          tz.transition 2010, 10, :o2, 1286028000
-          tz.transition 2011, 3, :o1, 1300543200
-          tz.transition 2011, 10, :o2, 1317477600
-          tz.transition 2012, 3, :o1, 1331992800
-          tz.transition 2012, 10, :o2, 1349532000
-          tz.transition 2013, 3, :o1, 1363442400
-          tz.transition 2013, 10, :o2, 1380981600
-          tz.transition 2014, 3, :o1, 1394892000
-          tz.transition 2014, 10, :o2, 1412431200
-          tz.transition 2015, 3, :o1, 1426341600
-          tz.transition 2015, 10, :o2, 1443880800
-          tz.transition 2016, 3, :o1, 1458396000
-          tz.transition 2016, 10, :o2, 1475330400
-          tz.transition 2017, 3, :o1, 1489845600
-          tz.transition 2017, 9, :o2, 1506780000
-          tz.transition 2018, 3, :o1, 1521295200
-          tz.transition 2018, 10, :o2, 1538834400
-          tz.transition 2019, 3, :o1, 1552744800
-          tz.transition 2019, 10, :o2, 1570284000
-          tz.transition 2020, 3, :o1, 1584194400
-          tz.transition 2020, 10, :o2, 1601733600
-          tz.transition 2021, 3, :o1, 1616248800
-          tz.transition 2021, 10, :o2, 1633183200
-          tz.transition 2022, 3, :o1, 1647698400
-          tz.transition 2022, 10, :o2, 1664632800
-          tz.transition 2023, 3, :o1, 1679148000
-          tz.transition 2023, 9, :o2, 1696082400
-          tz.transition 2024, 3, :o1, 1710597600
-          tz.transition 2024, 10, :o2, 1728136800
-          tz.transition 2025, 3, :o1, 1742047200
-          tz.transition 2025, 10, :o2, 1759586400
-          tz.transition 2026, 3, :o1, 1773496800
-          tz.transition 2026, 10, :o2, 1791036000
-          tz.transition 2027, 3, :o1, 1805551200
-          tz.transition 2027, 10, :o2, 1822485600
-          tz.transition 2028, 3, :o1, 1837000800
-          tz.transition 2028, 9, :o2, 1853935200
-          tz.transition 2029, 3, :o1, 1868450400
-          tz.transition 2029, 10, :o2, 1885989600
-          tz.transition 2030, 3, :o1, 1899900000
-          tz.transition 2030, 10, :o2, 1917439200
-          tz.transition 2031, 3, :o1, 1931349600
-          tz.transition 2031, 10, :o2, 1948888800
-          tz.transition 2032, 3, :o1, 1963404000
-          tz.transition 2032, 10, :o2, 1980338400
-          tz.transition 2033, 3, :o1, 1994853600
-          tz.transition 2033, 10, :o2, 2011788000
-          tz.transition 2034, 3, :o1, 2026303200
-          tz.transition 2034, 9, :o2, 2043237600
-          tz.transition 2035, 3, :o1, 2057752800
-          tz.transition 2035, 10, :o2, 2075292000
-          tz.transition 2036, 3, :o1, 2089202400
-          tz.transition 2036, 10, :o2, 2106741600
-          tz.transition 2037, 3, :o1, 2120652000
-          tz.transition 2037, 10, :o2, 2138191200
-          tz.transition 2038, 3, :o1, 29586037, 12
-          tz.transition 2038, 10, :o2, 29588389, 12
-          tz.transition 2039, 3, :o1, 29590405, 12
-          tz.transition 2039, 10, :o2, 29592757, 12
-          tz.transition 2040, 3, :o1, 29594773, 12
-          tz.transition 2040, 10, :o2, 29597209, 12
-          tz.transition 2041, 3, :o1, 29599141, 12
-          tz.transition 2041, 10, :o2, 29601577, 12
-          tz.transition 2042, 3, :o1, 29603509, 12
-          tz.transition 2042, 10, :o2, 29605945, 12
-          tz.transition 2043, 3, :o1, 29607877, 12
-          tz.transition 2043, 10, :o2, 29610313, 12
-          tz.transition 2044, 3, :o1, 29612329, 12
-          tz.transition 2044, 10, :o2, 29614681, 12
-          tz.transition 2045, 3, :o1, 29616697, 12
-          tz.transition 2045, 9, :o2, 29619049, 12
-          tz.transition 2046, 3, :o1, 29621065, 12
-          tz.transition 2046, 10, :o2, 29623501, 12
-          tz.transition 2047, 3, :o1, 29625433, 12
-          tz.transition 2047, 10, :o2, 29627869, 12
-          tz.transition 2048, 3, :o1, 29629801, 12
-          tz.transition 2048, 10, :o2, 29632237, 12
-          tz.transition 2049, 3, :o1, 29634253, 12
-          tz.transition 2049, 10, :o2, 29636605, 12
-          tz.transition 2050, 3, :o1, 29638621, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Palmer.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Palmer.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Palmer.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Palmer.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,178 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module Palmer
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/Palmer' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, -14400, 3600, :ARST
-          tz.offset :o2, -14400, 0, :ART
-          tz.offset :o3, -10800, 0, :ART
-          tz.offset :o4, -10800, 3600, :ARST
-          tz.offset :o5, -14400, 0, :CLT
-          tz.offset :o6, -14400, 3600, :CLST
-          
-          tz.transition 1965, 1, :o1, 4877523, 2
-          tz.transition 1965, 3, :o2, 19510565, 8
-          tz.transition 1965, 10, :o1, 7317146, 3
-          tz.transition 1966, 3, :o2, 19513485, 8
-          tz.transition 1966, 10, :o1, 7318241, 3
-          tz.transition 1967, 4, :o2, 19516653, 8
-          tz.transition 1967, 10, :o1, 7319294, 3
-          tz.transition 1968, 4, :o2, 19519629, 8
-          tz.transition 1968, 10, :o1, 7320407, 3
-          tz.transition 1969, 4, :o2, 19522541, 8
-          tz.transition 1969, 10, :o3, 7321499, 3
-          tz.transition 1974, 1, :o4, 128142000
-          tz.transition 1974, 5, :o3, 136605600
-          tz.transition 1974, 10, :o4, 150260400
-          tz.transition 1975, 4, :o3, 165981600
-          tz.transition 1975, 10, :o4, 181710000
-          tz.transition 1976, 4, :o3, 197431200
-          tz.transition 1976, 10, :o4, 213159600
-          tz.transition 1977, 4, :o3, 228880800
-          tz.transition 1982, 5, :o5, 389070000
-          tz.transition 1982, 10, :o6, 403070400
-          tz.transition 1983, 3, :o5, 416372400
-          tz.transition 1983, 10, :o6, 434520000
-          tz.transition 1984, 3, :o5, 447822000
-          tz.transition 1984, 10, :o6, 466574400
-          tz.transition 1985, 3, :o5, 479271600
-          tz.transition 1985, 10, :o6, 498024000
-          tz.transition 1986, 3, :o5, 510721200
-          tz.transition 1986, 10, :o6, 529473600
-          tz.transition 1987, 3, :o5, 542775600
-          tz.transition 1987, 10, :o6, 560923200
-          tz.transition 1988, 3, :o5, 574225200
-          tz.transition 1988, 10, :o6, 592372800
-          tz.transition 1989, 3, :o5, 605674800
-          tz.transition 1989, 10, :o6, 624427200
-          tz.transition 1990, 3, :o5, 637124400
-          tz.transition 1990, 10, :o6, 655876800
-          tz.transition 1991, 3, :o5, 668574000
-          tz.transition 1991, 10, :o6, 687326400
-          tz.transition 1992, 3, :o5, 700628400
-          tz.transition 1992, 10, :o6, 718776000
-          tz.transition 1993, 3, :o5, 732078000
-          tz.transition 1993, 10, :o6, 750225600
-          tz.transition 1994, 3, :o5, 763527600
-          tz.transition 1994, 10, :o6, 781675200
-          tz.transition 1995, 3, :o5, 794977200
-          tz.transition 1995, 10, :o6, 813729600
-          tz.transition 1996, 3, :o5, 826426800
-          tz.transition 1996, 10, :o6, 845179200
-          tz.transition 1997, 3, :o5, 857876400
-          tz.transition 1997, 10, :o6, 876628800
-          tz.transition 1998, 3, :o5, 889930800
-          tz.transition 1998, 9, :o6, 906868800
-          tz.transition 1999, 4, :o5, 923194800
-          tz.transition 1999, 10, :o6, 939528000
-          tz.transition 2000, 3, :o5, 952830000
-          tz.transition 2000, 10, :o6, 971582400
-          tz.transition 2001, 3, :o5, 984279600
-          tz.transition 2001, 10, :o6, 1003032000
-          tz.transition 2002, 3, :o5, 1015729200
-          tz.transition 2002, 10, :o6, 1034481600
-          tz.transition 2003, 3, :o5, 1047178800
-          tz.transition 2003, 10, :o6, 1065931200
-          tz.transition 2004, 3, :o5, 1079233200
-          tz.transition 2004, 10, :o6, 1097380800
-          tz.transition 2005, 3, :o5, 1110682800
-          tz.transition 2005, 10, :o6, 1128830400
-          tz.transition 2006, 3, :o5, 1142132400
-          tz.transition 2006, 10, :o6, 1160884800
-          tz.transition 2007, 3, :o5, 1173582000
-          tz.transition 2007, 10, :o6, 1192334400
-          tz.transition 2008, 3, :o5, 1205031600
-          tz.transition 2008, 10, :o6, 1223784000
-          tz.transition 2009, 3, :o5, 1237086000
-          tz.transition 2009, 10, :o6, 1255233600
-          tz.transition 2010, 3, :o5, 1268535600
-          tz.transition 2010, 10, :o6, 1286683200
-          tz.transition 2011, 3, :o5, 1299985200
-          tz.transition 2011, 10, :o6, 1318132800
-          tz.transition 2012, 3, :o5, 1331434800
-          tz.transition 2012, 10, :o6, 1350187200
-          tz.transition 2013, 3, :o5, 1362884400
-          tz.transition 2013, 10, :o6, 1381636800
-          tz.transition 2014, 3, :o5, 1394334000
-          tz.transition 2014, 10, :o6, 1413086400
-          tz.transition 2015, 3, :o5, 1426388400
-          tz.transition 2015, 10, :o6, 1444536000
-          tz.transition 2016, 3, :o5, 1457838000
-          tz.transition 2016, 10, :o6, 1475985600
-          tz.transition 2017, 3, :o5, 1489287600
-          tz.transition 2017, 10, :o6, 1508040000
-          tz.transition 2018, 3, :o5, 1520737200
-          tz.transition 2018, 10, :o6, 1539489600
-          tz.transition 2019, 3, :o5, 1552186800
-          tz.transition 2019, 10, :o6, 1570939200
-          tz.transition 2020, 3, :o5, 1584241200
-          tz.transition 2020, 10, :o6, 1602388800
-          tz.transition 2021, 3, :o5, 1615690800
-          tz.transition 2021, 10, :o6, 1633838400
-          tz.transition 2022, 3, :o5, 1647140400
-          tz.transition 2022, 10, :o6, 1665288000
-          tz.transition 2023, 3, :o5, 1678590000
-          tz.transition 2023, 10, :o6, 1697342400
-          tz.transition 2024, 3, :o5, 1710039600
-          tz.transition 2024, 10, :o6, 1728792000
-          tz.transition 2025, 3, :o5, 1741489200
-          tz.transition 2025, 10, :o6, 1760241600
-          tz.transition 2026, 3, :o5, 1773543600
-          tz.transition 2026, 10, :o6, 1791691200
-          tz.transition 2027, 3, :o5, 1804993200
-          tz.transition 2027, 10, :o6, 1823140800
-          tz.transition 2028, 3, :o5, 1836442800
-          tz.transition 2028, 10, :o6, 1855195200
-          tz.transition 2029, 3, :o5, 1867892400
-          tz.transition 2029, 10, :o6, 1886644800
-          tz.transition 2030, 3, :o5, 1899342000
-          tz.transition 2030, 10, :o6, 1918094400
-          tz.transition 2031, 3, :o5, 1930791600
-          tz.transition 2031, 10, :o6, 1949544000
-          tz.transition 2032, 3, :o5, 1962846000
-          tz.transition 2032, 10, :o6, 1980993600
-          tz.transition 2033, 3, :o5, 1994295600
-          tz.transition 2033, 10, :o6, 2012443200
-          tz.transition 2034, 3, :o5, 2025745200
-          tz.transition 2034, 10, :o6, 2044497600
-          tz.transition 2035, 3, :o5, 2057194800
-          tz.transition 2035, 10, :o6, 2075947200
-          tz.transition 2036, 3, :o5, 2088644400
-          tz.transition 2036, 10, :o6, 2107396800
-          tz.transition 2037, 3, :o5, 2120698800
-          tz.transition 2037, 10, :o6, 2138846400
-          tz.transition 2038, 3, :o5, 19723973, 8
-          tz.transition 2038, 10, :o6, 7397120, 3
-          tz.transition 2039, 3, :o5, 19726885, 8
-          tz.transition 2039, 10, :o6, 7398212, 3
-          tz.transition 2040, 3, :o5, 19729797, 8
-          tz.transition 2040, 10, :o6, 7399325, 3
-          tz.transition 2041, 3, :o5, 19732709, 8
-          tz.transition 2041, 10, :o6, 7400417, 3
-          tz.transition 2042, 3, :o5, 19735621, 8
-          tz.transition 2042, 10, :o6, 7401509, 3
-          tz.transition 2043, 3, :o5, 19738589, 8
-          tz.transition 2043, 10, :o6, 7402601, 3
-          tz.transition 2044, 3, :o5, 19741501, 8
-          tz.transition 2044, 10, :o6, 7403693, 3
-          tz.transition 2045, 3, :o5, 19744413, 8
-          tz.transition 2045, 10, :o6, 7404806, 3
-          tz.transition 2046, 3, :o5, 19747325, 8
-          tz.transition 2046, 10, :o6, 7405898, 3
-          tz.transition 2047, 3, :o5, 19750237, 8
-          tz.transition 2047, 10, :o6, 7406990, 3
-          tz.transition 2048, 3, :o5, 19753205, 8
-          tz.transition 2048, 10, :o6, 7408082, 3
-          tz.transition 2049, 3, :o5, 19756117, 8
-          tz.transition 2049, 10, :o6, 7409174, 3
-          tz.transition 2050, 3, :o5, 19759029, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Rothera.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Rothera.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Rothera.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Rothera.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module Rothera
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/Rothera' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, -10800, 0, :ROTT
-          
-          tz.transition 1976, 12, :o1, 218246400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/South_Pole.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/South_Pole.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/South_Pole.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/South_Pole.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module South_Pole
-        include TimezoneDefinition
-        
-        linked_timezone 'Antarctica/South_Pole', 'Antarctica/McMurdo'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Syowa.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Syowa.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Syowa.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Syowa.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module Syowa
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/Syowa' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 10800, 0, :SYOT
-          
-          tz.transition 1957, 1, :o1, 4871735, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Vostok.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Vostok.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Vostok.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Antarctica/Vostok.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Antarctica
-      module Vostok
-        include TimezoneDefinition
-        
-        timezone 'Antarctica/Vostok' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 21600, 0, :VOST
-          
-          tz.transition 1957, 12, :o1, 4872377, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Arctic/Longyearbyen.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Arctic/Longyearbyen.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Arctic/Longyearbyen.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Arctic/Longyearbyen.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Arctic
-      module Longyearbyen
-        include TimezoneDefinition
-        
-        linked_timezone 'Arctic/Longyearbyen', 'Europe/Oslo'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aden.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aden.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aden.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aden.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Aden
-        include TimezoneDefinition
-        
-        timezone 'Asia/Aden' do |tz|
-          tz.offset :o0, 10848, 0, :LMT
-          tz.offset :o1, 10800, 0, :AST
-          
-          tz.transition 1949, 12, :o1, 2189954137, 900
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Almaty.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Almaty.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Almaty.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Almaty.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,67 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Almaty
-        include TimezoneDefinition
-        
-        timezone 'Asia/Almaty' do |tz|
-          tz.offset :o0, 18468, 0, :LMT
-          tz.offset :o1, 18000, 0, :ALMT
-          tz.offset :o2, 21600, 0, :ALMT
-          tz.offset :o3, 21600, 3600, :ALMST
-          
-          tz.transition 1924, 5, :o1, 1939125829, 800
-          tz.transition 1930, 6, :o2, 58227559, 24
-          tz.transition 1981, 3, :o3, 354909600
-          tz.transition 1981, 9, :o2, 370717200
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402253200
-          tz.transition 1983, 3, :o3, 417981600
-          tz.transition 1983, 9, :o2, 433789200
-          tz.transition 1984, 3, :o3, 449604000
-          tz.transition 1984, 9, :o2, 465336000
-          tz.transition 1985, 3, :o3, 481060800
-          tz.transition 1985, 9, :o2, 496785600
-          tz.transition 1986, 3, :o3, 512510400
-          tz.transition 1986, 9, :o2, 528235200
-          tz.transition 1987, 3, :o3, 543960000
-          tz.transition 1987, 9, :o2, 559684800
-          tz.transition 1988, 3, :o3, 575409600
-          tz.transition 1988, 9, :o2, 591134400
-          tz.transition 1989, 3, :o3, 606859200
-          tz.transition 1989, 9, :o2, 622584000
-          tz.transition 1990, 3, :o3, 638308800
-          tz.transition 1990, 9, :o2, 654638400
-          tz.transition 1992, 3, :o3, 701802000
-          tz.transition 1992, 9, :o2, 717523200
-          tz.transition 1993, 3, :o3, 733262400
-          tz.transition 1993, 9, :o2, 748987200
-          tz.transition 1994, 3, :o3, 764712000
-          tz.transition 1994, 9, :o2, 780436800
-          tz.transition 1995, 3, :o3, 796161600
-          tz.transition 1995, 9, :o2, 811886400
-          tz.transition 1996, 3, :o3, 828216000
-          tz.transition 1996, 10, :o2, 846360000
-          tz.transition 1997, 3, :o3, 859665600
-          tz.transition 1997, 10, :o2, 877809600
-          tz.transition 1998, 3, :o3, 891115200
-          tz.transition 1998, 10, :o2, 909259200
-          tz.transition 1999, 3, :o3, 922564800
-          tz.transition 1999, 10, :o2, 941313600
-          tz.transition 2000, 3, :o3, 954014400
-          tz.transition 2000, 10, :o2, 972763200
-          tz.transition 2001, 3, :o3, 985464000
-          tz.transition 2001, 10, :o2, 1004212800
-          tz.transition 2002, 3, :o3, 1017518400
-          tz.transition 2002, 10, :o2, 1035662400
-          tz.transition 2003, 3, :o3, 1048968000
-          tz.transition 2003, 10, :o2, 1067112000
-          tz.transition 2004, 3, :o3, 1080417600
-          tz.transition 2004, 10, :o2, 1099166400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Amman.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Amman.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Amman.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Amman.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Amman
-        include TimezoneDefinition
-        
-        timezone 'Asia/Amman' do |tz|
-          tz.offset :o0, 8624, 0, :LMT
-          tz.offset :o1, 7200, 0, :EET
-          tz.offset :o2, 7200, 3600, :EEST
-          
-          tz.transition 1930, 12, :o1, 13102248961, 5400
-          tz.transition 1973, 6, :o2, 108165600
-          tz.transition 1973, 9, :o1, 118270800
-          tz.transition 1974, 4, :o2, 136591200
-          tz.transition 1974, 9, :o1, 149806800
-          tz.transition 1975, 4, :o2, 168127200
-          tz.transition 1975, 9, :o1, 181342800
-          tz.transition 1976, 4, :o2, 199749600
-          tz.transition 1976, 10, :o1, 215643600
-          tz.transition 1977, 4, :o2, 231285600
-          tz.transition 1977, 9, :o1, 244501200
-          tz.transition 1978, 4, :o2, 262735200
-          tz.transition 1978, 9, :o1, 275950800
-          tz.transition 1985, 3, :o2, 481154400
-          tz.transition 1985, 9, :o1, 496962000
-          tz.transition 1986, 4, :o2, 512949600
-          tz.transition 1986, 10, :o1, 528670800
-          tz.transition 1987, 4, :o2, 544399200
-          tz.transition 1987, 10, :o1, 560120400
-          tz.transition 1988, 3, :o2, 575848800
-          tz.transition 1988, 10, :o1, 592174800
-          tz.transition 1989, 5, :o2, 610581600
-          tz.transition 1989, 10, :o1, 623624400
-          tz.transition 1990, 4, :o2, 641167200
-          tz.transition 1990, 10, :o1, 655074000
-          tz.transition 1991, 4, :o2, 671839200
-          tz.transition 1991, 9, :o1, 685918800
-          tz.transition 1992, 4, :o2, 702856800
-          tz.transition 1992, 10, :o1, 717973200
-          tz.transition 1993, 4, :o2, 733701600
-          tz.transition 1993, 9, :o1, 749422800
-          tz.transition 1994, 3, :o2, 765151200
-          tz.transition 1994, 9, :o1, 779662800
-          tz.transition 1995, 4, :o2, 797205600
-          tz.transition 1995, 9, :o1, 811116000
-          tz.transition 1996, 4, :o2, 828655200
-          tz.transition 1996, 9, :o1, 843170400
-          tz.transition 1997, 4, :o2, 860104800
-          tz.transition 1997, 9, :o1, 874620000
-          tz.transition 1998, 4, :o2, 891554400
-          tz.transition 1998, 9, :o1, 906069600
-          tz.transition 1999, 6, :o2, 930780000
-          tz.transition 1999, 9, :o1, 938642400
-          tz.transition 2000, 3, :o2, 954367200
-          tz.transition 2000, 9, :o1, 970092000
-          tz.transition 2001, 3, :o2, 985816800
-          tz.transition 2001, 9, :o1, 1001541600
-          tz.transition 2002, 3, :o2, 1017266400
-          tz.transition 2002, 9, :o1, 1032991200
-          tz.transition 2003, 3, :o2, 1048716000
-          tz.transition 2003, 10, :o1, 1066946400
-          tz.transition 2004, 3, :o2, 1080165600
-          tz.transition 2004, 10, :o1, 1097791200
-          tz.transition 2005, 3, :o2, 1112220000
-          tz.transition 2005, 9, :o1, 1128031200
-          tz.transition 2006, 3, :o2, 1143669600
-          tz.transition 2006, 10, :o1, 1161900000
-          tz.transition 2007, 3, :o2, 1175119200
-          tz.transition 2007, 10, :o1, 1193349600
-          tz.transition 2008, 3, :o2, 1206568800
-          tz.transition 2008, 10, :o1, 1225404000
-          tz.transition 2009, 3, :o2, 1238018400
-          tz.transition 2009, 10, :o1, 1256853600
-          tz.transition 2010, 3, :o2, 1269468000
-          tz.transition 2010, 10, :o1, 1288303200
-          tz.transition 2011, 3, :o2, 1301522400
-          tz.transition 2011, 10, :o1, 1319752800
-          tz.transition 2012, 3, :o2, 1332972000
-          tz.transition 2012, 10, :o1, 1351202400
-          tz.transition 2013, 3, :o2, 1364421600
-          tz.transition 2013, 10, :o1, 1382652000
-          tz.transition 2014, 3, :o2, 1395871200
-          tz.transition 2014, 10, :o1, 1414706400
-          tz.transition 2015, 3, :o2, 1427320800
-          tz.transition 2015, 10, :o1, 1446156000
-          tz.transition 2016, 3, :o2, 1459375200
-          tz.transition 2016, 10, :o1, 1477605600
-          tz.transition 2017, 3, :o2, 1490824800
-          tz.transition 2017, 10, :o1, 1509055200
-          tz.transition 2018, 3, :o2, 1522274400
-          tz.transition 2018, 10, :o1, 1540504800
-          tz.transition 2019, 3, :o2, 1553724000
-          tz.transition 2019, 10, :o1, 1571954400
-          tz.transition 2020, 3, :o2, 1585173600
-          tz.transition 2020, 10, :o1, 1604008800
-          tz.transition 2021, 3, :o2, 1616623200
-          tz.transition 2021, 10, :o1, 1635458400
-          tz.transition 2022, 3, :o2, 1648677600
-          tz.transition 2022, 10, :o1, 1666908000
-          tz.transition 2023, 3, :o2, 1680127200
-          tz.transition 2023, 10, :o1, 1698357600
-          tz.transition 2024, 3, :o2, 1711576800
-          tz.transition 2024, 10, :o1, 1729807200
-          tz.transition 2025, 3, :o2, 1743026400
-          tz.transition 2025, 10, :o1, 1761861600
-          tz.transition 2026, 3, :o2, 1774476000
-          tz.transition 2026, 10, :o1, 1793311200
-          tz.transition 2027, 3, :o2, 1805925600
-          tz.transition 2027, 10, :o1, 1824760800
-          tz.transition 2028, 3, :o2, 1837980000
-          tz.transition 2028, 10, :o1, 1856210400
-          tz.transition 2029, 3, :o2, 1869429600
-          tz.transition 2029, 10, :o1, 1887660000
-          tz.transition 2030, 3, :o2, 1900879200
-          tz.transition 2030, 10, :o1, 1919109600
-          tz.transition 2031, 3, :o2, 1932328800
-          tz.transition 2031, 10, :o1, 1951164000
-          tz.transition 2032, 3, :o2, 1963778400
-          tz.transition 2032, 10, :o1, 1982613600
-          tz.transition 2033, 3, :o2, 1995832800
-          tz.transition 2033, 10, :o1, 2014063200
-          tz.transition 2034, 3, :o2, 2027282400
-          tz.transition 2034, 10, :o1, 2045512800
-          tz.transition 2035, 3, :o2, 2058732000
-          tz.transition 2035, 10, :o1, 2076962400
-          tz.transition 2036, 3, :o2, 2090181600
-          tz.transition 2036, 10, :o1, 2109016800
-          tz.transition 2037, 3, :o2, 2121631200
-          tz.transition 2037, 10, :o1, 2140466400
-          tz.transition 2038, 3, :o2, 29586089, 12
-          tz.transition 2038, 10, :o1, 29588705, 12
-          tz.transition 2039, 3, :o2, 29590541, 12
-          tz.transition 2039, 10, :o1, 29593073, 12
-          tz.transition 2040, 3, :o2, 29594909, 12
-          tz.transition 2040, 10, :o1, 29597441, 12
-          tz.transition 2041, 3, :o2, 29599277, 12
-          tz.transition 2041, 10, :o1, 29601809, 12
-          tz.transition 2042, 3, :o2, 29603645, 12
-          tz.transition 2042, 10, :o1, 29606261, 12
-          tz.transition 2043, 3, :o2, 29608013, 12
-          tz.transition 2043, 10, :o1, 29610629, 12
-          tz.transition 2044, 3, :o2, 29612465, 12
-          tz.transition 2044, 10, :o1, 29614997, 12
-          tz.transition 2045, 3, :o2, 29616833, 12
-          tz.transition 2045, 10, :o1, 29619365, 12
-          tz.transition 2046, 3, :o2, 29621201, 12
-          tz.transition 2046, 10, :o1, 29623733, 12
-          tz.transition 2047, 3, :o2, 29625569, 12
-          tz.transition 2047, 10, :o1, 29628101, 12
-          tz.transition 2048, 3, :o2, 29629937, 12
-          tz.transition 2048, 10, :o1, 29632553, 12
-          tz.transition 2049, 3, :o2, 29634305, 12
-          tz.transition 2049, 10, :o1, 29636921, 12
-          tz.transition 2050, 3, :o2, 29638757, 12
-          tz.transition 2050, 10, :o1, 29641289, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Anadyr.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Anadyr.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Anadyr.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Anadyr.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Anadyr
-        include TimezoneDefinition
-        
-        timezone 'Asia/Anadyr' do |tz|
-          tz.offset :o0, 42596, 0, :LMT
-          tz.offset :o1, 43200, 0, :ANAT
-          tz.offset :o2, 46800, 0, :ANAT
-          tz.offset :o3, 46800, 3600, :ANAST
-          tz.offset :o4, 43200, 3600, :ANAST
-          tz.offset :o5, 39600, 3600, :ANAST
-          tz.offset :o6, 39600, 0, :ANAT
-          
-          tz.transition 1924, 5, :o1, 52356391351, 21600
-          tz.transition 1930, 6, :o2, 2426148, 1
-          tz.transition 1981, 3, :o3, 354884400
-          tz.transition 1981, 9, :o2, 370692000
-          tz.transition 1982, 3, :o4, 386420400
-          tz.transition 1982, 9, :o1, 402231600
-          tz.transition 1983, 3, :o4, 417960000
-          tz.transition 1983, 9, :o1, 433767600
-          tz.transition 1984, 3, :o4, 449582400
-          tz.transition 1984, 9, :o1, 465314400
-          tz.transition 1985, 3, :o4, 481039200
-          tz.transition 1985, 9, :o1, 496764000
-          tz.transition 1986, 3, :o4, 512488800
-          tz.transition 1986, 9, :o1, 528213600
-          tz.transition 1987, 3, :o4, 543938400
-          tz.transition 1987, 9, :o1, 559663200
-          tz.transition 1988, 3, :o4, 575388000
-          tz.transition 1988, 9, :o1, 591112800
-          tz.transition 1989, 3, :o4, 606837600
-          tz.transition 1989, 9, :o1, 622562400
-          tz.transition 1990, 3, :o4, 638287200
-          tz.transition 1990, 9, :o1, 654616800
-          tz.transition 1991, 3, :o5, 670341600
-          tz.transition 1991, 9, :o6, 686070000
-          tz.transition 1992, 1, :o1, 695746800
-          tz.transition 1992, 3, :o4, 701780400
-          tz.transition 1992, 9, :o1, 717501600
-          tz.transition 1993, 3, :o4, 733240800
-          tz.transition 1993, 9, :o1, 748965600
-          tz.transition 1994, 3, :o4, 764690400
-          tz.transition 1994, 9, :o1, 780415200
-          tz.transition 1995, 3, :o4, 796140000
-          tz.transition 1995, 9, :o1, 811864800
-          tz.transition 1996, 3, :o4, 828194400
-          tz.transition 1996, 10, :o1, 846338400
-          tz.transition 1997, 3, :o4, 859644000
-          tz.transition 1997, 10, :o1, 877788000
-          tz.transition 1998, 3, :o4, 891093600
-          tz.transition 1998, 10, :o1, 909237600
-          tz.transition 1999, 3, :o4, 922543200
-          tz.transition 1999, 10, :o1, 941292000
-          tz.transition 2000, 3, :o4, 953992800
-          tz.transition 2000, 10, :o1, 972741600
-          tz.transition 2001, 3, :o4, 985442400
-          tz.transition 2001, 10, :o1, 1004191200
-          tz.transition 2002, 3, :o4, 1017496800
-          tz.transition 2002, 10, :o1, 1035640800
-          tz.transition 2003, 3, :o4, 1048946400
-          tz.transition 2003, 10, :o1, 1067090400
-          tz.transition 2004, 3, :o4, 1080396000
-          tz.transition 2004, 10, :o1, 1099144800
-          tz.transition 2005, 3, :o4, 1111845600
-          tz.transition 2005, 10, :o1, 1130594400
-          tz.transition 2006, 3, :o4, 1143295200
-          tz.transition 2006, 10, :o1, 1162044000
-          tz.transition 2007, 3, :o4, 1174744800
-          tz.transition 2007, 10, :o1, 1193493600
-          tz.transition 2008, 3, :o4, 1206799200
-          tz.transition 2008, 10, :o1, 1224943200
-          tz.transition 2009, 3, :o4, 1238248800
-          tz.transition 2009, 10, :o1, 1256392800
-          tz.transition 2010, 3, :o4, 1269698400
-          tz.transition 2010, 10, :o1, 1288447200
-          tz.transition 2011, 3, :o4, 1301148000
-          tz.transition 2011, 10, :o1, 1319896800
-          tz.transition 2012, 3, :o4, 1332597600
-          tz.transition 2012, 10, :o1, 1351346400
-          tz.transition 2013, 3, :o4, 1364652000
-          tz.transition 2013, 10, :o1, 1382796000
-          tz.transition 2014, 3, :o4, 1396101600
-          tz.transition 2014, 10, :o1, 1414245600
-          tz.transition 2015, 3, :o4, 1427551200
-          tz.transition 2015, 10, :o1, 1445695200
-          tz.transition 2016, 3, :o4, 1459000800
-          tz.transition 2016, 10, :o1, 1477749600
-          tz.transition 2017, 3, :o4, 1490450400
-          tz.transition 2017, 10, :o1, 1509199200
-          tz.transition 2018, 3, :o4, 1521900000
-          tz.transition 2018, 10, :o1, 1540648800
-          tz.transition 2019, 3, :o4, 1553954400
-          tz.transition 2019, 10, :o1, 1572098400
-          tz.transition 2020, 3, :o4, 1585404000
-          tz.transition 2020, 10, :o1, 1603548000
-          tz.transition 2021, 3, :o4, 1616853600
-          tz.transition 2021, 10, :o1, 1635602400
-          tz.transition 2022, 3, :o4, 1648303200
-          tz.transition 2022, 10, :o1, 1667052000
-          tz.transition 2023, 3, :o4, 1679752800
-          tz.transition 2023, 10, :o1, 1698501600
-          tz.transition 2024, 3, :o4, 1711807200
-          tz.transition 2024, 10, :o1, 1729951200
-          tz.transition 2025, 3, :o4, 1743256800
-          tz.transition 2025, 10, :o1, 1761400800
-          tz.transition 2026, 3, :o4, 1774706400
-          tz.transition 2026, 10, :o1, 1792850400
-          tz.transition 2027, 3, :o4, 1806156000
-          tz.transition 2027, 10, :o1, 1824904800
-          tz.transition 2028, 3, :o4, 1837605600
-          tz.transition 2028, 10, :o1, 1856354400
-          tz.transition 2029, 3, :o4, 1869055200
-          tz.transition 2029, 10, :o1, 1887804000
-          tz.transition 2030, 3, :o4, 1901109600
-          tz.transition 2030, 10, :o1, 1919253600
-          tz.transition 2031, 3, :o4, 1932559200
-          tz.transition 2031, 10, :o1, 1950703200
-          tz.transition 2032, 3, :o4, 1964008800
-          tz.transition 2032, 10, :o1, 1982757600
-          tz.transition 2033, 3, :o4, 1995458400
-          tz.transition 2033, 10, :o1, 2014207200
-          tz.transition 2034, 3, :o4, 2026908000
-          tz.transition 2034, 10, :o1, 2045656800
-          tz.transition 2035, 3, :o4, 2058357600
-          tz.transition 2035, 10, :o1, 2077106400
-          tz.transition 2036, 3, :o4, 2090412000
-          tz.transition 2036, 10, :o1, 2108556000
-          tz.transition 2037, 3, :o4, 2121861600
-          tz.transition 2037, 10, :o1, 2140005600
-          tz.transition 2038, 3, :o4, 29586121, 12
-          tz.transition 2038, 10, :o1, 29588725, 12
-          tz.transition 2039, 3, :o4, 29590489, 12
-          tz.transition 2039, 10, :o1, 29593093, 12
-          tz.transition 2040, 3, :o4, 29594857, 12
-          tz.transition 2040, 10, :o1, 29597461, 12
-          tz.transition 2041, 3, :o4, 29599309, 12
-          tz.transition 2041, 10, :o1, 29601829, 12
-          tz.transition 2042, 3, :o4, 29603677, 12
-          tz.transition 2042, 10, :o1, 29606197, 12
-          tz.transition 2043, 3, :o4, 29608045, 12
-          tz.transition 2043, 10, :o1, 29610565, 12
-          tz.transition 2044, 3, :o4, 29612413, 12
-          tz.transition 2044, 10, :o1, 29615017, 12
-          tz.transition 2045, 3, :o4, 29616781, 12
-          tz.transition 2045, 10, :o1, 29619385, 12
-          tz.transition 2046, 3, :o4, 29621149, 12
-          tz.transition 2046, 10, :o1, 29623753, 12
-          tz.transition 2047, 3, :o4, 29625601, 12
-          tz.transition 2047, 10, :o1, 29628121, 12
-          tz.transition 2048, 3, :o4, 29629969, 12
-          tz.transition 2048, 10, :o1, 29632489, 12
-          tz.transition 2049, 3, :o4, 29634337, 12
-          tz.transition 2049, 10, :o1, 29636941, 12
-          tz.transition 2050, 3, :o4, 29638705, 12
-          tz.transition 2050, 10, :o1, 29641309, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtau.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtau.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtau.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtau.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,75 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Aqtau
-        include TimezoneDefinition
-        
-        timezone 'Asia/Aqtau' do |tz|
-          tz.offset :o0, 12064, 0, :LMT
-          tz.offset :o1, 14400, 0, :FORT
-          tz.offset :o2, 18000, 0, :FORT
-          tz.offset :o3, 18000, 0, :SHET
-          tz.offset :o4, 21600, 0, :SHET
-          tz.offset :o5, 18000, 3600, :SHEST
-          tz.offset :o6, 18000, 0, :AQTT
-          tz.offset :o7, 18000, 3600, :AQTST
-          tz.offset :o8, 14400, 3600, :AQTST
-          tz.offset :o9, 14400, 0, :AQTT
-          
-          tz.transition 1924, 5, :o1, 6544549873, 2700
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1962, 12, :o3, 58512727, 24
-          tz.transition 1981, 9, :o4, 370724400
-          tz.transition 1982, 3, :o5, 386445600
-          tz.transition 1982, 9, :o3, 402256800
-          tz.transition 1983, 3, :o5, 417985200
-          tz.transition 1983, 9, :o3, 433792800
-          tz.transition 1984, 3, :o5, 449607600
-          tz.transition 1984, 9, :o3, 465339600
-          tz.transition 1985, 3, :o5, 481064400
-          tz.transition 1985, 9, :o3, 496789200
-          tz.transition 1986, 3, :o5, 512514000
-          tz.transition 1986, 9, :o3, 528238800
-          tz.transition 1987, 3, :o5, 543963600
-          tz.transition 1987, 9, :o3, 559688400
-          tz.transition 1988, 3, :o5, 575413200
-          tz.transition 1988, 9, :o3, 591138000
-          tz.transition 1989, 3, :o5, 606862800
-          tz.transition 1989, 9, :o3, 622587600
-          tz.transition 1990, 3, :o5, 638312400
-          tz.transition 1990, 9, :o3, 654642000
-          tz.transition 1991, 12, :o6, 692823600
-          tz.transition 1992, 3, :o7, 701805600
-          tz.transition 1992, 9, :o6, 717526800
-          tz.transition 1993, 3, :o7, 733266000
-          tz.transition 1993, 9, :o6, 748990800
-          tz.transition 1994, 3, :o7, 764715600
-          tz.transition 1994, 9, :o6, 780440400
-          tz.transition 1995, 3, :o8, 796165200
-          tz.transition 1995, 9, :o9, 811893600
-          tz.transition 1996, 3, :o8, 828223200
-          tz.transition 1996, 10, :o9, 846367200
-          tz.transition 1997, 3, :o8, 859672800
-          tz.transition 1997, 10, :o9, 877816800
-          tz.transition 1998, 3, :o8, 891122400
-          tz.transition 1998, 10, :o9, 909266400
-          tz.transition 1999, 3, :o8, 922572000
-          tz.transition 1999, 10, :o9, 941320800
-          tz.transition 2000, 3, :o8, 954021600
-          tz.transition 2000, 10, :o9, 972770400
-          tz.transition 2001, 3, :o8, 985471200
-          tz.transition 2001, 10, :o9, 1004220000
-          tz.transition 2002, 3, :o8, 1017525600
-          tz.transition 2002, 10, :o9, 1035669600
-          tz.transition 2003, 3, :o8, 1048975200
-          tz.transition 2003, 10, :o9, 1067119200
-          tz.transition 2004, 3, :o8, 1080424800
-          tz.transition 2004, 10, :o9, 1099173600
-          tz.transition 2005, 3, :o6, 1110830400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtobe.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtobe.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtobe.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Aqtobe.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,71 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Aqtobe
-        include TimezoneDefinition
-        
-        timezone 'Asia/Aqtobe' do |tz|
-          tz.offset :o0, 13720, 0, :LMT
-          tz.offset :o1, 14400, 0, :AKTT
-          tz.offset :o2, 18000, 0, :AKTT
-          tz.offset :o3, 18000, 3600, :AKTST
-          tz.offset :o4, 21600, 0, :AKTT
-          tz.offset :o5, 18000, 0, :AQTT
-          tz.offset :o6, 18000, 3600, :AQTST
-          
-          tz.transition 1924, 5, :o1, 5235639857, 2160
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1981, 3, :o3, 354913200
-          tz.transition 1981, 9, :o4, 370720800
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402256800
-          tz.transition 1983, 3, :o3, 417985200
-          tz.transition 1983, 9, :o2, 433792800
-          tz.transition 1984, 3, :o3, 449607600
-          tz.transition 1984, 9, :o2, 465339600
-          tz.transition 1985, 3, :o3, 481064400
-          tz.transition 1985, 9, :o2, 496789200
-          tz.transition 1986, 3, :o3, 512514000
-          tz.transition 1986, 9, :o2, 528238800
-          tz.transition 1987, 3, :o3, 543963600
-          tz.transition 1987, 9, :o2, 559688400
-          tz.transition 1988, 3, :o3, 575413200
-          tz.transition 1988, 9, :o2, 591138000
-          tz.transition 1989, 3, :o3, 606862800
-          tz.transition 1989, 9, :o2, 622587600
-          tz.transition 1990, 3, :o3, 638312400
-          tz.transition 1990, 9, :o2, 654642000
-          tz.transition 1991, 12, :o5, 692823600
-          tz.transition 1992, 3, :o6, 701805600
-          tz.transition 1992, 9, :o5, 717526800
-          tz.transition 1993, 3, :o6, 733266000
-          tz.transition 1993, 9, :o5, 748990800
-          tz.transition 1994, 3, :o6, 764715600
-          tz.transition 1994, 9, :o5, 780440400
-          tz.transition 1995, 3, :o6, 796165200
-          tz.transition 1995, 9, :o5, 811890000
-          tz.transition 1996, 3, :o6, 828219600
-          tz.transition 1996, 10, :o5, 846363600
-          tz.transition 1997, 3, :o6, 859669200
-          tz.transition 1997, 10, :o5, 877813200
-          tz.transition 1998, 3, :o6, 891118800
-          tz.transition 1998, 10, :o5, 909262800
-          tz.transition 1999, 3, :o6, 922568400
-          tz.transition 1999, 10, :o5, 941317200
-          tz.transition 2000, 3, :o6, 954018000
-          tz.transition 2000, 10, :o5, 972766800
-          tz.transition 2001, 3, :o6, 985467600
-          tz.transition 2001, 10, :o5, 1004216400
-          tz.transition 2002, 3, :o6, 1017522000
-          tz.transition 2002, 10, :o5, 1035666000
-          tz.transition 2003, 3, :o6, 1048971600
-          tz.transition 2003, 10, :o5, 1067115600
-          tz.transition 2004, 3, :o6, 1080421200
-          tz.transition 2004, 10, :o5, 1099170000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashgabat.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashgabat.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashgabat.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashgabat.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,48 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Ashgabat
-        include TimezoneDefinition
-        
-        timezone 'Asia/Ashgabat' do |tz|
-          tz.offset :o0, 14012, 0, :LMT
-          tz.offset :o1, 14400, 0, :ASHT
-          tz.offset :o2, 18000, 0, :ASHT
-          tz.offset :o3, 18000, 3600, :ASHST
-          tz.offset :o4, 14400, 3600, :ASHST
-          tz.offset :o5, 14400, 0, :TMT
-          tz.offset :o6, 18000, 0, :TMT
-          
-          tz.transition 1924, 5, :o1, 52356398497, 21600
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1981, 3, :o3, 354913200
-          tz.transition 1981, 9, :o2, 370720800
-          tz.transition 1982, 3, :o3, 386449200
-          tz.transition 1982, 9, :o2, 402256800
-          tz.transition 1983, 3, :o3, 417985200
-          tz.transition 1983, 9, :o2, 433792800
-          tz.transition 1984, 3, :o3, 449607600
-          tz.transition 1984, 9, :o2, 465339600
-          tz.transition 1985, 3, :o3, 481064400
-          tz.transition 1985, 9, :o2, 496789200
-          tz.transition 1986, 3, :o3, 512514000
-          tz.transition 1986, 9, :o2, 528238800
-          tz.transition 1987, 3, :o3, 543963600
-          tz.transition 1987, 9, :o2, 559688400
-          tz.transition 1988, 3, :o3, 575413200
-          tz.transition 1988, 9, :o2, 591138000
-          tz.transition 1989, 3, :o3, 606862800
-          tz.transition 1989, 9, :o2, 622587600
-          tz.transition 1990, 3, :o3, 638312400
-          tz.transition 1990, 9, :o2, 654642000
-          tz.transition 1991, 3, :o4, 670366800
-          tz.transition 1991, 9, :o1, 686095200
-          tz.transition 1991, 10, :o5, 688507200
-          tz.transition 1992, 1, :o6, 695772000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashkhabad.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashkhabad.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashkhabad.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ashkhabad.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Ashkhabad
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Ashkhabad', 'Asia/Ashgabat'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baghdad.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baghdad.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baghdad.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baghdad.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,159 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Baghdad
-        include TimezoneDefinition
-        
-        timezone 'Asia/Baghdad' do |tz|
-          tz.offset :o0, 10660, 0, :LMT
-          tz.offset :o1, 10656, 0, :BMT
-          tz.offset :o2, 10800, 0, :AST
-          tz.offset :o3, 10800, 3600, :ADT
-          
-          tz.transition 1889, 12, :o1, 10417111387, 4320
-          tz.transition 1917, 12, :o2, 726478313, 300
-          tz.transition 1982, 4, :o3, 389048400
-          tz.transition 1982, 9, :o2, 402264000
-          tz.transition 1983, 3, :o3, 417906000
-          tz.transition 1983, 9, :o2, 433800000
-          tz.transition 1984, 3, :o3, 449614800
-          tz.transition 1984, 9, :o2, 465422400
-          tz.transition 1985, 3, :o3, 481150800
-          tz.transition 1985, 9, :o2, 496792800
-          tz.transition 1986, 3, :o3, 512517600
-          tz.transition 1986, 9, :o2, 528242400
-          tz.transition 1987, 3, :o3, 543967200
-          tz.transition 1987, 9, :o2, 559692000
-          tz.transition 1988, 3, :o3, 575416800
-          tz.transition 1988, 9, :o2, 591141600
-          tz.transition 1989, 3, :o3, 606866400
-          tz.transition 1989, 9, :o2, 622591200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 9, :o2, 654645600
-          tz.transition 1991, 4, :o3, 670464000
-          tz.transition 1991, 10, :o2, 686275200
-          tz.transition 1992, 4, :o3, 702086400
-          tz.transition 1992, 10, :o2, 717897600
-          tz.transition 1993, 4, :o3, 733622400
-          tz.transition 1993, 10, :o2, 749433600
-          tz.transition 1994, 4, :o3, 765158400
-          tz.transition 1994, 10, :o2, 780969600
-          tz.transition 1995, 4, :o3, 796694400
-          tz.transition 1995, 10, :o2, 812505600
-          tz.transition 1996, 4, :o3, 828316800
-          tz.transition 1996, 10, :o2, 844128000
-          tz.transition 1997, 4, :o3, 859852800
-          tz.transition 1997, 10, :o2, 875664000
-          tz.transition 1998, 4, :o3, 891388800
-          tz.transition 1998, 10, :o2, 907200000
-          tz.transition 1999, 4, :o3, 922924800
-          tz.transition 1999, 10, :o2, 938736000
-          tz.transition 2000, 4, :o3, 954547200
-          tz.transition 2000, 10, :o2, 970358400
-          tz.transition 2001, 4, :o3, 986083200
-          tz.transition 2001, 10, :o2, 1001894400
-          tz.transition 2002, 4, :o3, 1017619200
-          tz.transition 2002, 10, :o2, 1033430400
-          tz.transition 2003, 4, :o3, 1049155200
-          tz.transition 2003, 10, :o2, 1064966400
-          tz.transition 2004, 4, :o3, 1080777600
-          tz.transition 2004, 10, :o2, 1096588800
-          tz.transition 2005, 4, :o3, 1112313600
-          tz.transition 2005, 10, :o2, 1128124800
-          tz.transition 2006, 4, :o3, 1143849600
-          tz.transition 2006, 10, :o2, 1159660800
-          tz.transition 2007, 4, :o3, 1175385600
-          tz.transition 2007, 10, :o2, 1191196800
-          tz.transition 2008, 4, :o3, 1207008000
-          tz.transition 2008, 10, :o2, 1222819200
-          tz.transition 2009, 4, :o3, 1238544000
-          tz.transition 2009, 10, :o2, 1254355200
-          tz.transition 2010, 4, :o3, 1270080000
-          tz.transition 2010, 10, :o2, 1285891200
-          tz.transition 2011, 4, :o3, 1301616000
-          tz.transition 2011, 10, :o2, 1317427200
-          tz.transition 2012, 4, :o3, 1333238400
-          tz.transition 2012, 10, :o2, 1349049600
-          tz.transition 2013, 4, :o3, 1364774400
-          tz.transition 2013, 10, :o2, 1380585600
-          tz.transition 2014, 4, :o3, 1396310400
-          tz.transition 2014, 10, :o2, 1412121600
-          tz.transition 2015, 4, :o3, 1427846400
-          tz.transition 2015, 10, :o2, 1443657600
-          tz.transition 2016, 4, :o3, 1459468800
-          tz.transition 2016, 10, :o2, 1475280000
-          tz.transition 2017, 4, :o3, 1491004800
-          tz.transition 2017, 10, :o2, 1506816000
-          tz.transition 2018, 4, :o3, 1522540800
-          tz.transition 2018, 10, :o2, 1538352000
-          tz.transition 2019, 4, :o3, 1554076800
-          tz.transition 2019, 10, :o2, 1569888000
-          tz.transition 2020, 4, :o3, 1585699200
-          tz.transition 2020, 10, :o2, 1601510400
-          tz.transition 2021, 4, :o3, 1617235200
-          tz.transition 2021, 10, :o2, 1633046400
-          tz.transition 2022, 4, :o3, 1648771200
-          tz.transition 2022, 10, :o2, 1664582400
-          tz.transition 2023, 4, :o3, 1680307200
-          tz.transition 2023, 10, :o2, 1696118400
-          tz.transition 2024, 4, :o3, 1711929600
-          tz.transition 2024, 10, :o2, 1727740800
-          tz.transition 2025, 4, :o3, 1743465600
-          tz.transition 2025, 10, :o2, 1759276800
-          tz.transition 2026, 4, :o3, 1775001600
-          tz.transition 2026, 10, :o2, 1790812800
-          tz.transition 2027, 4, :o3, 1806537600
-          tz.transition 2027, 10, :o2, 1822348800
-          tz.transition 2028, 4, :o3, 1838160000
-          tz.transition 2028, 10, :o2, 1853971200
-          tz.transition 2029, 4, :o3, 1869696000
-          tz.transition 2029, 10, :o2, 1885507200
-          tz.transition 2030, 4, :o3, 1901232000
-          tz.transition 2030, 10, :o2, 1917043200
-          tz.transition 2031, 4, :o3, 1932768000
-          tz.transition 2031, 10, :o2, 1948579200
-          tz.transition 2032, 4, :o3, 1964390400
-          tz.transition 2032, 10, :o2, 1980201600
-          tz.transition 2033, 4, :o3, 1995926400
-          tz.transition 2033, 10, :o2, 2011737600
-          tz.transition 2034, 4, :o3, 2027462400
-          tz.transition 2034, 10, :o2, 2043273600
-          tz.transition 2035, 4, :o3, 2058998400
-          tz.transition 2035, 10, :o2, 2074809600
-          tz.transition 2036, 4, :o3, 2090620800
-          tz.transition 2036, 10, :o2, 2106432000
-          tz.transition 2037, 4, :o3, 2122156800
-          tz.transition 2037, 10, :o2, 2137968000
-          tz.transition 2038, 4, :o3, 4931029, 2
-          tz.transition 2038, 10, :o2, 4931395, 2
-          tz.transition 2039, 4, :o3, 4931759, 2
-          tz.transition 2039, 10, :o2, 4932125, 2
-          tz.transition 2040, 4, :o3, 4932491, 2
-          tz.transition 2040, 10, :o2, 4932857, 2
-          tz.transition 2041, 4, :o3, 4933221, 2
-          tz.transition 2041, 10, :o2, 4933587, 2
-          tz.transition 2042, 4, :o3, 4933951, 2
-          tz.transition 2042, 10, :o2, 4934317, 2
-          tz.transition 2043, 4, :o3, 4934681, 2
-          tz.transition 2043, 10, :o2, 4935047, 2
-          tz.transition 2044, 4, :o3, 4935413, 2
-          tz.transition 2044, 10, :o2, 4935779, 2
-          tz.transition 2045, 4, :o3, 4936143, 2
-          tz.transition 2045, 10, :o2, 4936509, 2
-          tz.transition 2046, 4, :o3, 4936873, 2
-          tz.transition 2046, 10, :o2, 4937239, 2
-          tz.transition 2047, 4, :o3, 4937603, 2
-          tz.transition 2047, 10, :o2, 4937969, 2
-          tz.transition 2048, 4, :o3, 4938335, 2
-          tz.transition 2048, 10, :o2, 4938701, 2
-          tz.transition 2049, 4, :o3, 4939065, 2
-          tz.transition 2049, 10, :o2, 4939431, 2
-          tz.transition 2050, 4, :o3, 4939795, 2
-          tz.transition 2050, 10, :o2, 4940161, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bahrain.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bahrain.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bahrain.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bahrain.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Bahrain
-        include TimezoneDefinition
-        
-        timezone 'Asia/Bahrain' do |tz|
-          tz.offset :o0, 12140, 0, :LMT
-          tz.offset :o1, 14400, 0, :GST
-          tz.offset :o2, 10800, 0, :AST
-          
-          tz.transition 1919, 12, :o1, 10464441233, 4320
-          tz.transition 1972, 5, :o2, 76190400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baku.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baku.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baku.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Baku.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,161 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Baku
-        include TimezoneDefinition
-        
-        timezone 'Asia/Baku' do |tz|
-          tz.offset :o0, 11964, 0, :LMT
-          tz.offset :o1, 10800, 0, :BAKT
-          tz.offset :o2, 14400, 0, :BAKT
-          tz.offset :o3, 14400, 3600, :BAKST
-          tz.offset :o4, 10800, 3600, :BAKST
-          tz.offset :o5, 10800, 3600, :AZST
-          tz.offset :o6, 10800, 0, :AZT
-          tz.offset :o7, 14400, 0, :AZT
-          tz.offset :o8, 14400, 3600, :AZST
-          
-          tz.transition 1924, 5, :o1, 17452133003, 7200
-          tz.transition 1957, 2, :o2, 19487187, 8
-          tz.transition 1981, 3, :o3, 354916800
-          tz.transition 1981, 9, :o2, 370724400
-          tz.transition 1982, 3, :o3, 386452800
-          tz.transition 1982, 9, :o2, 402260400
-          tz.transition 1983, 3, :o3, 417988800
-          tz.transition 1983, 9, :o2, 433796400
-          tz.transition 1984, 3, :o3, 449611200
-          tz.transition 1984, 9, :o2, 465343200
-          tz.transition 1985, 3, :o3, 481068000
-          tz.transition 1985, 9, :o2, 496792800
-          tz.transition 1986, 3, :o3, 512517600
-          tz.transition 1986, 9, :o2, 528242400
-          tz.transition 1987, 3, :o3, 543967200
-          tz.transition 1987, 9, :o2, 559692000
-          tz.transition 1988, 3, :o3, 575416800
-          tz.transition 1988, 9, :o2, 591141600
-          tz.transition 1989, 3, :o3, 606866400
-          tz.transition 1989, 9, :o2, 622591200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 9, :o2, 654645600
-          tz.transition 1991, 3, :o4, 670370400
-          tz.transition 1991, 8, :o5, 683496000
-          tz.transition 1991, 9, :o6, 686098800
-          tz.transition 1992, 3, :o5, 701812800
-          tz.transition 1992, 9, :o7, 717534000
-          tz.transition 1996, 3, :o8, 828234000
-          tz.transition 1996, 10, :o7, 846378000
-          tz.transition 1997, 3, :o8, 859680000
-          tz.transition 1997, 10, :o7, 877824000
-          tz.transition 1998, 3, :o8, 891129600
-          tz.transition 1998, 10, :o7, 909273600
-          tz.transition 1999, 3, :o8, 922579200
-          tz.transition 1999, 10, :o7, 941328000
-          tz.transition 2000, 3, :o8, 954028800
-          tz.transition 2000, 10, :o7, 972777600
-          tz.transition 2001, 3, :o8, 985478400
-          tz.transition 2001, 10, :o7, 1004227200
-          tz.transition 2002, 3, :o8, 1017532800
-          tz.transition 2002, 10, :o7, 1035676800
-          tz.transition 2003, 3, :o8, 1048982400
-          tz.transition 2003, 10, :o7, 1067126400
-          tz.transition 2004, 3, :o8, 1080432000
-          tz.transition 2004, 10, :o7, 1099180800
-          tz.transition 2005, 3, :o8, 1111881600
-          tz.transition 2005, 10, :o7, 1130630400
-          tz.transition 2006, 3, :o8, 1143331200
-          tz.transition 2006, 10, :o7, 1162080000
-          tz.transition 2007, 3, :o8, 1174780800
-          tz.transition 2007, 10, :o7, 1193529600
-          tz.transition 2008, 3, :o8, 1206835200
-          tz.transition 2008, 10, :o7, 1224979200
-          tz.transition 2009, 3, :o8, 1238284800
-          tz.transition 2009, 10, :o7, 1256428800
-          tz.transition 2010, 3, :o8, 1269734400
-          tz.transition 2010, 10, :o7, 1288483200
-          tz.transition 2011, 3, :o8, 1301184000
-          tz.transition 2011, 10, :o7, 1319932800
-          tz.transition 2012, 3, :o8, 1332633600
-          tz.transition 2012, 10, :o7, 1351382400
-          tz.transition 2013, 3, :o8, 1364688000
-          tz.transition 2013, 10, :o7, 1382832000
-          tz.transition 2014, 3, :o8, 1396137600
-          tz.transition 2014, 10, :o7, 1414281600
-          tz.transition 2015, 3, :o8, 1427587200
-          tz.transition 2015, 10, :o7, 1445731200
-          tz.transition 2016, 3, :o8, 1459036800
-          tz.transition 2016, 10, :o7, 1477785600
-          tz.transition 2017, 3, :o8, 1490486400
-          tz.transition 2017, 10, :o7, 1509235200
-          tz.transition 2018, 3, :o8, 1521936000
-          tz.transition 2018, 10, :o7, 1540684800
-          tz.transition 2019, 3, :o8, 1553990400
-          tz.transition 2019, 10, :o7, 1572134400
-          tz.transition 2020, 3, :o8, 1585440000
-          tz.transition 2020, 10, :o7, 1603584000
-          tz.transition 2021, 3, :o8, 1616889600
-          tz.transition 2021, 10, :o7, 1635638400
-          tz.transition 2022, 3, :o8, 1648339200
-          tz.transition 2022, 10, :o7, 1667088000
-          tz.transition 2023, 3, :o8, 1679788800
-          tz.transition 2023, 10, :o7, 1698537600
-          tz.transition 2024, 3, :o8, 1711843200
-          tz.transition 2024, 10, :o7, 1729987200
-          tz.transition 2025, 3, :o8, 1743292800
-          tz.transition 2025, 10, :o7, 1761436800
-          tz.transition 2026, 3, :o8, 1774742400
-          tz.transition 2026, 10, :o7, 1792886400
-          tz.transition 2027, 3, :o8, 1806192000
-          tz.transition 2027, 10, :o7, 1824940800
-          tz.transition 2028, 3, :o8, 1837641600
-          tz.transition 2028, 10, :o7, 1856390400
-          tz.transition 2029, 3, :o8, 1869091200
-          tz.transition 2029, 10, :o7, 1887840000
-          tz.transition 2030, 3, :o8, 1901145600
-          tz.transition 2030, 10, :o7, 1919289600
-          tz.transition 2031, 3, :o8, 1932595200
-          tz.transition 2031, 10, :o7, 1950739200
-          tz.transition 2032, 3, :o8, 1964044800
-          tz.transition 2032, 10, :o7, 1982793600
-          tz.transition 2033, 3, :o8, 1995494400
-          tz.transition 2033, 10, :o7, 2014243200
-          tz.transition 2034, 3, :o8, 2026944000
-          tz.transition 2034, 10, :o7, 2045692800
-          tz.transition 2035, 3, :o8, 2058393600
-          tz.transition 2035, 10, :o7, 2077142400
-          tz.transition 2036, 3, :o8, 2090448000
-          tz.transition 2036, 10, :o7, 2108592000
-          tz.transition 2037, 3, :o8, 2121897600
-          tz.transition 2037, 10, :o7, 2140041600
-          tz.transition 2038, 3, :o8, 4931021, 2
-          tz.transition 2038, 10, :o7, 4931455, 2
-          tz.transition 2039, 3, :o8, 4931749, 2
-          tz.transition 2039, 10, :o7, 4932183, 2
-          tz.transition 2040, 3, :o8, 4932477, 2
-          tz.transition 2040, 10, :o7, 4932911, 2
-          tz.transition 2041, 3, :o8, 4933219, 2
-          tz.transition 2041, 10, :o7, 4933639, 2
-          tz.transition 2042, 3, :o8, 4933947, 2
-          tz.transition 2042, 10, :o7, 4934367, 2
-          tz.transition 2043, 3, :o8, 4934675, 2
-          tz.transition 2043, 10, :o7, 4935095, 2
-          tz.transition 2044, 3, :o8, 4935403, 2
-          tz.transition 2044, 10, :o7, 4935837, 2
-          tz.transition 2045, 3, :o8, 4936131, 2
-          tz.transition 2045, 10, :o7, 4936565, 2
-          tz.transition 2046, 3, :o8, 4936859, 2
-          tz.transition 2046, 10, :o7, 4937293, 2
-          tz.transition 2047, 3, :o8, 4937601, 2
-          tz.transition 2047, 10, :o7, 4938021, 2
-          tz.transition 2048, 3, :o8, 4938329, 2
-          tz.transition 2048, 10, :o7, 4938749, 2
-          tz.transition 2049, 3, :o8, 4939057, 2
-          tz.transition 2049, 10, :o7, 4939491, 2
-          tz.transition 2050, 3, :o8, 4939785, 2
-          tz.transition 2050, 10, :o7, 4940219, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bangkok.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bangkok.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bangkok.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bangkok.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Bangkok
-        include TimezoneDefinition
-        
-        timezone 'Asia/Bangkok' do |tz|
-          tz.offset :o0, 24124, 0, :LMT
-          tz.offset :o1, 24124, 0, :BMT
-          tz.offset :o2, 25200, 0, :ICT
-          
-          tz.transition 1879, 12, :o1, 52006648769, 21600
-          tz.transition 1920, 3, :o2, 52324168769, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Beirut.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Beirut.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Beirut.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Beirut.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Beirut
-        include TimezoneDefinition
-        
-        timezone 'Asia/Beirut' do |tz|
-          tz.offset :o0, 8520, 0, :LMT
-          tz.offset :o1, 7200, 0, :EET
-          tz.offset :o2, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 1733555089, 720
-          tz.transition 1920, 3, :o2, 29068937, 12
-          tz.transition 1920, 10, :o1, 19380979, 8
-          tz.transition 1921, 4, :o2, 29073389, 12
-          tz.transition 1921, 10, :o1, 19383723, 8
-          tz.transition 1922, 3, :o2, 29077673, 12
-          tz.transition 1922, 10, :o1, 19386683, 8
-          tz.transition 1923, 4, :o2, 29082377, 12
-          tz.transition 1923, 9, :o1, 19389427, 8
-          tz.transition 1957, 4, :o2, 29231513, 12
-          tz.transition 1957, 9, :o1, 19488899, 8
-          tz.transition 1958, 4, :o2, 29235893, 12
-          tz.transition 1958, 9, :o1, 19491819, 8
-          tz.transition 1959, 4, :o2, 29240273, 12
-          tz.transition 1959, 9, :o1, 19494739, 8
-          tz.transition 1960, 4, :o2, 29244665, 12
-          tz.transition 1960, 9, :o1, 19497667, 8
-          tz.transition 1961, 4, :o2, 29249045, 12
-          tz.transition 1961, 9, :o1, 19500587, 8
-          tz.transition 1972, 6, :o2, 78012000
-          tz.transition 1972, 9, :o1, 86734800
-          tz.transition 1973, 4, :o2, 105055200
-          tz.transition 1973, 9, :o1, 118270800
-          tz.transition 1974, 4, :o2, 136591200
-          tz.transition 1974, 9, :o1, 149806800
-          tz.transition 1975, 4, :o2, 168127200
-          tz.transition 1975, 9, :o1, 181342800
-          tz.transition 1976, 4, :o2, 199749600
-          tz.transition 1976, 9, :o1, 212965200
-          tz.transition 1977, 4, :o2, 231285600
-          tz.transition 1977, 9, :o1, 244501200
-          tz.transition 1978, 4, :o2, 262735200
-          tz.transition 1978, 9, :o1, 275950800
-          tz.transition 1984, 4, :o2, 452210400
-          tz.transition 1984, 10, :o1, 466722000
-          tz.transition 1985, 4, :o2, 483746400
-          tz.transition 1985, 10, :o1, 498258000
-          tz.transition 1986, 4, :o2, 515282400
-          tz.transition 1986, 10, :o1, 529794000
-          tz.transition 1987, 4, :o2, 546818400
-          tz.transition 1987, 10, :o1, 561330000
-          tz.transition 1988, 5, :o2, 581119200
-          tz.transition 1988, 10, :o1, 592952400
-          tz.transition 1989, 5, :o2, 610754400
-          tz.transition 1989, 10, :o1, 624488400
-          tz.transition 1990, 4, :o2, 641512800
-          tz.transition 1990, 10, :o1, 656024400
-          tz.transition 1991, 4, :o2, 673048800
-          tz.transition 1991, 10, :o1, 687560400
-          tz.transition 1992, 4, :o2, 704671200
-          tz.transition 1992, 10, :o1, 718146000
-          tz.transition 1993, 3, :o2, 733269600
-          tz.transition 1993, 9, :o1, 748990800
-          tz.transition 1994, 3, :o2, 764719200
-          tz.transition 1994, 9, :o1, 780440400
-          tz.transition 1995, 3, :o2, 796168800
-          tz.transition 1995, 9, :o1, 811890000
-          tz.transition 1996, 3, :o2, 828223200
-          tz.transition 1996, 9, :o1, 843944400
-          tz.transition 1997, 3, :o2, 859672800
-          tz.transition 1997, 9, :o1, 875394000
-          tz.transition 1998, 3, :o2, 891122400
-          tz.transition 1998, 9, :o1, 906843600
-          tz.transition 1999, 3, :o2, 922572000
-          tz.transition 1999, 10, :o1, 941317200
-          tz.transition 2000, 3, :o2, 954021600
-          tz.transition 2000, 10, :o1, 972766800
-          tz.transition 2001, 3, :o2, 985471200
-          tz.transition 2001, 10, :o1, 1004216400
-          tz.transition 2002, 3, :o2, 1017525600
-          tz.transition 2002, 10, :o1, 1035666000
-          tz.transition 2003, 3, :o2, 1048975200
-          tz.transition 2003, 10, :o1, 1067115600
-          tz.transition 2004, 3, :o2, 1080424800
-          tz.transition 2004, 10, :o1, 1099170000
-          tz.transition 2005, 3, :o2, 1111874400
-          tz.transition 2005, 10, :o1, 1130619600
-          tz.transition 2006, 3, :o2, 1143324000
-          tz.transition 2006, 10, :o1, 1162069200
-          tz.transition 2007, 3, :o2, 1174773600
-          tz.transition 2007, 10, :o1, 1193518800
-          tz.transition 2008, 3, :o2, 1206828000
-          tz.transition 2008, 10, :o1, 1224968400
-          tz.transition 2009, 3, :o2, 1238277600
-          tz.transition 2009, 10, :o1, 1256418000
-          tz.transition 2010, 3, :o2, 1269727200
-          tz.transition 2010, 10, :o1, 1288472400
-          tz.transition 2011, 3, :o2, 1301176800
-          tz.transition 2011, 10, :o1, 1319922000
-          tz.transition 2012, 3, :o2, 1332626400
-          tz.transition 2012, 10, :o1, 1351371600
-          tz.transition 2013, 3, :o2, 1364680800
-          tz.transition 2013, 10, :o1, 1382821200
-          tz.transition 2014, 3, :o2, 1396130400
-          tz.transition 2014, 10, :o1, 1414270800
-          tz.transition 2015, 3, :o2, 1427580000
-          tz.transition 2015, 10, :o1, 1445720400
-          tz.transition 2016, 3, :o2, 1459029600
-          tz.transition 2016, 10, :o1, 1477774800
-          tz.transition 2017, 3, :o2, 1490479200
-          tz.transition 2017, 10, :o1, 1509224400
-          tz.transition 2018, 3, :o2, 1521928800
-          tz.transition 2018, 10, :o1, 1540674000
-          tz.transition 2019, 3, :o2, 1553983200
-          tz.transition 2019, 10, :o1, 1572123600
-          tz.transition 2020, 3, :o2, 1585432800
-          tz.transition 2020, 10, :o1, 1603573200
-          tz.transition 2021, 3, :o2, 1616882400
-          tz.transition 2021, 10, :o1, 1635627600
-          tz.transition 2022, 3, :o2, 1648332000
-          tz.transition 2022, 10, :o1, 1667077200
-          tz.transition 2023, 3, :o2, 1679781600
-          tz.transition 2023, 10, :o1, 1698526800
-          tz.transition 2024, 3, :o2, 1711836000
-          tz.transition 2024, 10, :o1, 1729976400
-          tz.transition 2025, 3, :o2, 1743285600
-          tz.transition 2025, 10, :o1, 1761426000
-          tz.transition 2026, 3, :o2, 1774735200
-          tz.transition 2026, 10, :o1, 1792875600
-          tz.transition 2027, 3, :o2, 1806184800
-          tz.transition 2027, 10, :o1, 1824930000
-          tz.transition 2028, 3, :o2, 1837634400
-          tz.transition 2028, 10, :o1, 1856379600
-          tz.transition 2029, 3, :o2, 1869084000
-          tz.transition 2029, 10, :o1, 1887829200
-          tz.transition 2030, 3, :o2, 1901138400
-          tz.transition 2030, 10, :o1, 1919278800
-          tz.transition 2031, 3, :o2, 1932588000
-          tz.transition 2031, 10, :o1, 1950728400
-          tz.transition 2032, 3, :o2, 1964037600
-          tz.transition 2032, 10, :o1, 1982782800
-          tz.transition 2033, 3, :o2, 1995487200
-          tz.transition 2033, 10, :o1, 2014232400
-          tz.transition 2034, 3, :o2, 2026936800
-          tz.transition 2034, 10, :o1, 2045682000
-          tz.transition 2035, 3, :o2, 2058386400
-          tz.transition 2035, 10, :o1, 2077131600
-          tz.transition 2036, 3, :o2, 2090440800
-          tz.transition 2036, 10, :o1, 2108581200
-          tz.transition 2037, 3, :o2, 2121890400
-          tz.transition 2037, 10, :o1, 2140030800
-          tz.transition 2038, 3, :o2, 29586125, 12
-          tz.transition 2038, 10, :o1, 19725819, 8
-          tz.transition 2039, 3, :o2, 29590493, 12
-          tz.transition 2039, 10, :o1, 19728731, 8
-          tz.transition 2040, 3, :o2, 29594861, 12
-          tz.transition 2040, 10, :o1, 19731643, 8
-          tz.transition 2041, 3, :o2, 29599313, 12
-          tz.transition 2041, 10, :o1, 19734555, 8
-          tz.transition 2042, 3, :o2, 29603681, 12
-          tz.transition 2042, 10, :o1, 19737467, 8
-          tz.transition 2043, 3, :o2, 29608049, 12
-          tz.transition 2043, 10, :o1, 19740379, 8
-          tz.transition 2044, 3, :o2, 29612417, 12
-          tz.transition 2044, 10, :o1, 19743347, 8
-          tz.transition 2045, 3, :o2, 29616785, 12
-          tz.transition 2045, 10, :o1, 19746259, 8
-          tz.transition 2046, 3, :o2, 29621153, 12
-          tz.transition 2046, 10, :o1, 19749171, 8
-          tz.transition 2047, 3, :o2, 29625605, 12
-          tz.transition 2047, 10, :o1, 19752083, 8
-          tz.transition 2048, 3, :o2, 29629973, 12
-          tz.transition 2048, 10, :o1, 19754995, 8
-          tz.transition 2049, 3, :o2, 29634341, 12
-          tz.transition 2049, 10, :o1, 19757963, 8
-          tz.transition 2050, 3, :o2, 29638709, 12
-          tz.transition 2050, 10, :o1, 19760875, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bishkek.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bishkek.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bishkek.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Bishkek.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,75 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Bishkek
-        include TimezoneDefinition
-        
-        timezone 'Asia/Bishkek' do |tz|
-          tz.offset :o0, 17904, 0, :LMT
-          tz.offset :o1, 18000, 0, :FRUT
-          tz.offset :o2, 21600, 0, :FRUT
-          tz.offset :o3, 21600, 3600, :FRUST
-          tz.offset :o4, 18000, 3600, :FRUST
-          tz.offset :o5, 18000, 0, :KGT
-          tz.offset :o6, 18000, 3600, :KGST
-          tz.offset :o7, 21600, 0, :KGT
-          
-          tz.transition 1924, 5, :o1, 4363033127, 1800
-          tz.transition 1930, 6, :o2, 58227559, 24
-          tz.transition 1981, 3, :o3, 354909600
-          tz.transition 1981, 9, :o2, 370717200
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402253200
-          tz.transition 1983, 3, :o3, 417981600
-          tz.transition 1983, 9, :o2, 433789200
-          tz.transition 1984, 3, :o3, 449604000
-          tz.transition 1984, 9, :o2, 465336000
-          tz.transition 1985, 3, :o3, 481060800
-          tz.transition 1985, 9, :o2, 496785600
-          tz.transition 1986, 3, :o3, 512510400
-          tz.transition 1986, 9, :o2, 528235200
-          tz.transition 1987, 3, :o3, 543960000
-          tz.transition 1987, 9, :o2, 559684800
-          tz.transition 1988, 3, :o3, 575409600
-          tz.transition 1988, 9, :o2, 591134400
-          tz.transition 1989, 3, :o3, 606859200
-          tz.transition 1989, 9, :o2, 622584000
-          tz.transition 1990, 3, :o3, 638308800
-          tz.transition 1990, 9, :o2, 654638400
-          tz.transition 1991, 3, :o4, 670363200
-          tz.transition 1991, 8, :o5, 683582400
-          tz.transition 1992, 4, :o6, 703018800
-          tz.transition 1992, 9, :o5, 717530400
-          tz.transition 1993, 4, :o6, 734468400
-          tz.transition 1993, 9, :o5, 748980000
-          tz.transition 1994, 4, :o6, 765918000
-          tz.transition 1994, 9, :o5, 780429600
-          tz.transition 1995, 4, :o6, 797367600
-          tz.transition 1995, 9, :o5, 811879200
-          tz.transition 1996, 4, :o6, 828817200
-          tz.transition 1996, 9, :o5, 843933600
-          tz.transition 1997, 3, :o6, 859671000
-          tz.transition 1997, 10, :o5, 877811400
-          tz.transition 1998, 3, :o6, 891120600
-          tz.transition 1998, 10, :o5, 909261000
-          tz.transition 1999, 3, :o6, 922570200
-          tz.transition 1999, 10, :o5, 941315400
-          tz.transition 2000, 3, :o6, 954019800
-          tz.transition 2000, 10, :o5, 972765000
-          tz.transition 2001, 3, :o6, 985469400
-          tz.transition 2001, 10, :o5, 1004214600
-          tz.transition 2002, 3, :o6, 1017523800
-          tz.transition 2002, 10, :o5, 1035664200
-          tz.transition 2003, 3, :o6, 1048973400
-          tz.transition 2003, 10, :o5, 1067113800
-          tz.transition 2004, 3, :o6, 1080423000
-          tz.transition 2004, 10, :o5, 1099168200
-          tz.transition 2005, 3, :o6, 1111872600
-          tz.transition 2005, 8, :o7, 1123783200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Brunei.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Brunei.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Brunei.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Brunei.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Brunei
-        include TimezoneDefinition
-        
-        timezone 'Asia/Brunei' do |tz|
-          tz.offset :o0, 27580, 0, :LMT
-          tz.offset :o1, 27000, 0, :BNT
-          tz.offset :o2, 28800, 0, :BNT
-          
-          tz.transition 1926, 2, :o1, 10474164781, 4320
-          tz.transition 1932, 12, :o2, 38833171, 16
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Calcutta.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Calcutta.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Calcutta.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Calcutta.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Calcutta
-        include TimezoneDefinition
-        
-        timezone 'Asia/Calcutta' do |tz|
-          tz.offset :o0, 21208, 0, :LMT
-          tz.offset :o1, 21200, 0, :HMT
-          tz.offset :o2, 23400, 0, :BURT
-          tz.offset :o3, 19800, 0, :IST
-          tz.offset :o4, 19800, 3600, :IST
-          
-          tz.transition 1879, 12, :o1, 26003324749, 10800
-          tz.transition 1941, 9, :o2, 524937943, 216
-          tz.transition 1942, 5, :o3, 116663723, 48
-          tz.transition 1942, 8, :o4, 116668957, 48
-          tz.transition 1945, 10, :o3, 116723675, 48
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Choibalsan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Choibalsan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Choibalsan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Choibalsan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,154 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Choibalsan
-        include TimezoneDefinition
-        
-        timezone 'Asia/Choibalsan' do |tz|
-          tz.offset :o0, 27480, 0, :LMT
-          tz.offset :o1, 25200, 0, :ULAT
-          tz.offset :o2, 28800, 0, :ULAT
-          tz.offset :o3, 32400, 3600, :CHOST
-          tz.offset :o4, 32400, 0, :CHOT
-          
-          tz.transition 1905, 7, :o1, 1740281891, 720
-          tz.transition 1977, 12, :o2, 252435600
-          tz.transition 1983, 3, :o3, 417974400
-          tz.transition 1983, 9, :o4, 433778400
-          tz.transition 1984, 3, :o3, 449593200
-          tz.transition 1984, 9, :o4, 465314400
-          tz.transition 1985, 3, :o3, 481042800
-          tz.transition 1985, 9, :o4, 496764000
-          tz.transition 1986, 3, :o3, 512492400
-          tz.transition 1986, 9, :o4, 528213600
-          tz.transition 1987, 3, :o3, 543942000
-          tz.transition 1987, 9, :o4, 559663200
-          tz.transition 1988, 3, :o3, 575391600
-          tz.transition 1988, 9, :o4, 591112800
-          tz.transition 1989, 3, :o3, 606841200
-          tz.transition 1989, 9, :o4, 622562400
-          tz.transition 1990, 3, :o3, 638290800
-          tz.transition 1990, 9, :o4, 654616800
-          tz.transition 1991, 3, :o3, 670345200
-          tz.transition 1991, 9, :o4, 686066400
-          tz.transition 1992, 3, :o3, 701794800
-          tz.transition 1992, 9, :o4, 717516000
-          tz.transition 1993, 3, :o3, 733244400
-          tz.transition 1993, 9, :o4, 748965600
-          tz.transition 1994, 3, :o3, 764694000
-          tz.transition 1994, 9, :o4, 780415200
-          tz.transition 1995, 3, :o3, 796143600
-          tz.transition 1995, 9, :o4, 811864800
-          tz.transition 1996, 3, :o3, 828198000
-          tz.transition 1996, 9, :o4, 843919200
-          tz.transition 1997, 3, :o3, 859647600
-          tz.transition 1997, 9, :o4, 875368800
-          tz.transition 1998, 3, :o3, 891097200
-          tz.transition 1998, 9, :o4, 906818400
-          tz.transition 2001, 4, :o3, 988390800
-          tz.transition 2001, 9, :o4, 1001692800
-          tz.transition 2002, 3, :o3, 1017421200
-          tz.transition 2002, 9, :o4, 1033142400
-          tz.transition 2003, 3, :o3, 1048870800
-          tz.transition 2003, 9, :o4, 1064592000
-          tz.transition 2004, 3, :o3, 1080320400
-          tz.transition 2004, 9, :o4, 1096041600
-          tz.transition 2005, 3, :o3, 1111770000
-          tz.transition 2005, 9, :o4, 1127491200
-          tz.transition 2006, 3, :o3, 1143219600
-          tz.transition 2006, 9, :o4, 1159545600
-          tz.transition 2007, 3, :o3, 1175274000
-          tz.transition 2007, 9, :o4, 1190995200
-          tz.transition 2008, 3, :o3, 1206723600
-          tz.transition 2008, 9, :o4, 1222444800
-          tz.transition 2009, 3, :o3, 1238173200
-          tz.transition 2009, 9, :o4, 1253894400
-          tz.transition 2010, 3, :o3, 1269622800
-          tz.transition 2010, 9, :o4, 1285344000
-          tz.transition 2011, 3, :o3, 1301072400
-          tz.transition 2011, 9, :o4, 1316793600
-          tz.transition 2012, 3, :o3, 1333126800
-          tz.transition 2012, 9, :o4, 1348848000
-          tz.transition 2013, 3, :o3, 1364576400
-          tz.transition 2013, 9, :o4, 1380297600
-          tz.transition 2014, 3, :o3, 1396026000
-          tz.transition 2014, 9, :o4, 1411747200
-          tz.transition 2015, 3, :o3, 1427475600
-          tz.transition 2015, 9, :o4, 1443196800
-          tz.transition 2016, 3, :o3, 1458925200
-          tz.transition 2016, 9, :o4, 1474646400
-          tz.transition 2017, 3, :o3, 1490374800
-          tz.transition 2017, 9, :o4, 1506700800
-          tz.transition 2018, 3, :o3, 1522429200
-          tz.transition 2018, 9, :o4, 1538150400
-          tz.transition 2019, 3, :o3, 1553878800
-          tz.transition 2019, 9, :o4, 1569600000
-          tz.transition 2020, 3, :o3, 1585328400
-          tz.transition 2020, 9, :o4, 1601049600
-          tz.transition 2021, 3, :o3, 1616778000
-          tz.transition 2021, 9, :o4, 1632499200
-          tz.transition 2022, 3, :o3, 1648227600
-          tz.transition 2022, 9, :o4, 1663948800
-          tz.transition 2023, 3, :o3, 1679677200
-          tz.transition 2023, 9, :o4, 1696003200
-          tz.transition 2024, 3, :o3, 1711731600
-          tz.transition 2024, 9, :o4, 1727452800
-          tz.transition 2025, 3, :o3, 1743181200
-          tz.transition 2025, 9, :o4, 1758902400
-          tz.transition 2026, 3, :o3, 1774630800
-          tz.transition 2026, 9, :o4, 1790352000
-          tz.transition 2027, 3, :o3, 1806080400
-          tz.transition 2027, 9, :o4, 1821801600
-          tz.transition 2028, 3, :o3, 1837530000
-          tz.transition 2028, 9, :o4, 1853856000
-          tz.transition 2029, 3, :o3, 1869584400
-          tz.transition 2029, 9, :o4, 1885305600
-          tz.transition 2030, 3, :o3, 1901034000
-          tz.transition 2030, 9, :o4, 1916755200
-          tz.transition 2031, 3, :o3, 1932483600
-          tz.transition 2031, 9, :o4, 1948204800
-          tz.transition 2032, 3, :o3, 1963933200
-          tz.transition 2032, 9, :o4, 1979654400
-          tz.transition 2033, 3, :o3, 1995382800
-          tz.transition 2033, 9, :o4, 2011104000
-          tz.transition 2034, 3, :o3, 2026832400
-          tz.transition 2034, 9, :o4, 2043158400
-          tz.transition 2035, 3, :o3, 2058886800
-          tz.transition 2035, 9, :o4, 2074608000
-          tz.transition 2036, 3, :o3, 2090336400
-          tz.transition 2036, 9, :o4, 2106057600
-          tz.transition 2037, 3, :o3, 2121786000
-          tz.transition 2037, 9, :o4, 2137507200
-          tz.transition 2038, 3, :o3, 59172221, 24
-          tz.transition 2038, 9, :o4, 14794147, 6
-          tz.transition 2039, 3, :o3, 59180957, 24
-          tz.transition 2039, 9, :o4, 14796331, 6
-          tz.transition 2040, 3, :o3, 59189861, 24
-          tz.transition 2040, 9, :o4, 14798557, 6
-          tz.transition 2041, 3, :o3, 59198597, 24
-          tz.transition 2041, 9, :o4, 14800741, 6
-          tz.transition 2042, 3, :o3, 59207333, 24
-          tz.transition 2042, 9, :o4, 14802925, 6
-          tz.transition 2043, 3, :o3, 59216069, 24
-          tz.transition 2043, 9, :o4, 14805109, 6
-          tz.transition 2044, 3, :o3, 59224805, 24
-          tz.transition 2044, 9, :o4, 14807293, 6
-          tz.transition 2045, 3, :o3, 59233541, 24
-          tz.transition 2045, 9, :o4, 14809519, 6
-          tz.transition 2046, 3, :o3, 59242445, 24
-          tz.transition 2046, 9, :o4, 14811703, 6
-          tz.transition 2047, 3, :o3, 59251181, 24
-          tz.transition 2047, 9, :o4, 14813887, 6
-          tz.transition 2048, 3, :o3, 59259917, 24
-          tz.transition 2048, 9, :o4, 14816071, 6
-          tz.transition 2049, 3, :o3, 59268653, 24
-          tz.transition 2049, 9, :o4, 14818255, 6
-          tz.transition 2050, 3, :o3, 59277389, 24
-          tz.transition 2050, 9, :o4, 14820439, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chongqing.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chongqing.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chongqing.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chongqing.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Chongqing
-        include TimezoneDefinition
-        
-        timezone 'Asia/Chongqing' do |tz|
-          tz.offset :o0, 25580, 0, :LMT
-          tz.offset :o1, 25200, 0, :LONT
-          tz.offset :o2, 28800, 0, :CST
-          tz.offset :o3, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 10477063601, 4320
-          tz.transition 1980, 4, :o2, 325962000
-          tz.transition 1986, 5, :o3, 515520000
-          tz.transition 1986, 9, :o2, 527007600
-          tz.transition 1987, 4, :o3, 545155200
-          tz.transition 1987, 9, :o2, 558457200
-          tz.transition 1988, 4, :o3, 576604800
-          tz.transition 1988, 9, :o2, 589906800
-          tz.transition 1989, 4, :o3, 608659200
-          tz.transition 1989, 9, :o2, 621961200
-          tz.transition 1990, 4, :o3, 640108800
-          tz.transition 1990, 9, :o2, 653410800
-          tz.transition 1991, 4, :o3, 671558400
-          tz.transition 1991, 9, :o2, 684860400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chungking.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chungking.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chungking.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Chungking.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Chungking
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Chungking', 'Asia/Chongqing'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Colombo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Colombo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Colombo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Colombo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Colombo
-        include TimezoneDefinition
-        
-        timezone 'Asia/Colombo' do |tz|
-          tz.offset :o0, 19164, 0, :LMT
-          tz.offset :o1, 19172, 0, :MMT
-          tz.offset :o2, 19800, 0, :IST
-          tz.offset :o3, 19800, 1800, :IHST
-          tz.offset :o4, 19800, 3600, :IST
-          tz.offset :o5, 23400, 0, :LKT
-          tz.offset :o6, 21600, 0, :LKT
-          
-          tz.transition 1879, 12, :o1, 17335550003, 7200
-          tz.transition 1905, 12, :o2, 52211763607, 21600
-          tz.transition 1942, 1, :o3, 116657485, 48
-          tz.transition 1942, 8, :o4, 9722413, 4
-          tz.transition 1945, 10, :o2, 38907909, 16
-          tz.transition 1996, 5, :o5, 832962600
-          tz.transition 1996, 10, :o6, 846266400
-          tz.transition 2006, 4, :o2, 1145039400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dacca.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dacca.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dacca.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dacca.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Dacca
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Dacca', 'Asia/Dhaka'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Damascus.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Damascus.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Damascus.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Damascus.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,195 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Damascus
-        include TimezoneDefinition
-        
-        timezone 'Asia/Damascus' do |tz|
-          tz.offset :o0, 8712, 0, :LMT
-          tz.offset :o1, 7200, 0, :EET
-          tz.offset :o2, 7200, 3600, :EEST
-          
-          tz.transition 1919, 12, :o1, 2906789279, 1200
-          tz.transition 1920, 4, :o2, 4844865, 2
-          tz.transition 1920, 10, :o1, 58142411, 24
-          tz.transition 1921, 4, :o2, 4845593, 2
-          tz.transition 1921, 10, :o1, 58151147, 24
-          tz.transition 1922, 4, :o2, 4846321, 2
-          tz.transition 1922, 9, :o1, 58159883, 24
-          tz.transition 1923, 4, :o2, 4847049, 2
-          tz.transition 1923, 10, :o1, 58168787, 24
-          tz.transition 1962, 4, :o2, 4875567, 2
-          tz.transition 1962, 9, :o1, 58510523, 24
-          tz.transition 1963, 5, :o2, 4876301, 2
-          tz.transition 1963, 9, :o1, 58519259, 24
-          tz.transition 1964, 5, :o2, 4877033, 2
-          tz.transition 1964, 9, :o1, 58528067, 24
-          tz.transition 1965, 5, :o2, 4877763, 2
-          tz.transition 1965, 9, :o1, 58536803, 24
-          tz.transition 1966, 4, :o2, 4878479, 2
-          tz.transition 1966, 9, :o1, 58545587, 24
-          tz.transition 1967, 5, :o2, 4879223, 2
-          tz.transition 1967, 9, :o1, 58554347, 24
-          tz.transition 1968, 5, :o2, 4879955, 2
-          tz.transition 1968, 9, :o1, 58563131, 24
-          tz.transition 1969, 5, :o2, 4880685, 2
-          tz.transition 1969, 9, :o1, 58571891, 24
-          tz.transition 1970, 5, :o2, 10368000
-          tz.transition 1970, 9, :o1, 23583600
-          tz.transition 1971, 5, :o2, 41904000
-          tz.transition 1971, 9, :o1, 55119600
-          tz.transition 1972, 5, :o2, 73526400
-          tz.transition 1972, 9, :o1, 86742000
-          tz.transition 1973, 5, :o2, 105062400
-          tz.transition 1973, 9, :o1, 118278000
-          tz.transition 1974, 5, :o2, 136598400
-          tz.transition 1974, 9, :o1, 149814000
-          tz.transition 1975, 5, :o2, 168134400
-          tz.transition 1975, 9, :o1, 181350000
-          tz.transition 1976, 5, :o2, 199756800
-          tz.transition 1976, 9, :o1, 212972400
-          tz.transition 1977, 5, :o2, 231292800
-          tz.transition 1977, 8, :o1, 241916400
-          tz.transition 1978, 5, :o2, 262828800
-          tz.transition 1978, 8, :o1, 273452400
-          tz.transition 1983, 4, :o2, 418694400
-          tz.transition 1983, 9, :o1, 433810800
-          tz.transition 1984, 4, :o2, 450316800
-          tz.transition 1984, 9, :o1, 465433200
-          tz.transition 1986, 2, :o2, 508896000
-          tz.transition 1986, 10, :o1, 529196400
-          tz.transition 1987, 3, :o2, 541555200
-          tz.transition 1987, 10, :o1, 562633200
-          tz.transition 1988, 3, :o2, 574387200
-          tz.transition 1988, 10, :o1, 594255600
-          tz.transition 1989, 3, :o2, 607305600
-          tz.transition 1989, 9, :o1, 623199600
-          tz.transition 1990, 4, :o2, 638928000
-          tz.transition 1990, 9, :o1, 654649200
-          tz.transition 1991, 3, :o2, 670456800
-          tz.transition 1991, 9, :o1, 686264400
-          tz.transition 1992, 4, :o2, 702684000
-          tz.transition 1992, 9, :o1, 717886800
-          tz.transition 1993, 3, :o2, 733096800
-          tz.transition 1993, 9, :o1, 748904400
-          tz.transition 1994, 3, :o2, 765151200
-          tz.transition 1994, 9, :o1, 780958800
-          tz.transition 1995, 3, :o2, 796687200
-          tz.transition 1995, 9, :o1, 812494800
-          tz.transition 1996, 3, :o2, 828309600
-          tz.transition 1996, 9, :o1, 844117200
-          tz.transition 1997, 3, :o2, 859759200
-          tz.transition 1997, 9, :o1, 875653200
-          tz.transition 1998, 3, :o2, 891208800
-          tz.transition 1998, 9, :o1, 907189200
-          tz.transition 1999, 3, :o2, 922917600
-          tz.transition 1999, 9, :o1, 938725200
-          tz.transition 2000, 3, :o2, 954540000
-          tz.transition 2000, 9, :o1, 970347600
-          tz.transition 2001, 3, :o2, 986076000
-          tz.transition 2001, 9, :o1, 1001883600
-          tz.transition 2002, 3, :o2, 1017612000
-          tz.transition 2002, 9, :o1, 1033419600
-          tz.transition 2003, 3, :o2, 1049148000
-          tz.transition 2003, 9, :o1, 1064955600
-          tz.transition 2004, 3, :o2, 1080770400
-          tz.transition 2004, 9, :o1, 1096578000
-          tz.transition 2005, 3, :o2, 1112306400
-          tz.transition 2005, 9, :o1, 1128114000
-          tz.transition 2006, 3, :o2, 1143842400
-          tz.transition 2006, 9, :o1, 1158872400
-          tz.transition 2007, 3, :o2, 1175378400
-          tz.transition 2007, 9, :o1, 1191186000
-          tz.transition 2008, 3, :o2, 1207000800
-          tz.transition 2008, 9, :o1, 1222808400
-          tz.transition 2009, 3, :o2, 1238536800
-          tz.transition 2009, 9, :o1, 1254344400
-          tz.transition 2010, 3, :o2, 1270072800
-          tz.transition 2010, 9, :o1, 1285880400
-          tz.transition 2011, 3, :o2, 1301608800
-          tz.transition 2011, 9, :o1, 1317416400
-          tz.transition 2012, 3, :o2, 1333231200
-          tz.transition 2012, 9, :o1, 1349038800
-          tz.transition 2013, 3, :o2, 1364767200
-          tz.transition 2013, 9, :o1, 1380574800
-          tz.transition 2014, 3, :o2, 1396303200
-          tz.transition 2014, 9, :o1, 1412110800
-          tz.transition 2015, 3, :o2, 1427839200
-          tz.transition 2015, 9, :o1, 1443646800
-          tz.transition 2016, 3, :o2, 1459461600
-          tz.transition 2016, 9, :o1, 1475269200
-          tz.transition 2017, 3, :o2, 1490997600
-          tz.transition 2017, 9, :o1, 1506805200
-          tz.transition 2018, 3, :o2, 1522533600
-          tz.transition 2018, 9, :o1, 1538341200
-          tz.transition 2019, 3, :o2, 1554069600
-          tz.transition 2019, 9, :o1, 1569877200
-          tz.transition 2020, 3, :o2, 1585692000
-          tz.transition 2020, 9, :o1, 1601499600
-          tz.transition 2021, 3, :o2, 1617228000
-          tz.transition 2021, 9, :o1, 1633035600
-          tz.transition 2022, 3, :o2, 1648764000
-          tz.transition 2022, 9, :o1, 1664571600
-          tz.transition 2023, 3, :o2, 1680300000
-          tz.transition 2023, 9, :o1, 1696107600
-          tz.transition 2024, 3, :o2, 1711922400
-          tz.transition 2024, 9, :o1, 1727730000
-          tz.transition 2025, 3, :o2, 1743458400
-          tz.transition 2025, 9, :o1, 1759266000
-          tz.transition 2026, 3, :o2, 1774994400
-          tz.transition 2026, 9, :o1, 1790802000
-          tz.transition 2027, 3, :o2, 1806530400
-          tz.transition 2027, 9, :o1, 1822338000
-          tz.transition 2028, 3, :o2, 1838152800
-          tz.transition 2028, 9, :o1, 1853960400
-          tz.transition 2029, 3, :o2, 1869688800
-          tz.transition 2029, 9, :o1, 1885496400
-          tz.transition 2030, 3, :o2, 1901224800
-          tz.transition 2030, 9, :o1, 1917032400
-          tz.transition 2031, 3, :o2, 1932760800
-          tz.transition 2031, 9, :o1, 1948568400
-          tz.transition 2032, 3, :o2, 1964383200
-          tz.transition 2032, 9, :o1, 1980190800
-          tz.transition 2033, 3, :o2, 1995919200
-          tz.transition 2033, 9, :o1, 2011726800
-          tz.transition 2034, 3, :o2, 2027455200
-          tz.transition 2034, 9, :o1, 2043262800
-          tz.transition 2035, 3, :o2, 2058991200
-          tz.transition 2035, 9, :o1, 2074798800
-          tz.transition 2036, 3, :o2, 2090613600
-          tz.transition 2036, 9, :o1, 2106421200
-          tz.transition 2037, 3, :o2, 2122149600
-          tz.transition 2037, 9, :o1, 2137957200
-          tz.transition 2038, 3, :o2, 29586173, 12
-          tz.transition 2038, 9, :o1, 19725579, 8
-          tz.transition 2039, 3, :o2, 29590553, 12
-          tz.transition 2039, 9, :o1, 19728499, 8
-          tz.transition 2040, 3, :o2, 29594945, 12
-          tz.transition 2040, 9, :o1, 19731427, 8
-          tz.transition 2041, 3, :o2, 29599325, 12
-          tz.transition 2041, 9, :o1, 19734347, 8
-          tz.transition 2042, 3, :o2, 29603705, 12
-          tz.transition 2042, 9, :o1, 19737267, 8
-          tz.transition 2043, 3, :o2, 29608085, 12
-          tz.transition 2043, 9, :o1, 19740187, 8
-          tz.transition 2044, 3, :o2, 29612477, 12
-          tz.transition 2044, 9, :o1, 19743115, 8
-          tz.transition 2045, 3, :o2, 29616857, 12
-          tz.transition 2045, 9, :o1, 19746035, 8
-          tz.transition 2046, 3, :o2, 29621237, 12
-          tz.transition 2046, 9, :o1, 19748955, 8
-          tz.transition 2047, 3, :o2, 29625617, 12
-          tz.transition 2047, 9, :o1, 19751875, 8
-          tz.transition 2048, 3, :o2, 29630009, 12
-          tz.transition 2048, 9, :o1, 19754803, 8
-          tz.transition 2049, 3, :o2, 29634389, 12
-          tz.transition 2049, 9, :o1, 19757723, 8
-          tz.transition 2050, 3, :o2, 29638769, 12
-          tz.transition 2050, 9, :o1, 19760643, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dhaka.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dhaka.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dhaka.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dhaka.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,27 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Dhaka
-        include TimezoneDefinition
-        
-        timezone 'Asia/Dhaka' do |tz|
-          tz.offset :o0, 21700, 0, :LMT
-          tz.offset :o1, 21200, 0, :HMT
-          tz.offset :o2, 23400, 0, :BURT
-          tz.offset :o3, 19800, 0, :IST
-          tz.offset :o4, 21600, 0, :DACT
-          tz.offset :o5, 21600, 0, :BDT
-          
-          tz.transition 1889, 12, :o1, 2083422167, 864
-          tz.transition 1941, 9, :o2, 524937943, 216
-          tz.transition 1942, 5, :o3, 116663723, 48
-          tz.transition 1942, 8, :o2, 116668957, 48
-          tz.transition 1951, 9, :o4, 116828123, 48
-          tz.transition 1971, 3, :o5, 38772000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dili.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dili.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dili.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dili.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Dili
-        include TimezoneDefinition
-        
-        timezone 'Asia/Dili' do |tz|
-          tz.offset :o0, 30140, 0, :LMT
-          tz.offset :o1, 28800, 0, :TLT
-          tz.offset :o2, 32400, 0, :JST
-          tz.offset :o3, 32400, 0, :TLT
-          tz.offset :o4, 28800, 0, :CIT
-          
-          tz.transition 1911, 12, :o1, 10451817293, 4320
-          tz.transition 1942, 2, :o2, 19443297, 8
-          tz.transition 1945, 7, :o3, 19453345, 8
-          tz.transition 1976, 5, :o4, 199897200
-          tz.transition 2000, 9, :o3, 969120000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dubai.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dubai.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dubai.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dubai.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Dubai
-        include TimezoneDefinition
-        
-        timezone 'Asia/Dubai' do |tz|
-          tz.offset :o0, 13272, 0, :LMT
-          tz.offset :o1, 14400, 0, :GST
-          
-          tz.transition 1919, 12, :o1, 8720367647, 3600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dushanbe.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dushanbe.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dushanbe.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Dushanbe.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,45 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Dushanbe
-        include TimezoneDefinition
-        
-        timezone 'Asia/Dushanbe' do |tz|
-          tz.offset :o0, 16512, 0, :LMT
-          tz.offset :o1, 18000, 0, :DUST
-          tz.offset :o2, 21600, 0, :DUST
-          tz.offset :o3, 21600, 3600, :DUSST
-          tz.offset :o4, 18000, 3600, :DUSST
-          tz.offset :o5, 18000, 0, :TJT
-          
-          tz.transition 1924, 5, :o1, 1090758289, 450
-          tz.transition 1930, 6, :o2, 58227559, 24
-          tz.transition 1981, 3, :o3, 354909600
-          tz.transition 1981, 9, :o2, 370717200
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402253200
-          tz.transition 1983, 3, :o3, 417981600
-          tz.transition 1983, 9, :o2, 433789200
-          tz.transition 1984, 3, :o3, 449604000
-          tz.transition 1984, 9, :o2, 465336000
-          tz.transition 1985, 3, :o3, 481060800
-          tz.transition 1985, 9, :o2, 496785600
-          tz.transition 1986, 3, :o3, 512510400
-          tz.transition 1986, 9, :o2, 528235200
-          tz.transition 1987, 3, :o3, 543960000
-          tz.transition 1987, 9, :o2, 559684800
-          tz.transition 1988, 3, :o3, 575409600
-          tz.transition 1988, 9, :o2, 591134400
-          tz.transition 1989, 3, :o3, 606859200
-          tz.transition 1989, 9, :o2, 622584000
-          tz.transition 1990, 3, :o3, 638308800
-          tz.transition 1990, 9, :o2, 654638400
-          tz.transition 1991, 3, :o4, 670363200
-          tz.transition 1991, 9, :o5, 684363600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Gaza.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Gaza.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Gaza.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Gaza.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,191 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Gaza
-        include TimezoneDefinition
-        
-        timezone 'Asia/Gaza' do |tz|
-          tz.offset :o0, 8272, 0, :LMT
-          tz.offset :o1, 7200, 0, :EET
-          tz.offset :o2, 7200, 3600, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          tz.offset :o4, 7200, 0, :IST
-          tz.offset :o5, 7200, 3600, :IDT
-          
-          tz.transition 1900, 9, :o1, 13042584383, 5400
-          tz.transition 1940, 5, :o2, 29157377, 12
-          tz.transition 1942, 10, :o1, 19445315, 8
-          tz.transition 1943, 4, :o2, 4861631, 2
-          tz.transition 1943, 10, :o1, 19448235, 8
-          tz.transition 1944, 3, :o2, 29174177, 12
-          tz.transition 1944, 10, :o1, 19451163, 8
-          tz.transition 1945, 4, :o2, 29178737, 12
-          tz.transition 1945, 10, :o1, 58362251, 24
-          tz.transition 1946, 4, :o2, 4863853, 2
-          tz.transition 1946, 10, :o1, 19457003, 8
-          tz.transition 1957, 5, :o3, 29231621, 12
-          tz.transition 1957, 9, :o1, 19488899, 8
-          tz.transition 1958, 4, :o3, 29235893, 12
-          tz.transition 1958, 9, :o1, 19491819, 8
-          tz.transition 1959, 4, :o3, 58480547, 24
-          tz.transition 1959, 9, :o1, 4873683, 2
-          tz.transition 1960, 4, :o3, 58489331, 24
-          tz.transition 1960, 9, :o1, 4874415, 2
-          tz.transition 1961, 4, :o3, 58498091, 24
-          tz.transition 1961, 9, :o1, 4875145, 2
-          tz.transition 1962, 4, :o3, 58506851, 24
-          tz.transition 1962, 9, :o1, 4875875, 2
-          tz.transition 1963, 4, :o3, 58515611, 24
-          tz.transition 1963, 9, :o1, 4876605, 2
-          tz.transition 1964, 4, :o3, 58524395, 24
-          tz.transition 1964, 9, :o1, 4877337, 2
-          tz.transition 1965, 4, :o3, 58533155, 24
-          tz.transition 1965, 9, :o1, 4878067, 2
-          tz.transition 1966, 4, :o3, 58541915, 24
-          tz.transition 1966, 10, :o1, 4878799, 2
-          tz.transition 1967, 4, :o3, 58550675, 24
-          tz.transition 1967, 6, :o4, 19517171, 8
-          tz.transition 1974, 7, :o5, 142380000
-          tz.transition 1974, 10, :o4, 150843600
-          tz.transition 1975, 4, :o5, 167176800
-          tz.transition 1975, 8, :o4, 178664400
-          tz.transition 1985, 4, :o5, 482277600
-          tz.transition 1985, 9, :o4, 495579600
-          tz.transition 1986, 5, :o5, 516751200
-          tz.transition 1986, 9, :o4, 526424400
-          tz.transition 1987, 4, :o5, 545436000
-          tz.transition 1987, 9, :o4, 558478800
-          tz.transition 1988, 4, :o5, 576540000
-          tz.transition 1988, 9, :o4, 589237200
-          tz.transition 1989, 4, :o5, 609890400
-          tz.transition 1989, 9, :o4, 620773200
-          tz.transition 1990, 3, :o5, 638316000
-          tz.transition 1990, 8, :o4, 651618000
-          tz.transition 1991, 3, :o5, 669765600
-          tz.transition 1991, 8, :o4, 683672400
-          tz.transition 1992, 3, :o5, 701820000
-          tz.transition 1992, 9, :o4, 715726800
-          tz.transition 1993, 4, :o5, 733701600
-          tz.transition 1993, 9, :o4, 747176400
-          tz.transition 1994, 3, :o5, 765151200
-          tz.transition 1994, 8, :o4, 778021200
-          tz.transition 1995, 3, :o5, 796600800
-          tz.transition 1995, 9, :o4, 810075600
-          tz.transition 1995, 12, :o1, 820447200
-          tz.transition 1996, 4, :o3, 828655200
-          tz.transition 1996, 9, :o1, 843170400
-          tz.transition 1997, 4, :o3, 860104800
-          tz.transition 1997, 9, :o1, 874620000
-          tz.transition 1998, 4, :o3, 891554400
-          tz.transition 1998, 9, :o1, 906069600
-          tz.transition 1999, 4, :o3, 924213600
-          tz.transition 1999, 10, :o1, 939934800
-          tz.transition 2000, 4, :o3, 956268000
-          tz.transition 2000, 10, :o1, 971989200
-          tz.transition 2001, 4, :o3, 987717600
-          tz.transition 2001, 10, :o1, 1003438800
-          tz.transition 2002, 4, :o3, 1019167200
-          tz.transition 2002, 10, :o1, 1034888400
-          tz.transition 2003, 4, :o3, 1050616800
-          tz.transition 2003, 10, :o1, 1066338000
-          tz.transition 2004, 4, :o3, 1082066400
-          tz.transition 2004, 9, :o1, 1096581600
-          tz.transition 2005, 4, :o3, 1113516000
-          tz.transition 2005, 10, :o1, 1128380400
-          tz.transition 2006, 3, :o3, 1143842400
-          tz.transition 2006, 9, :o1, 1158872400
-          tz.transition 2007, 3, :o3, 1175378400
-          tz.transition 2007, 10, :o1, 1192741200
-          tz.transition 2008, 3, :o3, 1207000800
-          tz.transition 2008, 10, :o1, 1224190800
-          tz.transition 2009, 3, :o3, 1238536800
-          tz.transition 2009, 10, :o1, 1255640400
-          tz.transition 2010, 3, :o3, 1270072800
-          tz.transition 2010, 10, :o1, 1287090000
-          tz.transition 2011, 3, :o3, 1301608800
-          tz.transition 2011, 10, :o1, 1319144400
-          tz.transition 2012, 3, :o3, 1333231200
-          tz.transition 2012, 10, :o1, 1350594000
-          tz.transition 2013, 3, :o3, 1364767200
-          tz.transition 2013, 10, :o1, 1382043600
-          tz.transition 2014, 3, :o3, 1396303200
-          tz.transition 2014, 10, :o1, 1413493200
-          tz.transition 2015, 3, :o3, 1427839200
-          tz.transition 2015, 10, :o1, 1444942800
-          tz.transition 2016, 3, :o3, 1459461600
-          tz.transition 2016, 10, :o1, 1476997200
-          tz.transition 2017, 3, :o3, 1490997600
-          tz.transition 2017, 10, :o1, 1508446800
-          tz.transition 2018, 3, :o3, 1522533600
-          tz.transition 2018, 10, :o1, 1539896400
-          tz.transition 2019, 3, :o3, 1554069600
-          tz.transition 2019, 10, :o1, 1571346000
-          tz.transition 2020, 3, :o3, 1585692000
-          tz.transition 2020, 10, :o1, 1602795600
-          tz.transition 2021, 3, :o3, 1617228000
-          tz.transition 2021, 10, :o1, 1634245200
-          tz.transition 2022, 3, :o3, 1648764000
-          tz.transition 2022, 10, :o1, 1666299600
-          tz.transition 2023, 3, :o3, 1680300000
-          tz.transition 2023, 10, :o1, 1697749200
-          tz.transition 2024, 3, :o3, 1711922400
-          tz.transition 2024, 10, :o1, 1729198800
-          tz.transition 2025, 3, :o3, 1743458400
-          tz.transition 2025, 10, :o1, 1760648400
-          tz.transition 2026, 3, :o3, 1774994400
-          tz.transition 2026, 10, :o1, 1792098000
-          tz.transition 2027, 3, :o3, 1806530400
-          tz.transition 2027, 10, :o1, 1823547600
-          tz.transition 2028, 3, :o3, 1838152800
-          tz.transition 2028, 10, :o1, 1855602000
-          tz.transition 2029, 3, :o3, 1869688800
-          tz.transition 2029, 10, :o1, 1887051600
-          tz.transition 2030, 3, :o3, 1901224800
-          tz.transition 2030, 10, :o1, 1918501200
-          tz.transition 2031, 3, :o3, 1932760800
-          tz.transition 2031, 10, :o1, 1949950800
-          tz.transition 2032, 3, :o3, 1964383200
-          tz.transition 2032, 10, :o1, 1981400400
-          tz.transition 2033, 3, :o3, 1995919200
-          tz.transition 2033, 10, :o1, 2013454800
-          tz.transition 2034, 3, :o3, 2027455200
-          tz.transition 2034, 10, :o1, 2044904400
-          tz.transition 2035, 3, :o3, 2058991200
-          tz.transition 2035, 10, :o1, 2076354000
-          tz.transition 2036, 3, :o3, 2090613600
-          tz.transition 2036, 10, :o1, 2107803600
-          tz.transition 2037, 3, :o3, 2122149600
-          tz.transition 2037, 10, :o1, 2139253200
-          tz.transition 2038, 3, :o3, 29586173, 12
-          tz.transition 2038, 10, :o1, 19725691, 8
-          tz.transition 2039, 3, :o3, 29590553, 12
-          tz.transition 2039, 10, :o1, 19728659, 8
-          tz.transition 2040, 3, :o3, 29594945, 12
-          tz.transition 2040, 10, :o1, 19731571, 8
-          tz.transition 2041, 3, :o3, 29599325, 12
-          tz.transition 2041, 10, :o1, 19734483, 8
-          tz.transition 2042, 3, :o3, 29603705, 12
-          tz.transition 2042, 10, :o1, 19737395, 8
-          tz.transition 2043, 3, :o3, 29608085, 12
-          tz.transition 2043, 10, :o1, 19740307, 8
-          tz.transition 2044, 3, :o3, 29612477, 12
-          tz.transition 2044, 10, :o1, 19743275, 8
-          tz.transition 2045, 3, :o3, 29616857, 12
-          tz.transition 2045, 10, :o1, 19746187, 8
-          tz.transition 2046, 3, :o3, 29621237, 12
-          tz.transition 2046, 10, :o1, 19749099, 8
-          tz.transition 2047, 3, :o3, 29625617, 12
-          tz.transition 2047, 10, :o1, 19752011, 8
-          tz.transition 2048, 3, :o3, 29630009, 12
-          tz.transition 2048, 10, :o1, 19754923, 8
-          tz.transition 2049, 3, :o3, 29634389, 12
-          tz.transition 2049, 10, :o1, 19757835, 8
-          tz.transition 2050, 3, :o3, 29638769, 12
-          tz.transition 2050, 10, :o1, 19760803, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Harbin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Harbin.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Harbin.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Harbin.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,37 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Harbin
-        include TimezoneDefinition
-        
-        timezone 'Asia/Harbin' do |tz|
-          tz.offset :o0, 30404, 0, :LMT
-          tz.offset :o1, 30600, 0, :CHAT
-          tz.offset :o2, 28800, 0, :CST
-          tz.offset :o3, 32400, 0, :CHAT
-          tz.offset :o4, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 52385316799, 21600
-          tz.transition 1932, 2, :o2, 116484823, 48
-          tz.transition 1939, 12, :o3, 14577775, 6
-          tz.transition 1966, 4, :o1, 19513969, 8
-          tz.transition 1980, 4, :o2, 325956600
-          tz.transition 1986, 5, :o4, 515520000
-          tz.transition 1986, 9, :o2, 527007600
-          tz.transition 1987, 4, :o4, 545155200
-          tz.transition 1987, 9, :o2, 558457200
-          tz.transition 1988, 4, :o4, 576604800
-          tz.transition 1988, 9, :o2, 589906800
-          tz.transition 1989, 4, :o4, 608659200
-          tz.transition 1989, 9, :o2, 621961200
-          tz.transition 1990, 4, :o4, 640108800
-          tz.transition 1990, 9, :o2, 653410800
-          tz.transition 1991, 4, :o4, 671558400
-          tz.transition 1991, 9, :o2, 684860400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hong_Kong.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hong_Kong.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hong_Kong.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hong_Kong.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,87 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Hong_Kong
-        include TimezoneDefinition
-        
-        timezone 'Asia/Hong_Kong' do |tz|
-          tz.offset :o0, 27396, 0, :LMT
-          tz.offset :o1, 28800, 0, :HKT
-          tz.offset :o2, 28800, 3600, :HKST
-          
-          tz.transition 1904, 10, :o1, 5800279639, 2400
-          tz.transition 1946, 4, :o2, 38910885, 16
-          tz.transition 1946, 11, :o1, 116743453, 48
-          tz.transition 1947, 4, :o2, 38916613, 16
-          tz.transition 1947, 12, :o1, 116762365, 48
-          tz.transition 1948, 5, :o2, 38922773, 16
-          tz.transition 1948, 10, :o1, 116777053, 48
-          tz.transition 1949, 4, :o2, 38928149, 16
-          tz.transition 1949, 10, :o1, 116794525, 48
-          tz.transition 1950, 4, :o2, 38933973, 16
-          tz.transition 1950, 10, :o1, 116811997, 48
-          tz.transition 1951, 3, :o2, 38939797, 16
-          tz.transition 1951, 10, :o1, 116829469, 48
-          tz.transition 1952, 4, :o2, 38945733, 16
-          tz.transition 1952, 10, :o1, 116846941, 48
-          tz.transition 1953, 4, :o2, 38951557, 16
-          tz.transition 1953, 10, :o1, 116864749, 48
-          tz.transition 1954, 3, :o2, 38957157, 16
-          tz.transition 1954, 10, :o1, 116882221, 48
-          tz.transition 1955, 3, :o2, 38962981, 16
-          tz.transition 1955, 11, :o1, 116900029, 48
-          tz.transition 1956, 3, :o2, 38968805, 16
-          tz.transition 1956, 11, :o1, 116917501, 48
-          tz.transition 1957, 3, :o2, 38974741, 16
-          tz.transition 1957, 11, :o1, 116934973, 48
-          tz.transition 1958, 3, :o2, 38980565, 16
-          tz.transition 1958, 11, :o1, 116952445, 48
-          tz.transition 1959, 3, :o2, 38986389, 16
-          tz.transition 1959, 10, :o1, 116969917, 48
-          tz.transition 1960, 3, :o2, 38992213, 16
-          tz.transition 1960, 11, :o1, 116987725, 48
-          tz.transition 1961, 3, :o2, 38998037, 16
-          tz.transition 1961, 11, :o1, 117005197, 48
-          tz.transition 1962, 3, :o2, 39003861, 16
-          tz.transition 1962, 11, :o1, 117022669, 48
-          tz.transition 1963, 3, :o2, 39009797, 16
-          tz.transition 1963, 11, :o1, 117040141, 48
-          tz.transition 1964, 3, :o2, 39015621, 16
-          tz.transition 1964, 10, :o1, 117057613, 48
-          tz.transition 1965, 4, :o2, 39021893, 16
-          tz.transition 1965, 10, :o1, 117074413, 48
-          tz.transition 1966, 4, :o2, 39027717, 16
-          tz.transition 1966, 10, :o1, 117091885, 48
-          tz.transition 1967, 4, :o2, 39033541, 16
-          tz.transition 1967, 10, :o1, 117109693, 48
-          tz.transition 1968, 4, :o2, 39039477, 16
-          tz.transition 1968, 10, :o1, 117127165, 48
-          tz.transition 1969, 4, :o2, 39045301, 16
-          tz.transition 1969, 10, :o1, 117144637, 48
-          tz.transition 1970, 4, :o2, 9315000
-          tz.transition 1970, 10, :o1, 25036200
-          tz.transition 1971, 4, :o2, 40764600
-          tz.transition 1971, 10, :o1, 56485800
-          tz.transition 1972, 4, :o2, 72214200
-          tz.transition 1972, 10, :o1, 88540200
-          tz.transition 1973, 4, :o2, 104268600
-          tz.transition 1973, 10, :o1, 119989800
-          tz.transition 1974, 4, :o2, 135718200
-          tz.transition 1974, 10, :o1, 151439400
-          tz.transition 1975, 4, :o2, 167167800
-          tz.transition 1975, 10, :o1, 182889000
-          tz.transition 1976, 4, :o2, 198617400
-          tz.transition 1976, 10, :o1, 214338600
-          tz.transition 1977, 4, :o2, 230067000
-          tz.transition 1977, 10, :o1, 245788200
-          tz.transition 1979, 5, :o2, 295385400
-          tz.transition 1979, 10, :o1, 309292200
-          tz.transition 1980, 5, :o2, 326835000
-          tz.transition 1980, 10, :o1, 340741800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hovd.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hovd.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hovd.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Hovd.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,153 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Hovd
-        include TimezoneDefinition
-        
-        timezone 'Asia/Hovd' do |tz|
-          tz.offset :o0, 21996, 0, :LMT
-          tz.offset :o1, 21600, 0, :HOVT
-          tz.offset :o2, 25200, 0, :HOVT
-          tz.offset :o3, 25200, 3600, :HOVST
-          
-          tz.transition 1905, 7, :o1, 5800939789, 2400
-          tz.transition 1977, 12, :o2, 252439200
-          tz.transition 1983, 3, :o3, 417978000
-          tz.transition 1983, 9, :o2, 433785600
-          tz.transition 1984, 3, :o3, 449600400
-          tz.transition 1984, 9, :o2, 465321600
-          tz.transition 1985, 3, :o3, 481050000
-          tz.transition 1985, 9, :o2, 496771200
-          tz.transition 1986, 3, :o3, 512499600
-          tz.transition 1986, 9, :o2, 528220800
-          tz.transition 1987, 3, :o3, 543949200
-          tz.transition 1987, 9, :o2, 559670400
-          tz.transition 1988, 3, :o3, 575398800
-          tz.transition 1988, 9, :o2, 591120000
-          tz.transition 1989, 3, :o3, 606848400
-          tz.transition 1989, 9, :o2, 622569600
-          tz.transition 1990, 3, :o3, 638298000
-          tz.transition 1990, 9, :o2, 654624000
-          tz.transition 1991, 3, :o3, 670352400
-          tz.transition 1991, 9, :o2, 686073600
-          tz.transition 1992, 3, :o3, 701802000
-          tz.transition 1992, 9, :o2, 717523200
-          tz.transition 1993, 3, :o3, 733251600
-          tz.transition 1993, 9, :o2, 748972800
-          tz.transition 1994, 3, :o3, 764701200
-          tz.transition 1994, 9, :o2, 780422400
-          tz.transition 1995, 3, :o3, 796150800
-          tz.transition 1995, 9, :o2, 811872000
-          tz.transition 1996, 3, :o3, 828205200
-          tz.transition 1996, 9, :o2, 843926400
-          tz.transition 1997, 3, :o3, 859654800
-          tz.transition 1997, 9, :o2, 875376000
-          tz.transition 1998, 3, :o3, 891104400
-          tz.transition 1998, 9, :o2, 906825600
-          tz.transition 2001, 4, :o3, 988398000
-          tz.transition 2001, 9, :o2, 1001700000
-          tz.transition 2002, 3, :o3, 1017428400
-          tz.transition 2002, 9, :o2, 1033149600
-          tz.transition 2003, 3, :o3, 1048878000
-          tz.transition 2003, 9, :o2, 1064599200
-          tz.transition 2004, 3, :o3, 1080327600
-          tz.transition 2004, 9, :o2, 1096048800
-          tz.transition 2005, 3, :o3, 1111777200
-          tz.transition 2005, 9, :o2, 1127498400
-          tz.transition 2006, 3, :o3, 1143226800
-          tz.transition 2006, 9, :o2, 1159552800
-          tz.transition 2007, 3, :o3, 1175281200
-          tz.transition 2007, 9, :o2, 1191002400
-          tz.transition 2008, 3, :o3, 1206730800
-          tz.transition 2008, 9, :o2, 1222452000
-          tz.transition 2009, 3, :o3, 1238180400
-          tz.transition 2009, 9, :o2, 1253901600
-          tz.transition 2010, 3, :o3, 1269630000
-          tz.transition 2010, 9, :o2, 1285351200
-          tz.transition 2011, 3, :o3, 1301079600
-          tz.transition 2011, 9, :o2, 1316800800
-          tz.transition 2012, 3, :o3, 1333134000
-          tz.transition 2012, 9, :o2, 1348855200
-          tz.transition 2013, 3, :o3, 1364583600
-          tz.transition 2013, 9, :o2, 1380304800
-          tz.transition 2014, 3, :o3, 1396033200
-          tz.transition 2014, 9, :o2, 1411754400
-          tz.transition 2015, 3, :o3, 1427482800
-          tz.transition 2015, 9, :o2, 1443204000
-          tz.transition 2016, 3, :o3, 1458932400
-          tz.transition 2016, 9, :o2, 1474653600
-          tz.transition 2017, 3, :o3, 1490382000
-          tz.transition 2017, 9, :o2, 1506708000
-          tz.transition 2018, 3, :o3, 1522436400
-          tz.transition 2018, 9, :o2, 1538157600
-          tz.transition 2019, 3, :o3, 1553886000
-          tz.transition 2019, 9, :o2, 1569607200
-          tz.transition 2020, 3, :o3, 1585335600
-          tz.transition 2020, 9, :o2, 1601056800
-          tz.transition 2021, 3, :o3, 1616785200
-          tz.transition 2021, 9, :o2, 1632506400
-          tz.transition 2022, 3, :o3, 1648234800
-          tz.transition 2022, 9, :o2, 1663956000
-          tz.transition 2023, 3, :o3, 1679684400
-          tz.transition 2023, 9, :o2, 1696010400
-          tz.transition 2024, 3, :o3, 1711738800
-          tz.transition 2024, 9, :o2, 1727460000
-          tz.transition 2025, 3, :o3, 1743188400
-          tz.transition 2025, 9, :o2, 1758909600
-          tz.transition 2026, 3, :o3, 1774638000
-          tz.transition 2026, 9, :o2, 1790359200
-          tz.transition 2027, 3, :o3, 1806087600
-          tz.transition 2027, 9, :o2, 1821808800
-          tz.transition 2028, 3, :o3, 1837537200
-          tz.transition 2028, 9, :o2, 1853863200
-          tz.transition 2029, 3, :o3, 1869591600
-          tz.transition 2029, 9, :o2, 1885312800
-          tz.transition 2030, 3, :o3, 1901041200
-          tz.transition 2030, 9, :o2, 1916762400
-          tz.transition 2031, 3, :o3, 1932490800
-          tz.transition 2031, 9, :o2, 1948212000
-          tz.transition 2032, 3, :o3, 1963940400
-          tz.transition 2032, 9, :o2, 1979661600
-          tz.transition 2033, 3, :o3, 1995390000
-          tz.transition 2033, 9, :o2, 2011111200
-          tz.transition 2034, 3, :o3, 2026839600
-          tz.transition 2034, 9, :o2, 2043165600
-          tz.transition 2035, 3, :o3, 2058894000
-          tz.transition 2035, 9, :o2, 2074615200
-          tz.transition 2036, 3, :o3, 2090343600
-          tz.transition 2036, 9, :o2, 2106064800
-          tz.transition 2037, 3, :o3, 2121793200
-          tz.transition 2037, 9, :o2, 2137514400
-          tz.transition 2038, 3, :o3, 59172223, 24
-          tz.transition 2038, 9, :o2, 9862765, 4
-          tz.transition 2039, 3, :o3, 59180959, 24
-          tz.transition 2039, 9, :o2, 9864221, 4
-          tz.transition 2040, 3, :o3, 59189863, 24
-          tz.transition 2040, 9, :o2, 9865705, 4
-          tz.transition 2041, 3, :o3, 59198599, 24
-          tz.transition 2041, 9, :o2, 9867161, 4
-          tz.transition 2042, 3, :o3, 59207335, 24
-          tz.transition 2042, 9, :o2, 9868617, 4
-          tz.transition 2043, 3, :o3, 59216071, 24
-          tz.transition 2043, 9, :o2, 9870073, 4
-          tz.transition 2044, 3, :o3, 59224807, 24
-          tz.transition 2044, 9, :o2, 9871529, 4
-          tz.transition 2045, 3, :o3, 59233543, 24
-          tz.transition 2045, 9, :o2, 9873013, 4
-          tz.transition 2046, 3, :o3, 59242447, 24
-          tz.transition 2046, 9, :o2, 9874469, 4
-          tz.transition 2047, 3, :o3, 59251183, 24
-          tz.transition 2047, 9, :o2, 9875925, 4
-          tz.transition 2048, 3, :o3, 59259919, 24
-          tz.transition 2048, 9, :o2, 9877381, 4
-          tz.transition 2049, 3, :o3, 59268655, 24
-          tz.transition 2049, 9, :o2, 9878837, 4
-          tz.transition 2050, 3, :o3, 59277391, 24
-          tz.transition 2050, 9, :o2, 9880293, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Irkutsk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Irkutsk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Irkutsk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Irkutsk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Irkutsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Irkutsk' do |tz|
-          tz.offset :o0, 25040, 0, :LMT
-          tz.offset :o1, 25040, 0, :IMT
-          tz.offset :o2, 25200, 0, :IRKT
-          tz.offset :o3, 28800, 0, :IRKT
-          tz.offset :o4, 28800, 3600, :IRKST
-          tz.offset :o5, 25200, 3600, :IRKST
-          
-          tz.transition 1879, 12, :o1, 2600332427, 1080
-          tz.transition 1920, 1, :o2, 2616136067, 1080
-          tz.transition 1930, 6, :o3, 58227557, 24
-          tz.transition 1981, 3, :o4, 354902400
-          tz.transition 1981, 9, :o3, 370710000
-          tz.transition 1982, 3, :o4, 386438400
-          tz.transition 1982, 9, :o3, 402246000
-          tz.transition 1983, 3, :o4, 417974400
-          tz.transition 1983, 9, :o3, 433782000
-          tz.transition 1984, 3, :o4, 449596800
-          tz.transition 1984, 9, :o3, 465328800
-          tz.transition 1985, 3, :o4, 481053600
-          tz.transition 1985, 9, :o3, 496778400
-          tz.transition 1986, 3, :o4, 512503200
-          tz.transition 1986, 9, :o3, 528228000
-          tz.transition 1987, 3, :o4, 543952800
-          tz.transition 1987, 9, :o3, 559677600
-          tz.transition 1988, 3, :o4, 575402400
-          tz.transition 1988, 9, :o3, 591127200
-          tz.transition 1989, 3, :o4, 606852000
-          tz.transition 1989, 9, :o3, 622576800
-          tz.transition 1990, 3, :o4, 638301600
-          tz.transition 1990, 9, :o3, 654631200
-          tz.transition 1991, 3, :o5, 670356000
-          tz.transition 1991, 9, :o2, 686084400
-          tz.transition 1992, 1, :o3, 695761200
-          tz.transition 1992, 3, :o4, 701794800
-          tz.transition 1992, 9, :o3, 717516000
-          tz.transition 1993, 3, :o4, 733255200
-          tz.transition 1993, 9, :o3, 748980000
-          tz.transition 1994, 3, :o4, 764704800
-          tz.transition 1994, 9, :o3, 780429600
-          tz.transition 1995, 3, :o4, 796154400
-          tz.transition 1995, 9, :o3, 811879200
-          tz.transition 1996, 3, :o4, 828208800
-          tz.transition 1996, 10, :o3, 846352800
-          tz.transition 1997, 3, :o4, 859658400
-          tz.transition 1997, 10, :o3, 877802400
-          tz.transition 1998, 3, :o4, 891108000
-          tz.transition 1998, 10, :o3, 909252000
-          tz.transition 1999, 3, :o4, 922557600
-          tz.transition 1999, 10, :o3, 941306400
-          tz.transition 2000, 3, :o4, 954007200
-          tz.transition 2000, 10, :o3, 972756000
-          tz.transition 2001, 3, :o4, 985456800
-          tz.transition 2001, 10, :o3, 1004205600
-          tz.transition 2002, 3, :o4, 1017511200
-          tz.transition 2002, 10, :o3, 1035655200
-          tz.transition 2003, 3, :o4, 1048960800
-          tz.transition 2003, 10, :o3, 1067104800
-          tz.transition 2004, 3, :o4, 1080410400
-          tz.transition 2004, 10, :o3, 1099159200
-          tz.transition 2005, 3, :o4, 1111860000
-          tz.transition 2005, 10, :o3, 1130608800
-          tz.transition 2006, 3, :o4, 1143309600
-          tz.transition 2006, 10, :o3, 1162058400
-          tz.transition 2007, 3, :o4, 1174759200
-          tz.transition 2007, 10, :o3, 1193508000
-          tz.transition 2008, 3, :o4, 1206813600
-          tz.transition 2008, 10, :o3, 1224957600
-          tz.transition 2009, 3, :o4, 1238263200
-          tz.transition 2009, 10, :o3, 1256407200
-          tz.transition 2010, 3, :o4, 1269712800
-          tz.transition 2010, 10, :o3, 1288461600
-          tz.transition 2011, 3, :o4, 1301162400
-          tz.transition 2011, 10, :o3, 1319911200
-          tz.transition 2012, 3, :o4, 1332612000
-          tz.transition 2012, 10, :o3, 1351360800
-          tz.transition 2013, 3, :o4, 1364666400
-          tz.transition 2013, 10, :o3, 1382810400
-          tz.transition 2014, 3, :o4, 1396116000
-          tz.transition 2014, 10, :o3, 1414260000
-          tz.transition 2015, 3, :o4, 1427565600
-          tz.transition 2015, 10, :o3, 1445709600
-          tz.transition 2016, 3, :o4, 1459015200
-          tz.transition 2016, 10, :o3, 1477764000
-          tz.transition 2017, 3, :o4, 1490464800
-          tz.transition 2017, 10, :o3, 1509213600
-          tz.transition 2018, 3, :o4, 1521914400
-          tz.transition 2018, 10, :o3, 1540663200
-          tz.transition 2019, 3, :o4, 1553968800
-          tz.transition 2019, 10, :o3, 1572112800
-          tz.transition 2020, 3, :o4, 1585418400
-          tz.transition 2020, 10, :o3, 1603562400
-          tz.transition 2021, 3, :o4, 1616868000
-          tz.transition 2021, 10, :o3, 1635616800
-          tz.transition 2022, 3, :o4, 1648317600
-          tz.transition 2022, 10, :o3, 1667066400
-          tz.transition 2023, 3, :o4, 1679767200
-          tz.transition 2023, 10, :o3, 1698516000
-          tz.transition 2024, 3, :o4, 1711821600
-          tz.transition 2024, 10, :o3, 1729965600
-          tz.transition 2025, 3, :o4, 1743271200
-          tz.transition 2025, 10, :o3, 1761415200
-          tz.transition 2026, 3, :o4, 1774720800
-          tz.transition 2026, 10, :o3, 1792864800
-          tz.transition 2027, 3, :o4, 1806170400
-          tz.transition 2027, 10, :o3, 1824919200
-          tz.transition 2028, 3, :o4, 1837620000
-          tz.transition 2028, 10, :o3, 1856368800
-          tz.transition 2029, 3, :o4, 1869069600
-          tz.transition 2029, 10, :o3, 1887818400
-          tz.transition 2030, 3, :o4, 1901124000
-          tz.transition 2030, 10, :o3, 1919268000
-          tz.transition 2031, 3, :o4, 1932573600
-          tz.transition 2031, 10, :o3, 1950717600
-          tz.transition 2032, 3, :o4, 1964023200
-          tz.transition 2032, 10, :o3, 1982772000
-          tz.transition 2033, 3, :o4, 1995472800
-          tz.transition 2033, 10, :o3, 2014221600
-          tz.transition 2034, 3, :o4, 2026922400
-          tz.transition 2034, 10, :o3, 2045671200
-          tz.transition 2035, 3, :o4, 2058372000
-          tz.transition 2035, 10, :o3, 2077120800
-          tz.transition 2036, 3, :o4, 2090426400
-          tz.transition 2036, 10, :o3, 2108570400
-          tz.transition 2037, 3, :o4, 2121876000
-          tz.transition 2037, 10, :o3, 2140020000
-          tz.transition 2038, 3, :o4, 9862041, 4
-          tz.transition 2038, 10, :o3, 9862909, 4
-          tz.transition 2039, 3, :o4, 9863497, 4
-          tz.transition 2039, 10, :o3, 9864365, 4
-          tz.transition 2040, 3, :o4, 9864953, 4
-          tz.transition 2040, 10, :o3, 9865821, 4
-          tz.transition 2041, 3, :o4, 9866437, 4
-          tz.transition 2041, 10, :o3, 9867277, 4
-          tz.transition 2042, 3, :o4, 9867893, 4
-          tz.transition 2042, 10, :o3, 9868733, 4
-          tz.transition 2043, 3, :o4, 9869349, 4
-          tz.transition 2043, 10, :o3, 9870189, 4
-          tz.transition 2044, 3, :o4, 9870805, 4
-          tz.transition 2044, 10, :o3, 9871673, 4
-          tz.transition 2045, 3, :o4, 9872261, 4
-          tz.transition 2045, 10, :o3, 9873129, 4
-          tz.transition 2046, 3, :o4, 9873717, 4
-          tz.transition 2046, 10, :o3, 9874585, 4
-          tz.transition 2047, 3, :o4, 9875201, 4
-          tz.transition 2047, 10, :o3, 9876041, 4
-          tz.transition 2048, 3, :o4, 9876657, 4
-          tz.transition 2048, 10, :o3, 9877497, 4
-          tz.transition 2049, 3, :o4, 9878113, 4
-          tz.transition 2049, 10, :o3, 9878981, 4
-          tz.transition 2050, 3, :o4, 9879569, 4
-          tz.transition 2050, 10, :o3, 9880437, 4
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Istanbul.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Istanbul.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Istanbul.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Istanbul.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Istanbul
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Istanbul', 'Europe/Istanbul'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jakarta.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jakarta.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jakarta.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jakarta.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Jakarta
-        include TimezoneDefinition
-        
-        timezone 'Asia/Jakarta' do |tz|
-          tz.offset :o0, 25632, 0, :LMT
-          tz.offset :o1, 25632, 0, :JMT
-          tz.offset :o2, 26400, 0, :JAVT
-          tz.offset :o3, 27000, 0, :WIT
-          tz.offset :o4, 32400, 0, :JST
-          tz.offset :o5, 28800, 0, :WIT
-          tz.offset :o6, 25200, 0, :WIT
-          
-          tz.transition 1867, 8, :o1, 720956461, 300
-          tz.transition 1923, 12, :o2, 87256267, 36
-          tz.transition 1932, 10, :o3, 87372439, 36
-          tz.transition 1942, 3, :o4, 38887059, 16
-          tz.transition 1945, 7, :o3, 19453345, 8
-          tz.transition 1948, 4, :o5, 38922755, 16
-          tz.transition 1950, 4, :o3, 14600413, 6
-          tz.transition 1963, 12, :o6, 39014323, 16
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jayapura.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jayapura.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jayapura.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jayapura.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Jayapura
-        include TimezoneDefinition
-        
-        timezone 'Asia/Jayapura' do |tz|
-          tz.offset :o0, 33768, 0, :LMT
-          tz.offset :o1, 32400, 0, :EIT
-          tz.offset :o2, 34200, 0, :CST
-          
-          tz.transition 1932, 10, :o1, 2912414531, 1200
-          tz.transition 1943, 12, :o2, 19448721, 8
-          tz.transition 1963, 12, :o1, 117042965, 48
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jerusalem.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jerusalem.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jerusalem.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Jerusalem.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Jerusalem
-        include TimezoneDefinition
-        
-        timezone 'Asia/Jerusalem' do |tz|
-          tz.offset :o0, 8456, 0, :LMT
-          tz.offset :o1, 8440, 0, :JMT
-          tz.offset :o2, 7200, 0, :IST
-          tz.offset :o3, 7200, 3600, :IDT
-          tz.offset :o4, 7200, 7200, :IDDT
-          
-          tz.transition 1879, 12, :o1, 26003326343, 10800
-          tz.transition 1917, 12, :o2, 5230643909, 2160
-          tz.transition 1940, 5, :o3, 29157377, 12
-          tz.transition 1942, 10, :o2, 19445315, 8
-          tz.transition 1943, 4, :o3, 4861631, 2
-          tz.transition 1943, 10, :o2, 19448235, 8
-          tz.transition 1944, 3, :o3, 29174177, 12
-          tz.transition 1944, 10, :o2, 19451163, 8
-          tz.transition 1945, 4, :o3, 29178737, 12
-          tz.transition 1945, 10, :o2, 58362251, 24
-          tz.transition 1946, 4, :o3, 4863853, 2
-          tz.transition 1946, 10, :o2, 19457003, 8
-          tz.transition 1948, 5, :o4, 29192333, 12
-          tz.transition 1948, 8, :o3, 7298386, 3
-          tz.transition 1948, 10, :o2, 58388555, 24
-          tz.transition 1949, 4, :o3, 29196449, 12
-          tz.transition 1949, 10, :o2, 58397315, 24
-          tz.transition 1950, 4, :o3, 29200649, 12
-          tz.transition 1950, 9, :o2, 4867079, 2
-          tz.transition 1951, 3, :o3, 29204849, 12
-          tz.transition 1951, 11, :o2, 4867923, 2
-          tz.transition 1952, 4, :o3, 4868245, 2
-          tz.transition 1952, 10, :o2, 4868609, 2
-          tz.transition 1953, 4, :o3, 4868959, 2
-          tz.transition 1953, 9, :o2, 4869267, 2
-          tz.transition 1954, 6, :o3, 29218877, 12
-          tz.transition 1954, 9, :o2, 19479979, 8
-          tz.transition 1955, 6, :o3, 4870539, 2
-          tz.transition 1955, 9, :o2, 19482891, 8
-          tz.transition 1956, 6, :o3, 29227529, 12
-          tz.transition 1956, 9, :o2, 4871493, 2
-          tz.transition 1957, 4, :o3, 4871915, 2
-          tz.transition 1957, 9, :o2, 19488827, 8
-          tz.transition 1974, 7, :o3, 142380000
-          tz.transition 1974, 10, :o2, 150843600
-          tz.transition 1975, 4, :o3, 167176800
-          tz.transition 1975, 8, :o2, 178664400
-          tz.transition 1985, 4, :o3, 482277600
-          tz.transition 1985, 9, :o2, 495579600
-          tz.transition 1986, 5, :o3, 516751200
-          tz.transition 1986, 9, :o2, 526424400
-          tz.transition 1987, 4, :o3, 545436000
-          tz.transition 1987, 9, :o2, 558478800
-          tz.transition 1988, 4, :o3, 576540000
-          tz.transition 1988, 9, :o2, 589237200
-          tz.transition 1989, 4, :o3, 609890400
-          tz.transition 1989, 9, :o2, 620773200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 8, :o2, 651618000
-          tz.transition 1991, 3, :o3, 669765600
-          tz.transition 1991, 8, :o2, 683672400
-          tz.transition 1992, 3, :o3, 701820000
-          tz.transition 1992, 9, :o2, 715726800
-          tz.transition 1993, 4, :o3, 733701600
-          tz.transition 1993, 9, :o2, 747176400
-          tz.transition 1994, 3, :o3, 765151200
-          tz.transition 1994, 8, :o2, 778021200
-          tz.transition 1995, 3, :o3, 796600800
-          tz.transition 1995, 9, :o2, 810075600
-          tz.transition 1996, 3, :o3, 826840800
-          tz.transition 1996, 9, :o2, 842821200
-          tz.transition 1997, 3, :o3, 858895200
-          tz.transition 1997, 9, :o2, 874184400
-          tz.transition 1998, 3, :o3, 890344800
-          tz.transition 1998, 9, :o2, 905029200
-          tz.transition 1999, 4, :o3, 923011200
-          tz.transition 1999, 9, :o2, 936313200
-          tz.transition 2000, 4, :o3, 955670400
-          tz.transition 2000, 10, :o2, 970783200
-          tz.transition 2001, 4, :o3, 986770800
-          tz.transition 2001, 9, :o2, 1001282400
-          tz.transition 2002, 3, :o3, 1017356400
-          tz.transition 2002, 10, :o2, 1033941600
-          tz.transition 2003, 3, :o3, 1048806000
-          tz.transition 2003, 10, :o2, 1065132000
-          tz.transition 2004, 4, :o3, 1081292400
-          tz.transition 2004, 9, :o2, 1095804000
-          tz.transition 2005, 4, :o3, 1112313600
-          tz.transition 2005, 10, :o2, 1128812400
-          tz.transition 2006, 3, :o3, 1143763200
-          tz.transition 2006, 9, :o2, 1159657200
-          tz.transition 2007, 3, :o3, 1175212800
-          tz.transition 2007, 9, :o2, 1189897200
-          tz.transition 2008, 3, :o3, 1206662400
-          tz.transition 2008, 10, :o2, 1223161200
-          tz.transition 2009, 3, :o3, 1238112000
-          tz.transition 2009, 9, :o2, 1254006000
-          tz.transition 2010, 3, :o3, 1269561600
-          tz.transition 2010, 9, :o2, 1284246000
-          tz.transition 2011, 4, :o3, 1301616000
-          tz.transition 2011, 10, :o2, 1317510000
-          tz.transition 2012, 3, :o3, 1333065600
-          tz.transition 2012, 9, :o2, 1348354800
-          tz.transition 2013, 3, :o3, 1364515200
-          tz.transition 2013, 9, :o2, 1378594800
-          tz.transition 2014, 3, :o3, 1395964800
-          tz.transition 2014, 9, :o2, 1411858800
-          tz.transition 2015, 3, :o3, 1427414400
-          tz.transition 2015, 9, :o2, 1442703600
-          tz.transition 2016, 4, :o3, 1459468800
-          tz.transition 2016, 10, :o2, 1475967600
-          tz.transition 2017, 3, :o3, 1490918400
-          tz.transition 2017, 9, :o2, 1506207600
-          tz.transition 2018, 3, :o3, 1522368000
-          tz.transition 2018, 9, :o2, 1537052400
-          tz.transition 2019, 3, :o3, 1553817600
-          tz.transition 2019, 10, :o2, 1570316400
-          tz.transition 2020, 3, :o3, 1585267200
-          tz.transition 2020, 9, :o2, 1601161200
-          tz.transition 2021, 3, :o3, 1616716800
-          tz.transition 2021, 9, :o2, 1631401200
-          tz.transition 2022, 4, :o3, 1648771200
-          tz.transition 2022, 10, :o2, 1664665200
-          tz.transition 2023, 3, :o3, 1680220800
-          tz.transition 2023, 9, :o2, 1695510000
-          tz.transition 2024, 3, :o3, 1711670400
-          tz.transition 2024, 10, :o2, 1728169200
-          tz.transition 2025, 3, :o3, 1743120000
-          tz.transition 2025, 9, :o2, 1759014000
-          tz.transition 2026, 3, :o3, 1774569600
-          tz.transition 2026, 9, :o2, 1789858800
-          tz.transition 2027, 3, :o3, 1806019200
-          tz.transition 2027, 10, :o2, 1823122800
-          tz.transition 2028, 3, :o3, 1838073600
-          tz.transition 2028, 9, :o2, 1853362800
-          tz.transition 2029, 3, :o3, 1869523200
-          tz.transition 2029, 9, :o2, 1884207600
-          tz.transition 2030, 3, :o3, 1900972800
-          tz.transition 2030, 10, :o2, 1917471600
-          tz.transition 2031, 3, :o3, 1932422400
-          tz.transition 2031, 9, :o2, 1947711600
-          tz.transition 2032, 3, :o3, 1963872000
-          tz.transition 2032, 9, :o2, 1978556400
-          tz.transition 2033, 4, :o3, 1995926400
-          tz.transition 2033, 10, :o2, 2011820400
-          tz.transition 2034, 3, :o3, 2027376000
-          tz.transition 2034, 9, :o2, 2042060400
-          tz.transition 2035, 3, :o3, 2058825600
-          tz.transition 2035, 10, :o2, 2075324400
-          tz.transition 2036, 3, :o3, 2090275200
-          tz.transition 2036, 9, :o2, 2106169200
-          tz.transition 2037, 3, :o3, 2121724800
-          tz.transition 2037, 9, :o2, 2136409200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kabul.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kabul.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kabul.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kabul.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kabul
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kabul' do |tz|
-          tz.offset :o0, 16608, 0, :LMT
-          tz.offset :o1, 14400, 0, :AFT
-          tz.offset :o2, 16200, 0, :AFT
-          
-          tz.transition 1889, 12, :o1, 2170231477, 900
-          tz.transition 1944, 12, :o2, 7294369, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kamchatka.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kamchatka.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kamchatka.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kamchatka.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kamchatka
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kamchatka' do |tz|
-          tz.offset :o0, 38076, 0, :LMT
-          tz.offset :o1, 39600, 0, :PETT
-          tz.offset :o2, 43200, 0, :PETT
-          tz.offset :o3, 43200, 3600, :PETST
-          tz.offset :o4, 39600, 3600, :PETST
-          
-          tz.transition 1922, 11, :o1, 17448250027, 7200
-          tz.transition 1930, 6, :o2, 58227553, 24
-          tz.transition 1981, 3, :o3, 354888000
-          tz.transition 1981, 9, :o2, 370695600
-          tz.transition 1982, 3, :o3, 386424000
-          tz.transition 1982, 9, :o2, 402231600
-          tz.transition 1983, 3, :o3, 417960000
-          tz.transition 1983, 9, :o2, 433767600
-          tz.transition 1984, 3, :o3, 449582400
-          tz.transition 1984, 9, :o2, 465314400
-          tz.transition 1985, 3, :o3, 481039200
-          tz.transition 1985, 9, :o2, 496764000
-          tz.transition 1986, 3, :o3, 512488800
-          tz.transition 1986, 9, :o2, 528213600
-          tz.transition 1987, 3, :o3, 543938400
-          tz.transition 1987, 9, :o2, 559663200
-          tz.transition 1988, 3, :o3, 575388000
-          tz.transition 1988, 9, :o2, 591112800
-          tz.transition 1989, 3, :o3, 606837600
-          tz.transition 1989, 9, :o2, 622562400
-          tz.transition 1990, 3, :o3, 638287200
-          tz.transition 1990, 9, :o2, 654616800
-          tz.transition 1991, 3, :o4, 670341600
-          tz.transition 1991, 9, :o1, 686070000
-          tz.transition 1992, 1, :o2, 695746800
-          tz.transition 1992, 3, :o3, 701780400
-          tz.transition 1992, 9, :o2, 717501600
-          tz.transition 1993, 3, :o3, 733240800
-          tz.transition 1993, 9, :o2, 748965600
-          tz.transition 1994, 3, :o3, 764690400
-          tz.transition 1994, 9, :o2, 780415200
-          tz.transition 1995, 3, :o3, 796140000
-          tz.transition 1995, 9, :o2, 811864800
-          tz.transition 1996, 3, :o3, 828194400
-          tz.transition 1996, 10, :o2, 846338400
-          tz.transition 1997, 3, :o3, 859644000
-          tz.transition 1997, 10, :o2, 877788000
-          tz.transition 1998, 3, :o3, 891093600
-          tz.transition 1998, 10, :o2, 909237600
-          tz.transition 1999, 3, :o3, 922543200
-          tz.transition 1999, 10, :o2, 941292000
-          tz.transition 2000, 3, :o3, 953992800
-          tz.transition 2000, 10, :o2, 972741600
-          tz.transition 2001, 3, :o3, 985442400
-          tz.transition 2001, 10, :o2, 1004191200
-          tz.transition 2002, 3, :o3, 1017496800
-          tz.transition 2002, 10, :o2, 1035640800
-          tz.transition 2003, 3, :o3, 1048946400
-          tz.transition 2003, 10, :o2, 1067090400
-          tz.transition 2004, 3, :o3, 1080396000
-          tz.transition 2004, 10, :o2, 1099144800
-          tz.transition 2005, 3, :o3, 1111845600
-          tz.transition 2005, 10, :o2, 1130594400
-          tz.transition 2006, 3, :o3, 1143295200
-          tz.transition 2006, 10, :o2, 1162044000
-          tz.transition 2007, 3, :o3, 1174744800
-          tz.transition 2007, 10, :o2, 1193493600
-          tz.transition 2008, 3, :o3, 1206799200
-          tz.transition 2008, 10, :o2, 1224943200
-          tz.transition 2009, 3, :o3, 1238248800
-          tz.transition 2009, 10, :o2, 1256392800
-          tz.transition 2010, 3, :o3, 1269698400
-          tz.transition 2010, 10, :o2, 1288447200
-          tz.transition 2011, 3, :o3, 1301148000
-          tz.transition 2011, 10, :o2, 1319896800
-          tz.transition 2012, 3, :o3, 1332597600
-          tz.transition 2012, 10, :o2, 1351346400
-          tz.transition 2013, 3, :o3, 1364652000
-          tz.transition 2013, 10, :o2, 1382796000
-          tz.transition 2014, 3, :o3, 1396101600
-          tz.transition 2014, 10, :o2, 1414245600
-          tz.transition 2015, 3, :o3, 1427551200
-          tz.transition 2015, 10, :o2, 1445695200
-          tz.transition 2016, 3, :o3, 1459000800
-          tz.transition 2016, 10, :o2, 1477749600
-          tz.transition 2017, 3, :o3, 1490450400
-          tz.transition 2017, 10, :o2, 1509199200
-          tz.transition 2018, 3, :o3, 1521900000
-          tz.transition 2018, 10, :o2, 1540648800
-          tz.transition 2019, 3, :o3, 1553954400
-          tz.transition 2019, 10, :o2, 1572098400
-          tz.transition 2020, 3, :o3, 1585404000
-          tz.transition 2020, 10, :o2, 1603548000
-          tz.transition 2021, 3, :o3, 1616853600
-          tz.transition 2021, 10, :o2, 1635602400
-          tz.transition 2022, 3, :o3, 1648303200
-          tz.transition 2022, 10, :o2, 1667052000
-          tz.transition 2023, 3, :o3, 1679752800
-          tz.transition 2023, 10, :o2, 1698501600
-          tz.transition 2024, 3, :o3, 1711807200
-          tz.transition 2024, 10, :o2, 1729951200
-          tz.transition 2025, 3, :o3, 1743256800
-          tz.transition 2025, 10, :o2, 1761400800
-          tz.transition 2026, 3, :o3, 1774706400
-          tz.transition 2026, 10, :o2, 1792850400
-          tz.transition 2027, 3, :o3, 1806156000
-          tz.transition 2027, 10, :o2, 1824904800
-          tz.transition 2028, 3, :o3, 1837605600
-          tz.transition 2028, 10, :o2, 1856354400
-          tz.transition 2029, 3, :o3, 1869055200
-          tz.transition 2029, 10, :o2, 1887804000
-          tz.transition 2030, 3, :o3, 1901109600
-          tz.transition 2030, 10, :o2, 1919253600
-          tz.transition 2031, 3, :o3, 1932559200
-          tz.transition 2031, 10, :o2, 1950703200
-          tz.transition 2032, 3, :o3, 1964008800
-          tz.transition 2032, 10, :o2, 1982757600
-          tz.transition 2033, 3, :o3, 1995458400
-          tz.transition 2033, 10, :o2, 2014207200
-          tz.transition 2034, 3, :o3, 2026908000
-          tz.transition 2034, 10, :o2, 2045656800
-          tz.transition 2035, 3, :o3, 2058357600
-          tz.transition 2035, 10, :o2, 2077106400
-          tz.transition 2036, 3, :o3, 2090412000
-          tz.transition 2036, 10, :o2, 2108556000
-          tz.transition 2037, 3, :o3, 2121861600
-          tz.transition 2037, 10, :o2, 2140005600
-          tz.transition 2038, 3, :o3, 29586121, 12
-          tz.transition 2038, 10, :o2, 29588725, 12
-          tz.transition 2039, 3, :o3, 29590489, 12
-          tz.transition 2039, 10, :o2, 29593093, 12
-          tz.transition 2040, 3, :o3, 29594857, 12
-          tz.transition 2040, 10, :o2, 29597461, 12
-          tz.transition 2041, 3, :o3, 29599309, 12
-          tz.transition 2041, 10, :o2, 29601829, 12
-          tz.transition 2042, 3, :o3, 29603677, 12
-          tz.transition 2042, 10, :o2, 29606197, 12
-          tz.transition 2043, 3, :o3, 29608045, 12
-          tz.transition 2043, 10, :o2, 29610565, 12
-          tz.transition 2044, 3, :o3, 29612413, 12
-          tz.transition 2044, 10, :o2, 29615017, 12
-          tz.transition 2045, 3, :o3, 29616781, 12
-          tz.transition 2045, 10, :o2, 29619385, 12
-          tz.transition 2046, 3, :o3, 29621149, 12
-          tz.transition 2046, 10, :o2, 29623753, 12
-          tz.transition 2047, 3, :o3, 29625601, 12
-          tz.transition 2047, 10, :o2, 29628121, 12
-          tz.transition 2048, 3, :o3, 29629969, 12
-          tz.transition 2048, 10, :o2, 29632489, 12
-          tz.transition 2049, 3, :o3, 29634337, 12
-          tz.transition 2049, 10, :o2, 29636941, 12
-          tz.transition 2050, 3, :o3, 29638705, 12
-          tz.transition 2050, 10, :o2, 29641309, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Karachi.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Karachi.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Karachi.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Karachi.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,28 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Karachi
-        include TimezoneDefinition
-        
-        timezone 'Asia/Karachi' do |tz|
-          tz.offset :o0, 16092, 0, :LMT
-          tz.offset :o1, 19800, 0, :IST
-          tz.offset :o2, 19800, 3600, :IST
-          tz.offset :o3, 18000, 0, :KART
-          tz.offset :o4, 18000, 0, :PKT
-          tz.offset :o5, 18000, 3600, :PKST
-          
-          tz.transition 1906, 12, :o1, 1934061051, 800
-          tz.transition 1942, 8, :o2, 116668957, 48
-          tz.transition 1945, 10, :o1, 116723675, 48
-          tz.transition 1951, 9, :o3, 116828125, 48
-          tz.transition 1971, 3, :o4, 38775600
-          tz.transition 2002, 4, :o5, 1018119660
-          tz.transition 2002, 10, :o4, 1033840860
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kashgar.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kashgar.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kashgar.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kashgar.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kashgar
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kashgar' do |tz|
-          tz.offset :o0, 18236, 0, :LMT
-          tz.offset :o1, 19800, 0, :KAST
-          tz.offset :o2, 18000, 0, :KAST
-          tz.offset :o3, 28800, 0, :CST
-          tz.offset :o4, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 52385319841, 21600
-          tz.transition 1939, 12, :o2, 116622205, 48
-          tz.transition 1980, 4, :o3, 325969200
-          tz.transition 1986, 5, :o4, 515520000
-          tz.transition 1986, 9, :o3, 527007600
-          tz.transition 1987, 4, :o4, 545155200
-          tz.transition 1987, 9, :o3, 558457200
-          tz.transition 1988, 4, :o4, 576604800
-          tz.transition 1988, 9, :o3, 589906800
-          tz.transition 1989, 4, :o4, 608659200
-          tz.transition 1989, 9, :o3, 621961200
-          tz.transition 1990, 4, :o4, 640108800
-          tz.transition 1990, 9, :o3, 653410800
-          tz.transition 1991, 4, :o4, 671558400
-          tz.transition 1991, 9, :o3, 684860400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Katmandu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Katmandu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Katmandu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Katmandu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Katmandu
-        include TimezoneDefinition
-        
-        timezone 'Asia/Katmandu' do |tz|
-          tz.offset :o0, 20476, 0, :LMT
-          tz.offset :o1, 19800, 0, :IST
-          tz.offset :o2, 20700, 0, :NPT
-          
-          tz.transition 1919, 12, :o1, 52322204081, 21600
-          tz.transition 1985, 12, :o2, 504901800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Krasnoyarsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Krasnoyarsk' do |tz|
-          tz.offset :o0, 22280, 0, :LMT
-          tz.offset :o1, 21600, 0, :KRAT
-          tz.offset :o2, 25200, 0, :KRAT
-          tz.offset :o3, 25200, 3600, :KRAST
-          tz.offset :o4, 21600, 3600, :KRAST
-          
-          tz.transition 1920, 1, :o1, 5232231163, 2160
-          tz.transition 1930, 6, :o2, 9704593, 4
-          tz.transition 1981, 3, :o3, 354906000
-          tz.transition 1981, 9, :o2, 370713600
-          tz.transition 1982, 3, :o3, 386442000
-          tz.transition 1982, 9, :o2, 402249600
-          tz.transition 1983, 3, :o3, 417978000
-          tz.transition 1983, 9, :o2, 433785600
-          tz.transition 1984, 3, :o3, 449600400
-          tz.transition 1984, 9, :o2, 465332400
-          tz.transition 1985, 3, :o3, 481057200
-          tz.transition 1985, 9, :o2, 496782000
-          tz.transition 1986, 3, :o3, 512506800
-          tz.transition 1986, 9, :o2, 528231600
-          tz.transition 1987, 3, :o3, 543956400
-          tz.transition 1987, 9, :o2, 559681200
-          tz.transition 1988, 3, :o3, 575406000
-          tz.transition 1988, 9, :o2, 591130800
-          tz.transition 1989, 3, :o3, 606855600
-          tz.transition 1989, 9, :o2, 622580400
-          tz.transition 1990, 3, :o3, 638305200
-          tz.transition 1990, 9, :o2, 654634800
-          tz.transition 1991, 3, :o4, 670359600
-          tz.transition 1991, 9, :o1, 686088000
-          tz.transition 1992, 1, :o2, 695764800
-          tz.transition 1992, 3, :o3, 701798400
-          tz.transition 1992, 9, :o2, 717519600
-          tz.transition 1993, 3, :o3, 733258800
-          tz.transition 1993, 9, :o2, 748983600
-          tz.transition 1994, 3, :o3, 764708400
-          tz.transition 1994, 9, :o2, 780433200
-          tz.transition 1995, 3, :o3, 796158000
-          tz.transition 1995, 9, :o2, 811882800
-          tz.transition 1996, 3, :o3, 828212400
-          tz.transition 1996, 10, :o2, 846356400
-          tz.transition 1997, 3, :o3, 859662000
-          tz.transition 1997, 10, :o2, 877806000
-          tz.transition 1998, 3, :o3, 891111600
-          tz.transition 1998, 10, :o2, 909255600
-          tz.transition 1999, 3, :o3, 922561200
-          tz.transition 1999, 10, :o2, 941310000
-          tz.transition 2000, 3, :o3, 954010800
-          tz.transition 2000, 10, :o2, 972759600
-          tz.transition 2001, 3, :o3, 985460400
-          tz.transition 2001, 10, :o2, 1004209200
-          tz.transition 2002, 3, :o3, 1017514800
-          tz.transition 2002, 10, :o2, 1035658800
-          tz.transition 2003, 3, :o3, 1048964400
-          tz.transition 2003, 10, :o2, 1067108400
-          tz.transition 2004, 3, :o3, 1080414000
-          tz.transition 2004, 10, :o2, 1099162800
-          tz.transition 2005, 3, :o3, 1111863600
-          tz.transition 2005, 10, :o2, 1130612400
-          tz.transition 2006, 3, :o3, 1143313200
-          tz.transition 2006, 10, :o2, 1162062000
-          tz.transition 2007, 3, :o3, 1174762800
-          tz.transition 2007, 10, :o2, 1193511600
-          tz.transition 2008, 3, :o3, 1206817200
-          tz.transition 2008, 10, :o2, 1224961200
-          tz.transition 2009, 3, :o3, 1238266800
-          tz.transition 2009, 10, :o2, 1256410800
-          tz.transition 2010, 3, :o3, 1269716400
-          tz.transition 2010, 10, :o2, 1288465200
-          tz.transition 2011, 3, :o3, 1301166000
-          tz.transition 2011, 10, :o2, 1319914800
-          tz.transition 2012, 3, :o3, 1332615600
-          tz.transition 2012, 10, :o2, 1351364400
-          tz.transition 2013, 3, :o3, 1364670000
-          tz.transition 2013, 10, :o2, 1382814000
-          tz.transition 2014, 3, :o3, 1396119600
-          tz.transition 2014, 10, :o2, 1414263600
-          tz.transition 2015, 3, :o3, 1427569200
-          tz.transition 2015, 10, :o2, 1445713200
-          tz.transition 2016, 3, :o3, 1459018800
-          tz.transition 2016, 10, :o2, 1477767600
-          tz.transition 2017, 3, :o3, 1490468400
-          tz.transition 2017, 10, :o2, 1509217200
-          tz.transition 2018, 3, :o3, 1521918000
-          tz.transition 2018, 10, :o2, 1540666800
-          tz.transition 2019, 3, :o3, 1553972400
-          tz.transition 2019, 10, :o2, 1572116400
-          tz.transition 2020, 3, :o3, 1585422000
-          tz.transition 2020, 10, :o2, 1603566000
-          tz.transition 2021, 3, :o3, 1616871600
-          tz.transition 2021, 10, :o2, 1635620400
-          tz.transition 2022, 3, :o3, 1648321200
-          tz.transition 2022, 10, :o2, 1667070000
-          tz.transition 2023, 3, :o3, 1679770800
-          tz.transition 2023, 10, :o2, 1698519600
-          tz.transition 2024, 3, :o3, 1711825200
-          tz.transition 2024, 10, :o2, 1729969200
-          tz.transition 2025, 3, :o3, 1743274800
-          tz.transition 2025, 10, :o2, 1761418800
-          tz.transition 2026, 3, :o3, 1774724400
-          tz.transition 2026, 10, :o2, 1792868400
-          tz.transition 2027, 3, :o3, 1806174000
-          tz.transition 2027, 10, :o2, 1824922800
-          tz.transition 2028, 3, :o3, 1837623600
-          tz.transition 2028, 10, :o2, 1856372400
-          tz.transition 2029, 3, :o3, 1869073200
-          tz.transition 2029, 10, :o2, 1887822000
-          tz.transition 2030, 3, :o3, 1901127600
-          tz.transition 2030, 10, :o2, 1919271600
-          tz.transition 2031, 3, :o3, 1932577200
-          tz.transition 2031, 10, :o2, 1950721200
-          tz.transition 2032, 3, :o3, 1964026800
-          tz.transition 2032, 10, :o2, 1982775600
-          tz.transition 2033, 3, :o3, 1995476400
-          tz.transition 2033, 10, :o2, 2014225200
-          tz.transition 2034, 3, :o3, 2026926000
-          tz.transition 2034, 10, :o2, 2045674800
-          tz.transition 2035, 3, :o3, 2058375600
-          tz.transition 2035, 10, :o2, 2077124400
-          tz.transition 2036, 3, :o3, 2090430000
-          tz.transition 2036, 10, :o2, 2108574000
-          tz.transition 2037, 3, :o3, 2121879600
-          tz.transition 2037, 10, :o2, 2140023600
-          tz.transition 2038, 3, :o3, 59172247, 24
-          tz.transition 2038, 10, :o2, 59177455, 24
-          tz.transition 2039, 3, :o3, 59180983, 24
-          tz.transition 2039, 10, :o2, 59186191, 24
-          tz.transition 2040, 3, :o3, 59189719, 24
-          tz.transition 2040, 10, :o2, 59194927, 24
-          tz.transition 2041, 3, :o3, 59198623, 24
-          tz.transition 2041, 10, :o2, 59203663, 24
-          tz.transition 2042, 3, :o3, 59207359, 24
-          tz.transition 2042, 10, :o2, 59212399, 24
-          tz.transition 2043, 3, :o3, 59216095, 24
-          tz.transition 2043, 10, :o2, 59221135, 24
-          tz.transition 2044, 3, :o3, 59224831, 24
-          tz.transition 2044, 10, :o2, 59230039, 24
-          tz.transition 2045, 3, :o3, 59233567, 24
-          tz.transition 2045, 10, :o2, 59238775, 24
-          tz.transition 2046, 3, :o3, 59242303, 24
-          tz.transition 2046, 10, :o2, 59247511, 24
-          tz.transition 2047, 3, :o3, 59251207, 24
-          tz.transition 2047, 10, :o2, 59256247, 24
-          tz.transition 2048, 3, :o3, 59259943, 24
-          tz.transition 2048, 10, :o2, 59264983, 24
-          tz.transition 2049, 3, :o3, 59268679, 24
-          tz.transition 2049, 10, :o2, 59273887, 24
-          tz.transition 2050, 3, :o3, 59277415, 24
-          tz.transition 2050, 10, :o2, 59282623, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,31 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kuala_Lumpur
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kuala_Lumpur' do |tz|
-          tz.offset :o0, 24406, 0, :LMT
-          tz.offset :o1, 24925, 0, :SMT
-          tz.offset :o2, 25200, 0, :MALT
-          tz.offset :o3, 25200, 1200, :MALST
-          tz.offset :o4, 26400, 0, :MALT
-          tz.offset :o5, 27000, 0, :MALT
-          tz.offset :o6, 32400, 0, :JST
-          tz.offset :o7, 28800, 0, :MYT
-          
-          tz.transition 1900, 12, :o1, 104344641397, 43200
-          tz.transition 1905, 5, :o2, 8353142363, 3456
-          tz.transition 1932, 12, :o3, 58249757, 24
-          tz.transition 1935, 12, :o4, 87414055, 36
-          tz.transition 1941, 8, :o5, 87488575, 36
-          tz.transition 1942, 2, :o6, 38886499, 16
-          tz.transition 1945, 9, :o5, 19453681, 8
-          tz.transition 1981, 12, :o7, 378664200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuching.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuching.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuching.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuching.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,40 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kuching
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kuching' do |tz|
-          tz.offset :o0, 26480, 0, :LMT
-          tz.offset :o1, 27000, 0, :BORT
-          tz.offset :o2, 28800, 0, :BORT
-          tz.offset :o3, 28800, 1200, :BORTST
-          tz.offset :o4, 32400, 0, :JST
-          tz.offset :o5, 28800, 0, :MYT
-          
-          tz.transition 1926, 2, :o1, 2618541209, 1080
-          tz.transition 1932, 12, :o2, 38833171, 16
-          tz.transition 1935, 9, :o3, 14568355, 6
-          tz.transition 1935, 12, :o2, 174826811, 72
-          tz.transition 1936, 9, :o3, 14570551, 6
-          tz.transition 1936, 12, :o2, 174853163, 72
-          tz.transition 1937, 9, :o3, 14572741, 6
-          tz.transition 1937, 12, :o2, 174879443, 72
-          tz.transition 1938, 9, :o3, 14574931, 6
-          tz.transition 1938, 12, :o2, 174905723, 72
-          tz.transition 1939, 9, :o3, 14577121, 6
-          tz.transition 1939, 12, :o2, 174932003, 72
-          tz.transition 1940, 9, :o3, 14579317, 6
-          tz.transition 1940, 12, :o2, 174958355, 72
-          tz.transition 1941, 9, :o3, 14581507, 6
-          tz.transition 1941, 12, :o2, 174984635, 72
-          tz.transition 1942, 2, :o4, 14582437, 6
-          tz.transition 1945, 9, :o2, 19453681, 8
-          tz.transition 1981, 12, :o5, 378662400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuwait.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuwait.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuwait.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Kuwait.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kuwait
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kuwait' do |tz|
-          tz.offset :o0, 11516, 0, :LMT
-          tz.offset :o1, 10800, 0, :AST
-          
-          tz.transition 1949, 12, :o1, 52558899121, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macao.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macao.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macao.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macao.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Macao
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Macao', 'Asia/Macau'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macau.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macau.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macau.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Macau.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,61 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Macau
-        include TimezoneDefinition
-        
-        timezone 'Asia/Macau' do |tz|
-          tz.offset :o0, 27260, 0, :LMT
-          tz.offset :o1, 28800, 0, :MOT
-          tz.offset :o2, 28800, 3600, :MOST
-          tz.offset :o3, 28800, 0, :CST
-          
-          tz.transition 1911, 12, :o1, 10451817437, 4320
-          tz.transition 1961, 3, :o2, 38998037, 16
-          tz.transition 1961, 11, :o1, 117005197, 48
-          tz.transition 1962, 3, :o2, 39003861, 16
-          tz.transition 1962, 11, :o1, 117022669, 48
-          tz.transition 1963, 3, :o2, 14628631, 6
-          tz.transition 1963, 11, :o1, 117040141, 48
-          tz.transition 1964, 3, :o2, 39015621, 16
-          tz.transition 1964, 10, :o1, 117057613, 48
-          tz.transition 1965, 3, :o2, 14633041, 6
-          tz.transition 1965, 10, :o1, 19512513, 8
-          tz.transition 1966, 4, :o2, 39027717, 16
-          tz.transition 1966, 10, :o1, 117091885, 48
-          tz.transition 1967, 4, :o2, 39033541, 16
-          tz.transition 1967, 10, :o1, 117109693, 48
-          tz.transition 1968, 4, :o2, 39039477, 16
-          tz.transition 1968, 10, :o1, 117127165, 48
-          tz.transition 1969, 4, :o2, 39045301, 16
-          tz.transition 1969, 10, :o1, 117144637, 48
-          tz.transition 1970, 4, :o2, 9315000
-          tz.transition 1970, 10, :o1, 25036200
-          tz.transition 1971, 4, :o2, 40764600
-          tz.transition 1971, 10, :o1, 56485800
-          tz.transition 1972, 4, :o2, 72201600
-          tz.transition 1972, 10, :o1, 87922800
-          tz.transition 1973, 4, :o2, 103651200
-          tz.transition 1973, 10, :o1, 119977200
-          tz.transition 1974, 4, :o2, 135705600
-          tz.transition 1974, 10, :o1, 151439400
-          tz.transition 1975, 4, :o2, 167167800
-          tz.transition 1975, 10, :o1, 182889000
-          tz.transition 1976, 4, :o2, 198617400
-          tz.transition 1976, 10, :o1, 214338600
-          tz.transition 1977, 4, :o2, 230067000
-          tz.transition 1977, 10, :o1, 245788200
-          tz.transition 1978, 4, :o2, 261504000
-          tz.transition 1978, 10, :o1, 277225200
-          tz.transition 1979, 4, :o2, 292953600
-          tz.transition 1979, 10, :o1, 309279600
-          tz.transition 1980, 4, :o2, 325008000
-          tz.transition 1980, 10, :o1, 340729200
-          tz.transition 1999, 12, :o3, 945619200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Magadan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Magadan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Magadan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Magadan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Magadan
-        include TimezoneDefinition
-        
-        timezone 'Asia/Magadan' do |tz|
-          tz.offset :o0, 36192, 0, :LMT
-          tz.offset :o1, 36000, 0, :MAGT
-          tz.offset :o2, 39600, 0, :MAGT
-          tz.offset :o3, 39600, 3600, :MAGST
-          tz.offset :o4, 36000, 3600, :MAGST
-          
-          tz.transition 1924, 5, :o1, 2181516373, 900
-          tz.transition 1930, 6, :o2, 29113777, 12
-          tz.transition 1981, 3, :o3, 354891600
-          tz.transition 1981, 9, :o2, 370699200
-          tz.transition 1982, 3, :o3, 386427600
-          tz.transition 1982, 9, :o2, 402235200
-          tz.transition 1983, 3, :o3, 417963600
-          tz.transition 1983, 9, :o2, 433771200
-          tz.transition 1984, 3, :o3, 449586000
-          tz.transition 1984, 9, :o2, 465318000
-          tz.transition 1985, 3, :o3, 481042800
-          tz.transition 1985, 9, :o2, 496767600
-          tz.transition 1986, 3, :o3, 512492400
-          tz.transition 1986, 9, :o2, 528217200
-          tz.transition 1987, 3, :o3, 543942000
-          tz.transition 1987, 9, :o2, 559666800
-          tz.transition 1988, 3, :o3, 575391600
-          tz.transition 1988, 9, :o2, 591116400
-          tz.transition 1989, 3, :o3, 606841200
-          tz.transition 1989, 9, :o2, 622566000
-          tz.transition 1990, 3, :o3, 638290800
-          tz.transition 1990, 9, :o2, 654620400
-          tz.transition 1991, 3, :o4, 670345200
-          tz.transition 1991, 9, :o1, 686073600
-          tz.transition 1992, 1, :o2, 695750400
-          tz.transition 1992, 3, :o3, 701784000
-          tz.transition 1992, 9, :o2, 717505200
-          tz.transition 1993, 3, :o3, 733244400
-          tz.transition 1993, 9, :o2, 748969200
-          tz.transition 1994, 3, :o3, 764694000
-          tz.transition 1994, 9, :o2, 780418800
-          tz.transition 1995, 3, :o3, 796143600
-          tz.transition 1995, 9, :o2, 811868400
-          tz.transition 1996, 3, :o3, 828198000
-          tz.transition 1996, 10, :o2, 846342000
-          tz.transition 1997, 3, :o3, 859647600
-          tz.transition 1997, 10, :o2, 877791600
-          tz.transition 1998, 3, :o3, 891097200
-          tz.transition 1998, 10, :o2, 909241200
-          tz.transition 1999, 3, :o3, 922546800
-          tz.transition 1999, 10, :o2, 941295600
-          tz.transition 2000, 3, :o3, 953996400
-          tz.transition 2000, 10, :o2, 972745200
-          tz.transition 2001, 3, :o3, 985446000
-          tz.transition 2001, 10, :o2, 1004194800
-          tz.transition 2002, 3, :o3, 1017500400
-          tz.transition 2002, 10, :o2, 1035644400
-          tz.transition 2003, 3, :o3, 1048950000
-          tz.transition 2003, 10, :o2, 1067094000
-          tz.transition 2004, 3, :o3, 1080399600
-          tz.transition 2004, 10, :o2, 1099148400
-          tz.transition 2005, 3, :o3, 1111849200
-          tz.transition 2005, 10, :o2, 1130598000
-          tz.transition 2006, 3, :o3, 1143298800
-          tz.transition 2006, 10, :o2, 1162047600
-          tz.transition 2007, 3, :o3, 1174748400
-          tz.transition 2007, 10, :o2, 1193497200
-          tz.transition 2008, 3, :o3, 1206802800
-          tz.transition 2008, 10, :o2, 1224946800
-          tz.transition 2009, 3, :o3, 1238252400
-          tz.transition 2009, 10, :o2, 1256396400
-          tz.transition 2010, 3, :o3, 1269702000
-          tz.transition 2010, 10, :o2, 1288450800
-          tz.transition 2011, 3, :o3, 1301151600
-          tz.transition 2011, 10, :o2, 1319900400
-          tz.transition 2012, 3, :o3, 1332601200
-          tz.transition 2012, 10, :o2, 1351350000
-          tz.transition 2013, 3, :o3, 1364655600
-          tz.transition 2013, 10, :o2, 1382799600
-          tz.transition 2014, 3, :o3, 1396105200
-          tz.transition 2014, 10, :o2, 1414249200
-          tz.transition 2015, 3, :o3, 1427554800
-          tz.transition 2015, 10, :o2, 1445698800
-          tz.transition 2016, 3, :o3, 1459004400
-          tz.transition 2016, 10, :o2, 1477753200
-          tz.transition 2017, 3, :o3, 1490454000
-          tz.transition 2017, 10, :o2, 1509202800
-          tz.transition 2018, 3, :o3, 1521903600
-          tz.transition 2018, 10, :o2, 1540652400
-          tz.transition 2019, 3, :o3, 1553958000
-          tz.transition 2019, 10, :o2, 1572102000
-          tz.transition 2020, 3, :o3, 1585407600
-          tz.transition 2020, 10, :o2, 1603551600
-          tz.transition 2021, 3, :o3, 1616857200
-          tz.transition 2021, 10, :o2, 1635606000
-          tz.transition 2022, 3, :o3, 1648306800
-          tz.transition 2022, 10, :o2, 1667055600
-          tz.transition 2023, 3, :o3, 1679756400
-          tz.transition 2023, 10, :o2, 1698505200
-          tz.transition 2024, 3, :o3, 1711810800
-          tz.transition 2024, 10, :o2, 1729954800
-          tz.transition 2025, 3, :o3, 1743260400
-          tz.transition 2025, 10, :o2, 1761404400
-          tz.transition 2026, 3, :o3, 1774710000
-          tz.transition 2026, 10, :o2, 1792854000
-          tz.transition 2027, 3, :o3, 1806159600
-          tz.transition 2027, 10, :o2, 1824908400
-          tz.transition 2028, 3, :o3, 1837609200
-          tz.transition 2028, 10, :o2, 1856358000
-          tz.transition 2029, 3, :o3, 1869058800
-          tz.transition 2029, 10, :o2, 1887807600
-          tz.transition 2030, 3, :o3, 1901113200
-          tz.transition 2030, 10, :o2, 1919257200
-          tz.transition 2031, 3, :o3, 1932562800
-          tz.transition 2031, 10, :o2, 1950706800
-          tz.transition 2032, 3, :o3, 1964012400
-          tz.transition 2032, 10, :o2, 1982761200
-          tz.transition 2033, 3, :o3, 1995462000
-          tz.transition 2033, 10, :o2, 2014210800
-          tz.transition 2034, 3, :o3, 2026911600
-          tz.transition 2034, 10, :o2, 2045660400
-          tz.transition 2035, 3, :o3, 2058361200
-          tz.transition 2035, 10, :o2, 2077110000
-          tz.transition 2036, 3, :o3, 2090415600
-          tz.transition 2036, 10, :o2, 2108559600
-          tz.transition 2037, 3, :o3, 2121865200
-          tz.transition 2037, 10, :o2, 2140009200
-          tz.transition 2038, 3, :o3, 19724081, 8
-          tz.transition 2038, 10, :o2, 19725817, 8
-          tz.transition 2039, 3, :o3, 19726993, 8
-          tz.transition 2039, 10, :o2, 19728729, 8
-          tz.transition 2040, 3, :o3, 19729905, 8
-          tz.transition 2040, 10, :o2, 19731641, 8
-          tz.transition 2041, 3, :o3, 19732873, 8
-          tz.transition 2041, 10, :o2, 19734553, 8
-          tz.transition 2042, 3, :o3, 19735785, 8
-          tz.transition 2042, 10, :o2, 19737465, 8
-          tz.transition 2043, 3, :o3, 19738697, 8
-          tz.transition 2043, 10, :o2, 19740377, 8
-          tz.transition 2044, 3, :o3, 19741609, 8
-          tz.transition 2044, 10, :o2, 19743345, 8
-          tz.transition 2045, 3, :o3, 19744521, 8
-          tz.transition 2045, 10, :o2, 19746257, 8
-          tz.transition 2046, 3, :o3, 19747433, 8
-          tz.transition 2046, 10, :o2, 19749169, 8
-          tz.transition 2047, 3, :o3, 19750401, 8
-          tz.transition 2047, 10, :o2, 19752081, 8
-          tz.transition 2048, 3, :o3, 19753313, 8
-          tz.transition 2048, 10, :o2, 19754993, 8
-          tz.transition 2049, 3, :o3, 19756225, 8
-          tz.transition 2049, 10, :o2, 19757961, 8
-          tz.transition 2050, 3, :o3, 19759137, 8
-          tz.transition 2050, 10, :o2, 19760873, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Makassar.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Makassar.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Makassar.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Makassar.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Makassar
-        include TimezoneDefinition
-        
-        timezone 'Asia/Makassar' do |tz|
-          tz.offset :o0, 28656, 0, :LMT
-          tz.offset :o1, 28656, 0, :MMT
-          tz.offset :o2, 28800, 0, :CIT
-          tz.offset :o3, 32400, 0, :JST
-          
-          tz.transition 1919, 12, :o1, 1453394501, 600
-          tz.transition 1932, 10, :o2, 1456207301, 600
-          tz.transition 1942, 2, :o3, 14582395, 6
-          tz.transition 1945, 7, :o2, 19453345, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Manila.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Manila.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Manila.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Manila.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Manila
-        include TimezoneDefinition
-        
-        timezone 'Asia/Manila' do |tz|
-          tz.offset :o0, -57360, 0, :LMT
-          tz.offset :o1, 29040, 0, :LMT
-          tz.offset :o2, 28800, 0, :PHT
-          tz.offset :o3, 28800, 3600, :PHST
-          tz.offset :o4, 32400, 0, :JST
-          
-          tz.transition 1844, 12, :o1, 862175579, 360
-          tz.transition 1899, 5, :o2, 869322659, 360
-          tz.transition 1936, 10, :o3, 14570839, 6
-          tz.transition 1937, 1, :o2, 19428521, 8
-          tz.transition 1942, 4, :o4, 14582881, 6
-          tz.transition 1944, 10, :o2, 19451161, 8
-          tz.transition 1954, 4, :o3, 14609065, 6
-          tz.transition 1954, 6, :o2, 19479393, 8
-          tz.transition 1978, 3, :o3, 259344000
-          tz.transition 1978, 9, :o2, 275151600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Muscat.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Muscat.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Muscat.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Muscat.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Muscat
-        include TimezoneDefinition
-        
-        timezone 'Asia/Muscat' do |tz|
-          tz.offset :o0, 14060, 0, :LMT
-          tz.offset :o1, 14400, 0, :GST
-          
-          tz.transition 1919, 12, :o1, 10464441137, 4320
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Nicosia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Nicosia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Nicosia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Nicosia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,171 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Nicosia
-        include TimezoneDefinition
-        
-        timezone 'Asia/Nicosia' do |tz|
-          tz.offset :o0, 8008, 0, :LMT
-          tz.offset :o1, 7200, 0, :EET
-          tz.offset :o2, 7200, 3600, :EEST
-          
-          tz.transition 1921, 11, :o1, 26168479999, 10800
-          tz.transition 1975, 4, :o2, 166572000
-          tz.transition 1975, 10, :o1, 182293200
-          tz.transition 1976, 5, :o2, 200959200
-          tz.transition 1976, 10, :o1, 213829200
-          tz.transition 1977, 4, :o2, 228866400
-          tz.transition 1977, 9, :o1, 243982800
-          tz.transition 1978, 4, :o2, 260316000
-          tz.transition 1978, 10, :o1, 276123600
-          tz.transition 1979, 3, :o2, 291765600
-          tz.transition 1979, 9, :o1, 307486800
-          tz.transition 1980, 4, :o2, 323820000
-          tz.transition 1980, 9, :o1, 338936400
-          tz.transition 1981, 3, :o2, 354664800
-          tz.transition 1981, 9, :o1, 370386000
-          tz.transition 1982, 3, :o2, 386114400
-          tz.transition 1982, 9, :o1, 401835600
-          tz.transition 1983, 3, :o2, 417564000
-          tz.transition 1983, 9, :o1, 433285200
-          tz.transition 1984, 3, :o2, 449013600
-          tz.transition 1984, 9, :o1, 465339600
-          tz.transition 1985, 3, :o2, 481068000
-          tz.transition 1985, 9, :o1, 496789200
-          tz.transition 1986, 3, :o2, 512517600
-          tz.transition 1986, 9, :o1, 528238800
-          tz.transition 1987, 3, :o2, 543967200
-          tz.transition 1987, 9, :o1, 559688400
-          tz.transition 1988, 3, :o2, 575416800
-          tz.transition 1988, 9, :o1, 591138000
-          tz.transition 1989, 3, :o2, 606866400
-          tz.transition 1989, 9, :o1, 622587600
-          tz.transition 1990, 3, :o2, 638316000
-          tz.transition 1990, 9, :o1, 654642000
-          tz.transition 1991, 3, :o2, 670370400
-          tz.transition 1991, 9, :o1, 686091600
-          tz.transition 1992, 3, :o2, 701820000
-          tz.transition 1992, 9, :o1, 717541200
-          tz.transition 1993, 3, :o2, 733269600
-          tz.transition 1993, 9, :o1, 748990800
-          tz.transition 1994, 3, :o2, 764719200
-          tz.transition 1994, 9, :o1, 780440400
-          tz.transition 1995, 3, :o2, 796168800
-          tz.transition 1995, 9, :o1, 811890000
-          tz.transition 1996, 3, :o2, 828223200
-          tz.transition 1996, 9, :o1, 843944400
-          tz.transition 1997, 3, :o2, 859672800
-          tz.transition 1997, 9, :o1, 875394000
-          tz.transition 1998, 3, :o2, 891122400
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Novosibirsk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Novosibirsk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Novosibirsk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Novosibirsk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,164 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Novosibirsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Novosibirsk' do |tz|
-          tz.offset :o0, 19900, 0, :LMT
-          tz.offset :o1, 21600, 0, :NOVT
-          tz.offset :o2, 25200, 0, :NOVT
-          tz.offset :o3, 25200, 3600, :NOVST
-          tz.offset :o4, 21600, 3600, :NOVST
-          
-          tz.transition 1919, 12, :o1, 2092872833, 864
-          tz.transition 1930, 6, :o2, 9704593, 4
-          tz.transition 1981, 3, :o3, 354906000
-          tz.transition 1981, 9, :o2, 370713600
-          tz.transition 1982, 3, :o3, 386442000
-          tz.transition 1982, 9, :o2, 402249600
-          tz.transition 1983, 3, :o3, 417978000
-          tz.transition 1983, 9, :o2, 433785600
-          tz.transition 1984, 3, :o3, 449600400
-          tz.transition 1984, 9, :o2, 465332400
-          tz.transition 1985, 3, :o3, 481057200
-          tz.transition 1985, 9, :o2, 496782000
-          tz.transition 1986, 3, :o3, 512506800
-          tz.transition 1986, 9, :o2, 528231600
-          tz.transition 1987, 3, :o3, 543956400
-          tz.transition 1987, 9, :o2, 559681200
-          tz.transition 1988, 3, :o3, 575406000
-          tz.transition 1988, 9, :o2, 591130800
-          tz.transition 1989, 3, :o3, 606855600
-          tz.transition 1989, 9, :o2, 622580400
-          tz.transition 1990, 3, :o3, 638305200
-          tz.transition 1990, 9, :o2, 654634800
-          tz.transition 1991, 3, :o4, 670359600
-          tz.transition 1991, 9, :o1, 686088000
-          tz.transition 1992, 1, :o2, 695764800
-          tz.transition 1992, 3, :o3, 701798400
-          tz.transition 1992, 9, :o2, 717519600
-          tz.transition 1993, 3, :o3, 733258800
-          tz.transition 1993, 5, :o4, 738086400
-          tz.transition 1993, 9, :o1, 748987200
-          tz.transition 1994, 3, :o4, 764712000
-          tz.transition 1994, 9, :o1, 780436800
-          tz.transition 1995, 3, :o4, 796161600
-          tz.transition 1995, 9, :o1, 811886400
-          tz.transition 1996, 3, :o4, 828216000
-          tz.transition 1996, 10, :o1, 846360000
-          tz.transition 1997, 3, :o4, 859665600
-          tz.transition 1997, 10, :o1, 877809600
-          tz.transition 1998, 3, :o4, 891115200
-          tz.transition 1998, 10, :o1, 909259200
-          tz.transition 1999, 3, :o4, 922564800
-          tz.transition 1999, 10, :o1, 941313600
-          tz.transition 2000, 3, :o4, 954014400
-          tz.transition 2000, 10, :o1, 972763200
-          tz.transition 2001, 3, :o4, 985464000
-          tz.transition 2001, 10, :o1, 1004212800
-          tz.transition 2002, 3, :o4, 1017518400
-          tz.transition 2002, 10, :o1, 1035662400
-          tz.transition 2003, 3, :o4, 1048968000
-          tz.transition 2003, 10, :o1, 1067112000
-          tz.transition 2004, 3, :o4, 1080417600
-          tz.transition 2004, 10, :o1, 1099166400
-          tz.transition 2005, 3, :o4, 1111867200
-          tz.transition 2005, 10, :o1, 1130616000
-          tz.transition 2006, 3, :o4, 1143316800
-          tz.transition 2006, 10, :o1, 1162065600
-          tz.transition 2007, 3, :o4, 1174766400
-          tz.transition 2007, 10, :o1, 1193515200
-          tz.transition 2008, 3, :o4, 1206820800
-          tz.transition 2008, 10, :o1, 1224964800
-          tz.transition 2009, 3, :o4, 1238270400
-          tz.transition 2009, 10, :o1, 1256414400
-          tz.transition 2010, 3, :o4, 1269720000
-          tz.transition 2010, 10, :o1, 1288468800
-          tz.transition 2011, 3, :o4, 1301169600
-          tz.transition 2011, 10, :o1, 1319918400
-          tz.transition 2012, 3, :o4, 1332619200
-          tz.transition 2012, 10, :o1, 1351368000
-          tz.transition 2013, 3, :o4, 1364673600
-          tz.transition 2013, 10, :o1, 1382817600
-          tz.transition 2014, 3, :o4, 1396123200
-          tz.transition 2014, 10, :o1, 1414267200
-          tz.transition 2015, 3, :o4, 1427572800
-          tz.transition 2015, 10, :o1, 1445716800
-          tz.transition 2016, 3, :o4, 1459022400
-          tz.transition 2016, 10, :o1, 1477771200
-          tz.transition 2017, 3, :o4, 1490472000
-          tz.transition 2017, 10, :o1, 1509220800
-          tz.transition 2018, 3, :o4, 1521921600
-          tz.transition 2018, 10, :o1, 1540670400
-          tz.transition 2019, 3, :o4, 1553976000
-          tz.transition 2019, 10, :o1, 1572120000
-          tz.transition 2020, 3, :o4, 1585425600
-          tz.transition 2020, 10, :o1, 1603569600
-          tz.transition 2021, 3, :o4, 1616875200
-          tz.transition 2021, 10, :o1, 1635624000
-          tz.transition 2022, 3, :o4, 1648324800
-          tz.transition 2022, 10, :o1, 1667073600
-          tz.transition 2023, 3, :o4, 1679774400
-          tz.transition 2023, 10, :o1, 1698523200
-          tz.transition 2024, 3, :o4, 1711828800
-          tz.transition 2024, 10, :o1, 1729972800
-          tz.transition 2025, 3, :o4, 1743278400
-          tz.transition 2025, 10, :o1, 1761422400
-          tz.transition 2026, 3, :o4, 1774728000
-          tz.transition 2026, 10, :o1, 1792872000
-          tz.transition 2027, 3, :o4, 1806177600
-          tz.transition 2027, 10, :o1, 1824926400
-          tz.transition 2028, 3, :o4, 1837627200
-          tz.transition 2028, 10, :o1, 1856376000
-          tz.transition 2029, 3, :o4, 1869076800
-          tz.transition 2029, 10, :o1, 1887825600
-          tz.transition 2030, 3, :o4, 1901131200
-          tz.transition 2030, 10, :o1, 1919275200
-          tz.transition 2031, 3, :o4, 1932580800
-          tz.transition 2031, 10, :o1, 1950724800
-          tz.transition 2032, 3, :o4, 1964030400
-          tz.transition 2032, 10, :o1, 1982779200
-          tz.transition 2033, 3, :o4, 1995480000
-          tz.transition 2033, 10, :o1, 2014228800
-          tz.transition 2034, 3, :o4, 2026929600
-          tz.transition 2034, 10, :o1, 2045678400
-          tz.transition 2035, 3, :o4, 2058379200
-          tz.transition 2035, 10, :o1, 2077128000
-          tz.transition 2036, 3, :o4, 2090433600
-          tz.transition 2036, 10, :o1, 2108577600
-          tz.transition 2037, 3, :o4, 2121883200
-          tz.transition 2037, 10, :o1, 2140027200
-          tz.transition 2038, 3, :o4, 7396531, 3
-          tz.transition 2038, 10, :o1, 7397182, 3
-          tz.transition 2039, 3, :o4, 7397623, 3
-          tz.transition 2039, 10, :o1, 7398274, 3
-          tz.transition 2040, 3, :o4, 7398715, 3
-          tz.transition 2040, 10, :o1, 7399366, 3
-          tz.transition 2041, 3, :o4, 7399828, 3
-          tz.transition 2041, 10, :o1, 7400458, 3
-          tz.transition 2042, 3, :o4, 7400920, 3
-          tz.transition 2042, 10, :o1, 7401550, 3
-          tz.transition 2043, 3, :o4, 7402012, 3
-          tz.transition 2043, 10, :o1, 7402642, 3
-          tz.transition 2044, 3, :o4, 7403104, 3
-          tz.transition 2044, 10, :o1, 7403755, 3
-          tz.transition 2045, 3, :o4, 7404196, 3
-          tz.transition 2045, 10, :o1, 7404847, 3
-          tz.transition 2046, 3, :o4, 7405288, 3
-          tz.transition 2046, 10, :o1, 7405939, 3
-          tz.transition 2047, 3, :o4, 7406401, 3
-          tz.transition 2047, 10, :o1, 7407031, 3
-          tz.transition 2048, 3, :o4, 7407493, 3
-          tz.transition 2048, 10, :o1, 7408123, 3
-          tz.transition 2049, 3, :o4, 7408585, 3
-          tz.transition 2049, 10, :o1, 7409236, 3
-          tz.transition 2050, 3, :o4, 7409677, 3
-          tz.transition 2050, 10, :o1, 7410328, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Omsk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Omsk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Omsk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Omsk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Omsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Omsk' do |tz|
-          tz.offset :o0, 17616, 0, :LMT
-          tz.offset :o1, 18000, 0, :OMST
-          tz.offset :o2, 21600, 0, :OMST
-          tz.offset :o3, 21600, 3600, :OMSST
-          tz.offset :o4, 18000, 3600, :OMSST
-          
-          tz.transition 1919, 11, :o1, 4360097333, 1800
-          tz.transition 1930, 6, :o2, 58227559, 24
-          tz.transition 1981, 3, :o3, 354909600
-          tz.transition 1981, 9, :o2, 370717200
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402253200
-          tz.transition 1983, 3, :o3, 417981600
-          tz.transition 1983, 9, :o2, 433789200
-          tz.transition 1984, 3, :o3, 449604000
-          tz.transition 1984, 9, :o2, 465336000
-          tz.transition 1985, 3, :o3, 481060800
-          tz.transition 1985, 9, :o2, 496785600
-          tz.transition 1986, 3, :o3, 512510400
-          tz.transition 1986, 9, :o2, 528235200
-          tz.transition 1987, 3, :o3, 543960000
-          tz.transition 1987, 9, :o2, 559684800
-          tz.transition 1988, 3, :o3, 575409600
-          tz.transition 1988, 9, :o2, 591134400
-          tz.transition 1989, 3, :o3, 606859200
-          tz.transition 1989, 9, :o2, 622584000
-          tz.transition 1990, 3, :o3, 638308800
-          tz.transition 1990, 9, :o2, 654638400
-          tz.transition 1991, 3, :o4, 670363200
-          tz.transition 1991, 9, :o1, 686091600
-          tz.transition 1992, 1, :o2, 695768400
-          tz.transition 1992, 3, :o3, 701802000
-          tz.transition 1992, 9, :o2, 717523200
-          tz.transition 1993, 3, :o3, 733262400
-          tz.transition 1993, 9, :o2, 748987200
-          tz.transition 1994, 3, :o3, 764712000
-          tz.transition 1994, 9, :o2, 780436800
-          tz.transition 1995, 3, :o3, 796161600
-          tz.transition 1995, 9, :o2, 811886400
-          tz.transition 1996, 3, :o3, 828216000
-          tz.transition 1996, 10, :o2, 846360000
-          tz.transition 1997, 3, :o3, 859665600
-          tz.transition 1997, 10, :o2, 877809600
-          tz.transition 1998, 3, :o3, 891115200
-          tz.transition 1998, 10, :o2, 909259200
-          tz.transition 1999, 3, :o3, 922564800
-          tz.transition 1999, 10, :o2, 941313600
-          tz.transition 2000, 3, :o3, 954014400
-          tz.transition 2000, 10, :o2, 972763200
-          tz.transition 2001, 3, :o3, 985464000
-          tz.transition 2001, 10, :o2, 1004212800
-          tz.transition 2002, 3, :o3, 1017518400
-          tz.transition 2002, 10, :o2, 1035662400
-          tz.transition 2003, 3, :o3, 1048968000
-          tz.transition 2003, 10, :o2, 1067112000
-          tz.transition 2004, 3, :o3, 1080417600
-          tz.transition 2004, 10, :o2, 1099166400
-          tz.transition 2005, 3, :o3, 1111867200
-          tz.transition 2005, 10, :o2, 1130616000
-          tz.transition 2006, 3, :o3, 1143316800
-          tz.transition 2006, 10, :o2, 1162065600
-          tz.transition 2007, 3, :o3, 1174766400
-          tz.transition 2007, 10, :o2, 1193515200
-          tz.transition 2008, 3, :o3, 1206820800
-          tz.transition 2008, 10, :o2, 1224964800
-          tz.transition 2009, 3, :o3, 1238270400
-          tz.transition 2009, 10, :o2, 1256414400
-          tz.transition 2010, 3, :o3, 1269720000
-          tz.transition 2010, 10, :o2, 1288468800
-          tz.transition 2011, 3, :o3, 1301169600
-          tz.transition 2011, 10, :o2, 1319918400
-          tz.transition 2012, 3, :o3, 1332619200
-          tz.transition 2012, 10, :o2, 1351368000
-          tz.transition 2013, 3, :o3, 1364673600
-          tz.transition 2013, 10, :o2, 1382817600
-          tz.transition 2014, 3, :o3, 1396123200
-          tz.transition 2014, 10, :o2, 1414267200
-          tz.transition 2015, 3, :o3, 1427572800
-          tz.transition 2015, 10, :o2, 1445716800
-          tz.transition 2016, 3, :o3, 1459022400
-          tz.transition 2016, 10, :o2, 1477771200
-          tz.transition 2017, 3, :o3, 1490472000
-          tz.transition 2017, 10, :o2, 1509220800
-          tz.transition 2018, 3, :o3, 1521921600
-          tz.transition 2018, 10, :o2, 1540670400
-          tz.transition 2019, 3, :o3, 1553976000
-          tz.transition 2019, 10, :o2, 1572120000
-          tz.transition 2020, 3, :o3, 1585425600
-          tz.transition 2020, 10, :o2, 1603569600
-          tz.transition 2021, 3, :o3, 1616875200
-          tz.transition 2021, 10, :o2, 1635624000
-          tz.transition 2022, 3, :o3, 1648324800
-          tz.transition 2022, 10, :o2, 1667073600
-          tz.transition 2023, 3, :o3, 1679774400
-          tz.transition 2023, 10, :o2, 1698523200
-          tz.transition 2024, 3, :o3, 1711828800
-          tz.transition 2024, 10, :o2, 1729972800
-          tz.transition 2025, 3, :o3, 1743278400
-          tz.transition 2025, 10, :o2, 1761422400
-          tz.transition 2026, 3, :o3, 1774728000
-          tz.transition 2026, 10, :o2, 1792872000
-          tz.transition 2027, 3, :o3, 1806177600
-          tz.transition 2027, 10, :o2, 1824926400
-          tz.transition 2028, 3, :o3, 1837627200
-          tz.transition 2028, 10, :o2, 1856376000
-          tz.transition 2029, 3, :o3, 1869076800
-          tz.transition 2029, 10, :o2, 1887825600
-          tz.transition 2030, 3, :o3, 1901131200
-          tz.transition 2030, 10, :o2, 1919275200
-          tz.transition 2031, 3, :o3, 1932580800
-          tz.transition 2031, 10, :o2, 1950724800
-          tz.transition 2032, 3, :o3, 1964030400
-          tz.transition 2032, 10, :o2, 1982779200
-          tz.transition 2033, 3, :o3, 1995480000
-          tz.transition 2033, 10, :o2, 2014228800
-          tz.transition 2034, 3, :o3, 2026929600
-          tz.transition 2034, 10, :o2, 2045678400
-          tz.transition 2035, 3, :o3, 2058379200
-          tz.transition 2035, 10, :o2, 2077128000
-          tz.transition 2036, 3, :o3, 2090433600
-          tz.transition 2036, 10, :o2, 2108577600
-          tz.transition 2037, 3, :o3, 2121883200
-          tz.transition 2037, 10, :o2, 2140027200
-          tz.transition 2038, 3, :o3, 7396531, 3
-          tz.transition 2038, 10, :o2, 7397182, 3
-          tz.transition 2039, 3, :o3, 7397623, 3
-          tz.transition 2039, 10, :o2, 7398274, 3
-          tz.transition 2040, 3, :o3, 7398715, 3
-          tz.transition 2040, 10, :o2, 7399366, 3
-          tz.transition 2041, 3, :o3, 7399828, 3
-          tz.transition 2041, 10, :o2, 7400458, 3
-          tz.transition 2042, 3, :o3, 7400920, 3
-          tz.transition 2042, 10, :o2, 7401550, 3
-          tz.transition 2043, 3, :o3, 7402012, 3
-          tz.transition 2043, 10, :o2, 7402642, 3
-          tz.transition 2044, 3, :o3, 7403104, 3
-          tz.transition 2044, 10, :o2, 7403755, 3
-          tz.transition 2045, 3, :o3, 7404196, 3
-          tz.transition 2045, 10, :o2, 7404847, 3
-          tz.transition 2046, 3, :o3, 7405288, 3
-          tz.transition 2046, 10, :o2, 7405939, 3
-          tz.transition 2047, 3, :o3, 7406401, 3
-          tz.transition 2047, 10, :o2, 7407031, 3
-          tz.transition 2048, 3, :o3, 7407493, 3
-          tz.transition 2048, 10, :o2, 7408123, 3
-          tz.transition 2049, 3, :o3, 7408585, 3
-          tz.transition 2049, 10, :o2, 7409236, 3
-          tz.transition 2050, 3, :o3, 7409677, 3
-          tz.transition 2050, 10, :o2, 7410328, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Oral.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Oral.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Oral.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Oral.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,74 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Oral
-        include TimezoneDefinition
-        
-        timezone 'Asia/Oral' do |tz|
-          tz.offset :o0, 12324, 0, :LMT
-          tz.offset :o1, 14400, 0, :URAT
-          tz.offset :o2, 18000, 0, :URAT
-          tz.offset :o3, 18000, 3600, :URAST
-          tz.offset :o4, 21600, 0, :URAT
-          tz.offset :o5, 14400, 3600, :URAST
-          tz.offset :o6, 14400, 0, :ORAT
-          tz.offset :o7, 14400, 3600, :ORAST
-          tz.offset :o8, 18000, 0, :ORAT
-          
-          tz.transition 1924, 5, :o1, 17452132973, 7200
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1981, 3, :o3, 354913200
-          tz.transition 1981, 9, :o4, 370720800
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402256800
-          tz.transition 1983, 3, :o3, 417985200
-          tz.transition 1983, 9, :o2, 433792800
-          tz.transition 1984, 3, :o3, 449607600
-          tz.transition 1984, 9, :o2, 465339600
-          tz.transition 1985, 3, :o3, 481064400
-          tz.transition 1985, 9, :o2, 496789200
-          tz.transition 1986, 3, :o3, 512514000
-          tz.transition 1986, 9, :o2, 528238800
-          tz.transition 1987, 3, :o3, 543963600
-          tz.transition 1987, 9, :o2, 559688400
-          tz.transition 1988, 3, :o3, 575413200
-          tz.transition 1988, 9, :o2, 591138000
-          tz.transition 1989, 3, :o5, 606862800
-          tz.transition 1989, 9, :o1, 622591200
-          tz.transition 1990, 3, :o5, 638316000
-          tz.transition 1990, 9, :o1, 654645600
-          tz.transition 1991, 12, :o6, 692827200
-          tz.transition 1992, 3, :o7, 701809200
-          tz.transition 1992, 9, :o6, 717530400
-          tz.transition 1993, 3, :o7, 733269600
-          tz.transition 1993, 9, :o6, 748994400
-          tz.transition 1994, 3, :o7, 764719200
-          tz.transition 1994, 9, :o6, 780444000
-          tz.transition 1995, 3, :o7, 796168800
-          tz.transition 1995, 9, :o6, 811893600
-          tz.transition 1996, 3, :o7, 828223200
-          tz.transition 1996, 10, :o6, 846367200
-          tz.transition 1997, 3, :o7, 859672800
-          tz.transition 1997, 10, :o6, 877816800
-          tz.transition 1998, 3, :o7, 891122400
-          tz.transition 1998, 10, :o6, 909266400
-          tz.transition 1999, 3, :o7, 922572000
-          tz.transition 1999, 10, :o6, 941320800
-          tz.transition 2000, 3, :o7, 954021600
-          tz.transition 2000, 10, :o6, 972770400
-          tz.transition 2001, 3, :o7, 985471200
-          tz.transition 2001, 10, :o6, 1004220000
-          tz.transition 2002, 3, :o7, 1017525600
-          tz.transition 2002, 10, :o6, 1035669600
-          tz.transition 2003, 3, :o7, 1048975200
-          tz.transition 2003, 10, :o6, 1067119200
-          tz.transition 2004, 3, :o7, 1080424800
-          tz.transition 2004, 10, :o6, 1099173600
-          tz.transition 2005, 3, :o8, 1110830400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Phnom_Penh.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Phnom_Penh.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Phnom_Penh.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Phnom_Penh.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Phnom_Penh
-        include TimezoneDefinition
-        
-        timezone 'Asia/Phnom_Penh' do |tz|
-          tz.offset :o0, 25180, 0, :LMT
-          tz.offset :o1, 25580, 0, :SMT
-          tz.offset :o2, 25200, 0, :ICT
-          tz.offset :o3, 28800, 0, :ICT
-          
-          tz.transition 1906, 6, :o1, 10443039301, 4320
-          tz.transition 1911, 3, :o2, 2612634701, 1080
-          tz.transition 1912, 4, :o3, 58068557, 24
-          tz.transition 1931, 4, :o2, 14558773, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pontianak.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pontianak.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pontianak.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pontianak.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Pontianak
-        include TimezoneDefinition
-        
-        timezone 'Asia/Pontianak' do |tz|
-          tz.offset :o0, 26240, 0, :LMT
-          tz.offset :o1, 26240, 0, :PMT
-          tz.offset :o2, 27000, 0, :WIT
-          tz.offset :o3, 32400, 0, :JST
-          tz.offset :o4, 28800, 0, :WIT
-          tz.offset :o5, 28800, 0, :CIT
-          tz.offset :o6, 25200, 0, :WIT
-          
-          tz.transition 1908, 4, :o1, 652876793, 270
-          tz.transition 1932, 10, :o2, 655293293, 270
-          tz.transition 1942, 1, :o3, 38886211, 16
-          tz.transition 1945, 7, :o2, 19453345, 8
-          tz.transition 1948, 4, :o4, 38922755, 16
-          tz.transition 1950, 4, :o2, 14600413, 6
-          tz.transition 1963, 12, :o5, 39014323, 16
-          tz.transition 1987, 12, :o6, 567964800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pyongyang.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pyongyang.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pyongyang.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Pyongyang.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Pyongyang
-        include TimezoneDefinition
-        
-        timezone 'Asia/Pyongyang' do |tz|
-          tz.offset :o0, 30180, 0, :LMT
-          tz.offset :o1, 30600, 0, :KST
-          tz.offset :o2, 32400, 0, :KST
-          tz.offset :o3, 28800, 0, :KST
-          
-          tz.transition 1889, 12, :o1, 3472370137, 1440
-          tz.transition 1904, 11, :o2, 116007127, 48
-          tz.transition 1927, 12, :o1, 19401969, 8
-          tz.transition 1931, 12, :o2, 116481943, 48
-          tz.transition 1954, 3, :o3, 19478577, 8
-          tz.transition 1961, 8, :o2, 14625127, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qatar.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qatar.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qatar.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qatar.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Qatar
-        include TimezoneDefinition
-        
-        timezone 'Asia/Qatar' do |tz|
-          tz.offset :o0, 12368, 0, :LMT
-          tz.offset :o1, 14400, 0, :GST
-          tz.offset :o2, 10800, 0, :AST
-          
-          tz.transition 1919, 12, :o1, 13080551527, 5400
-          tz.transition 1972, 5, :o2, 76190400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qyzylorda.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qyzylorda.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qyzylorda.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Qyzylorda.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,73 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Qyzylorda
-        include TimezoneDefinition
-        
-        timezone 'Asia/Qyzylorda' do |tz|
-          tz.offset :o0, 15712, 0, :LMT
-          tz.offset :o1, 14400, 0, :KIZT
-          tz.offset :o2, 18000, 0, :KIZT
-          tz.offset :o3, 18000, 3600, :KIZST
-          tz.offset :o4, 21600, 0, :KIZT
-          tz.offset :o5, 18000, 0, :QYZT
-          tz.offset :o6, 21600, 0, :QYZT
-          tz.offset :o7, 21600, 3600, :QYZST
-          
-          tz.transition 1924, 5, :o1, 6544549759, 2700
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1981, 3, :o3, 354913200
-          tz.transition 1981, 9, :o4, 370720800
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402256800
-          tz.transition 1983, 3, :o3, 417985200
-          tz.transition 1983, 9, :o2, 433792800
-          tz.transition 1984, 3, :o3, 449607600
-          tz.transition 1984, 9, :o2, 465339600
-          tz.transition 1985, 3, :o3, 481064400
-          tz.transition 1985, 9, :o2, 496789200
-          tz.transition 1986, 3, :o3, 512514000
-          tz.transition 1986, 9, :o2, 528238800
-          tz.transition 1987, 3, :o3, 543963600
-          tz.transition 1987, 9, :o2, 559688400
-          tz.transition 1988, 3, :o3, 575413200
-          tz.transition 1988, 9, :o2, 591138000
-          tz.transition 1989, 3, :o3, 606862800
-          tz.transition 1989, 9, :o2, 622587600
-          tz.transition 1990, 3, :o3, 638312400
-          tz.transition 1990, 9, :o2, 654642000
-          tz.transition 1991, 12, :o5, 692823600
-          tz.transition 1992, 1, :o6, 695768400
-          tz.transition 1992, 3, :o7, 701802000
-          tz.transition 1992, 9, :o6, 717523200
-          tz.transition 1993, 3, :o7, 733262400
-          tz.transition 1993, 9, :o6, 748987200
-          tz.transition 1994, 3, :o7, 764712000
-          tz.transition 1994, 9, :o6, 780436800
-          tz.transition 1995, 3, :o7, 796161600
-          tz.transition 1995, 9, :o6, 811886400
-          tz.transition 1996, 3, :o7, 828216000
-          tz.transition 1996, 10, :o6, 846360000
-          tz.transition 1997, 3, :o7, 859665600
-          tz.transition 1997, 10, :o6, 877809600
-          tz.transition 1998, 3, :o7, 891115200
-          tz.transition 1998, 10, :o6, 909259200
-          tz.transition 1999, 3, :o7, 922564800
-          tz.transition 1999, 10, :o6, 941313600
-          tz.transition 2000, 3, :o7, 954014400
-          tz.transition 2000, 10, :o6, 972763200
-          tz.transition 2001, 3, :o7, 985464000
-          tz.transition 2001, 10, :o6, 1004212800
-          tz.transition 2002, 3, :o7, 1017518400
-          tz.transition 2002, 10, :o6, 1035662400
-          tz.transition 2003, 3, :o7, 1048968000
-          tz.transition 2003, 10, :o6, 1067112000
-          tz.transition 2004, 3, :o7, 1080417600
-          tz.transition 2004, 10, :o6, 1099166400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Rangoon.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Rangoon.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Rangoon.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Rangoon.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,24 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Rangoon
-        include TimezoneDefinition
-        
-        timezone 'Asia/Rangoon' do |tz|
-          tz.offset :o0, 23080, 0, :LMT
-          tz.offset :o1, 23076, 0, :RMT
-          tz.offset :o2, 23400, 0, :BURT
-          tz.offset :o3, 32400, 0, :JST
-          tz.offset :o4, 23400, 0, :MMT
-          
-          tz.transition 1879, 12, :o1, 5200664903, 2160
-          tz.transition 1919, 12, :o2, 5813578159, 2400
-          tz.transition 1942, 4, :o3, 116663051, 48
-          tz.transition 1945, 5, :o4, 19452625, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Riyadh
-        include TimezoneDefinition
-        
-        timezone 'Asia/Riyadh' do |tz|
-          tz.offset :o0, 11212, 0, :LMT
-          tz.offset :o1, 10800, 0, :AST
-          
-          tz.transition 1949, 12, :o1, 52558899197, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh87.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh87.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh87.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh87.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,592 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Riyadh87
-        include TimezoneDefinition
-        
-        timezone 'Asia/Riyadh87' do |tz|
-          tz.offset :o0, 11224, 0, :zzz
-          tz.offset :o1, 11224, -200, :zzz
-          tz.offset :o2, 11224, -230, :zzz
-          tz.offset :o3, 11224, -255, :zzz
-          tz.offset :o4, 11224, -285, :zzz
-          tz.offset :o5, 11224, -310, :zzz
-          tz.offset :o6, 11224, -340, :zzz
-          tz.offset :o7, 11224, -365, :zzz
-          tz.offset :o8, 11224, -390, :zzz
-          tz.offset :o9, 11224, -415, :zzz
-          tz.offset :o10, 11224, -440, :zzz
-          tz.offset :o11, 11224, -465, :zzz
-          tz.offset :o12, 11224, -490, :zzz
-          tz.offset :o13, 11224, -510, :zzz
-          tz.offset :o14, 11224, -535, :zzz
-          tz.offset :o15, 11224, -555, :zzz
-          tz.offset :o16, 11224, -575, :zzz
-          tz.offset :o17, 11224, -595, :zzz
-          tz.offset :o18, 11224, -615, :zzz
-          tz.offset :o19, 11224, -635, :zzz
-          tz.offset :o20, 11224, -655, :zzz
-          tz.offset :o21, 11224, -670, :zzz
-          tz.offset :o22, 11224, -690, :zzz
-          tz.offset :o23, 11224, -705, :zzz
-          tz.offset :o24, 11224, -720, :zzz
-          tz.offset :o25, 11224, -735, :zzz
-          tz.offset :o26, 11224, -750, :zzz
-          tz.offset :o27, 11224, -760, :zzz
-          tz.offset :o28, 11224, -775, :zzz
-          tz.offset :o29, 11224, -785, :zzz
-          tz.offset :o30, 11224, -795, :zzz
-          tz.offset :o31, 11224, -805, :zzz
-          tz.offset :o32, 11224, -815, :zzz
-          tz.offset :o33, 11224, -820, :zzz
-          tz.offset :o34, 11224, -830, :zzz
-          tz.offset :o35, 11224, -835, :zzz
-          tz.offset :o36, 11224, -840, :zzz
-          tz.offset :o37, 11224, -845, :zzz
-          tz.offset :o38, 11224, -850, :zzz
-          tz.offset :o39, 11224, -855, :zzz
-          tz.offset :o40, 11224, -825, :zzz
-          tz.offset :o41, 11224, -810, :zzz
-          tz.offset :o42, 11224, -800, :zzz
-          tz.offset :o43, 11224, -790, :zzz
-          tz.offset :o44, 11224, -780, :zzz
-          tz.offset :o45, 11224, -770, :zzz
-          tz.offset :o46, 11224, -740, :zzz
-          tz.offset :o47, 11224, -725, :zzz
-          tz.offset :o48, 11224, -715, :zzz
-          tz.offset :o49, 11224, -700, :zzz
-          tz.offset :o50, 11224, -685, :zzz
-          tz.offset :o51, 11224, -675, :zzz
-          tz.offset :o52, 11224, -660, :zzz
-          tz.offset :o53, 11224, -645, :zzz
-          tz.offset :o54, 11224, -630, :zzz
-          tz.offset :o55, 11224, -580, :zzz
-          tz.offset :o56, 11224, -565, :zzz
-          tz.offset :o57, 11224, -550, :zzz
-          tz.offset :o58, 11224, -530, :zzz
-          tz.offset :o59, 11224, -515, :zzz
-          tz.offset :o60, 11224, -495, :zzz
-          tz.offset :o61, 11224, -480, :zzz
-          tz.offset :o62, 11224, -460, :zzz
-          tz.offset :o63, 11224, -445, :zzz
-          tz.offset :o64, 11224, -425, :zzz
-          tz.offset :o65, 11224, -410, :zzz
-          tz.offset :o66, 11224, -370, :zzz
-          tz.offset :o67, 11224, -355, :zzz
-          tz.offset :o68, 11224, -335, :zzz
-          tz.offset :o69, 11224, -315, :zzz
-          tz.offset :o70, 11224, -300, :zzz
-          tz.offset :o71, 11224, -280, :zzz
-          tz.offset :o72, 11224, -265, :zzz
-          tz.offset :o73, 11224, -245, :zzz
-          tz.offset :o74, 11224, -225, :zzz
-          tz.offset :o75, 11224, -210, :zzz
-          tz.offset :o76, 11224, -190, :zzz
-          tz.offset :o77, 11224, -175, :zzz
-          tz.offset :o78, 11224, -155, :zzz
-          tz.offset :o79, 11224, -140, :zzz
-          tz.offset :o80, 11224, -125, :zzz
-          tz.offset :o81, 11224, -105, :zzz
-          tz.offset :o82, 11224, -90, :zzz
-          tz.offset :o83, 11224, -75, :zzz
-          tz.offset :o84, 11224, -55, :zzz
-          tz.offset :o85, 11224, -40, :zzz
-          tz.offset :o86, 11224, -25, :zzz
-          tz.offset :o87, 11224, -10, :zzz
-          tz.offset :o88, 11224, 5, :zzz
-          tz.offset :o89, 11224, 15, :zzz
-          tz.offset :o90, 11224, 30, :zzz
-          tz.offset :o91, 11224, 45, :zzz
-          tz.offset :o92, 11224, 55, :zzz
-          tz.offset :o93, 11224, 70, :zzz
-          tz.offset :o94, 11224, 80, :zzz
-          tz.offset :o95, 11224, 95, :zzz
-          tz.offset :o96, 11224, 105, :zzz
-          tz.offset :o97, 11224, 115, :zzz
-          tz.offset :o98, 11224, 125, :zzz
-          tz.offset :o99, 11224, 135, :zzz
-          tz.offset :o100, 11224, 145, :zzz
-          tz.offset :o101, 11224, 155, :zzz
-          tz.offset :o102, 11224, 165, :zzz
-          tz.offset :o103, 11224, 170, :zzz
-          tz.offset :o104, 11224, 180, :zzz
-          tz.offset :o105, 11224, 185, :zzz
-          tz.offset :o106, 11224, 190, :zzz
-          tz.offset :o107, 11224, 195, :zzz
-          tz.offset :o108, 11224, 200, :zzz
-          tz.offset :o109, 11224, 205, :zzz
-          tz.offset :o110, 11224, 210, :zzz
-          tz.offset :o111, 11224, 215, :zzz
-          tz.offset :o112, 11224, 220, :zzz
-          tz.offset :o113, 11224, 150, :zzz
-          tz.offset :o114, 11224, 140, :zzz
-          tz.offset :o115, 11224, 130, :zzz
-          tz.offset :o116, 11224, 120, :zzz
-          tz.offset :o117, 11224, 110, :zzz
-          tz.offset :o118, 11224, 100, :zzz
-          tz.offset :o119, 11224, 90, :zzz
-          tz.offset :o120, 11224, 20, :zzz
-          tz.offset :o121, 11224, 10, :zzz
-          tz.offset :o122, 11224, -5, :zzz
-          tz.offset :o123, 11224, -15, :zzz
-          tz.offset :o124, 11224, -30, :zzz
-          tz.offset :o125, 11224, -45, :zzz
-          tz.offset :o126, 11224, -70, :zzz
-          tz.offset :o127, 11224, -80, :zzz
-          tz.offset :o128, 11224, -95, :zzz
-          tz.offset :o129, 11224, -110, :zzz
-          tz.offset :o130, 11224, -120, :zzz
-          tz.offset :o131, 11224, -135, :zzz
-          tz.offset :o132, 11224, -145, :zzz
-          tz.offset :o133, 11224, -160, :zzz
-          tz.offset :o134, 11224, -170, :zzz
-          tz.offset :o135, 11224, -185, :zzz
-          tz.offset :o136, 11224, -195, :zzz
-          tz.offset :o137, 11224, -220, :zzz
-          tz.offset :o138, 11224, -275, :zzz
-          tz.offset :o139, 11224, -295, :zzz
-          tz.offset :o140, 11224, -305, :zzz
-          tz.offset :o141, 11224, -320, :zzz
-          tz.offset :o142, 11224, -330, :zzz
-          tz.offset :o143, 11224, -345, :zzz
-          tz.offset :o144, 11224, -350, :zzz
-          tz.offset :o145, 11224, -360, :zzz
-          tz.offset :o146, 11224, -375, :zzz
-          tz.offset :o147, 11224, -380, :zzz
-          tz.offset :o148, 11224, -385, :zzz
-          tz.offset :o149, 11224, -325, :zzz
-          tz.offset :o150, 11224, -250, :zzz
-          tz.offset :o151, 11224, -240, :zzz
-          tz.offset :o152, 11224, -180, :zzz
-          tz.offset :o153, 11224, -165, :zzz
-          tz.offset :o154, 11224, -150, :zzz
-          tz.offset :o155, 11224, -100, :zzz
-          tz.offset :o156, 11224, -85, :zzz
-          tz.offset :o157, 11224, -65, :zzz
-          tz.offset :o158, 11224, -50, :zzz
-          tz.offset :o159, 11224, 25, :zzz
-          tz.offset :o160, 11224, 65, :zzz
-          tz.offset :o161, 11224, 85, :zzz
-          tz.offset :o162, 11224, 230, :zzz
-          tz.offset :o163, 11224, 255, :zzz
-          tz.offset :o164, 11224, 275, :zzz
-          tz.offset :o165, 11224, 295, :zzz
-          tz.offset :o166, 11224, 315, :zzz
-          tz.offset :o167, 11224, 340, :zzz
-          tz.offset :o168, 11224, 360, :zzz
-          tz.offset :o169, 11224, 380, :zzz
-          tz.offset :o170, 11224, 405, :zzz
-          tz.offset :o171, 11224, 425, :zzz
-          tz.offset :o172, 11224, 445, :zzz
-          tz.offset :o173, 11224, 465, :zzz
-          tz.offset :o174, 11224, 485, :zzz
-          tz.offset :o175, 11224, 505, :zzz
-          tz.offset :o176, 11224, 530, :zzz
-          tz.offset :o177, 11224, 550, :zzz
-          tz.offset :o178, 11224, 570, :zzz
-          tz.offset :o179, 11224, 590, :zzz
-          tz.offset :o180, 11224, 610, :zzz
-          tz.offset :o181, 11224, 625, :zzz
-          tz.offset :o182, 11224, 645, :zzz
-          tz.offset :o183, 11224, 665, :zzz
-          tz.offset :o184, 11224, 685, :zzz
-          tz.offset :o185, 11224, 700, :zzz
-          tz.offset :o186, 11224, 720, :zzz
-          tz.offset :o187, 11224, 735, :zzz
-          tz.offset :o188, 11224, 755, :zzz
-          tz.offset :o189, 11224, 770, :zzz
-          tz.offset :o190, 11224, 785, :zzz
-          tz.offset :o191, 11224, 800, :zzz
-          tz.offset :o192, 11224, 815, :zzz
-          tz.offset :o193, 11224, 830, :zzz
-          tz.offset :o194, 11224, 845, :zzz
-          tz.offset :o195, 11224, 855, :zzz
-          tz.offset :o196, 11224, 870, :zzz
-          tz.offset :o197, 11224, 880, :zzz
-          tz.offset :o198, 11224, 895, :zzz
-          tz.offset :o199, 11224, 905, :zzz
-          tz.offset :o200, 11224, 915, :zzz
-          tz.offset :o201, 11224, 925, :zzz
-          tz.offset :o202, 11224, 935, :zzz
-          tz.offset :o203, 11224, 940, :zzz
-          tz.offset :o204, 11224, 950, :zzz
-          tz.offset :o205, 11224, 955, :zzz
-          tz.offset :o206, 11224, 965, :zzz
-          tz.offset :o207, 11224, 970, :zzz
-          tz.offset :o208, 11224, 975, :zzz
-          tz.offset :o209, 11224, 980, :zzz
-          tz.offset :o210, 11224, 985, :zzz
-          tz.offset :o211, 11224, 960, :zzz
-          tz.offset :o212, 11224, 945, :zzz
-          tz.offset :o213, 11224, 930, :zzz
-          tz.offset :o214, 11224, 920, :zzz
-          tz.offset :o215, 11224, 910, :zzz
-          tz.offset :o216, 11224, 885, :zzz
-          tz.offset :o217, 11224, 840, :zzz
-          tz.offset :o218, 11224, 825, :zzz
-          tz.offset :o219, 11224, 810, :zzz
-          tz.offset :o220, 11224, 790, :zzz
-          tz.offset :o221, 11224, 715, :zzz
-          tz.offset :o222, 11224, 690, :zzz
-          tz.offset :o223, 11224, 670, :zzz
-          tz.offset :o224, 11224, 650, :zzz
-          tz.offset :o225, 11224, 600, :zzz
-          tz.offset :o226, 11224, 575, :zzz
-          tz.offset :o227, 11224, 525, :zzz
-          tz.offset :o228, 11224, 500, :zzz
-          tz.offset :o229, 11224, 475, :zzz
-          tz.offset :o230, 11224, 450, :zzz
-          tz.offset :o231, 11224, 420, :zzz
-          tz.offset :o232, 11224, 395, :zzz
-          tz.offset :o233, 11224, 365, :zzz
-          tz.offset :o234, 11224, 335, :zzz
-          tz.offset :o235, 11224, 310, :zzz
-          tz.offset :o236, 11224, 280, :zzz
-          tz.offset :o237, 11224, 250, :zzz
-          tz.offset :o238, 11224, 160, :zzz
-          tz.offset :o239, 11224, 40, :zzz
-          tz.offset :o240, 11224, -20, :zzz
-          
-          tz.transition 1987, 1, :o1, 536489776
-          tz.transition 1987, 1, :o2, 536576206
-          tz.transition 1987, 1, :o3, 536662631
-          tz.transition 1987, 1, :o4, 536749061
-          tz.transition 1987, 1, :o5, 536835486
-          tz.transition 1987, 1, :o6, 536921916
-          tz.transition 1987, 1, :o7, 537008341
-          tz.transition 1987, 1, :o8, 537094766
-          tz.transition 1987, 1, :o9, 537181191
-          tz.transition 1987, 1, :o10, 537267616
-          tz.transition 1987, 1, :o11, 537354041
-          tz.transition 1987, 1, :o12, 537440466
-          tz.transition 1987, 1, :o13, 537526886
-          tz.transition 1987, 1, :o14, 537613311
-          tz.transition 1987, 1, :o15, 537699731
-          tz.transition 1987, 1, :o16, 537786151
-          tz.transition 1987, 1, :o17, 537872571
-          tz.transition 1987, 1, :o18, 537958991
-          tz.transition 1987, 1, :o19, 538045411
-          tz.transition 1987, 1, :o20, 538131831
-          tz.transition 1987, 1, :o21, 538218246
-          tz.transition 1987, 1, :o22, 538304666
-          tz.transition 1987, 1, :o23, 538391081
-          tz.transition 1987, 1, :o24, 538477496
-          tz.transition 1987, 1, :o25, 538563911
-          tz.transition 1987, 1, :o26, 538650326
-          tz.transition 1987, 1, :o27, 538736736
-          tz.transition 1987, 1, :o28, 538823151
-          tz.transition 1987, 1, :o29, 538909561
-          tz.transition 1987, 1, :o30, 538995971
-          tz.transition 1987, 1, :o31, 539082381
-          tz.transition 1987, 2, :o32, 539168791
-          tz.transition 1987, 2, :o33, 539255196
-          tz.transition 1987, 2, :o34, 539341606
-          tz.transition 1987, 2, :o35, 539428011
-          tz.transition 1987, 2, :o36, 539514416
-          tz.transition 1987, 2, :o37, 539600821
-          tz.transition 1987, 2, :o38, 539687226
-          tz.transition 1987, 2, :o39, 539860031
-          tz.transition 1987, 2, :o38, 540378426
-          tz.transition 1987, 2, :o37, 540551221
-          tz.transition 1987, 2, :o36, 540637616
-          tz.transition 1987, 2, :o35, 540724011
-          tz.transition 1987, 2, :o34, 540810406
-          tz.transition 1987, 2, :o40, 540896801
-          tz.transition 1987, 2, :o32, 540983191
-          tz.transition 1987, 2, :o41, 541069586
-          tz.transition 1987, 2, :o42, 541155976
-          tz.transition 1987, 2, :o43, 541242366
-          tz.transition 1987, 2, :o44, 541328756
-          tz.transition 1987, 2, :o45, 541415146
-          tz.transition 1987, 2, :o27, 541501536
-          tz.transition 1987, 3, :o26, 541587926
-          tz.transition 1987, 3, :o46, 541674316
-          tz.transition 1987, 3, :o47, 541760701
-          tz.transition 1987, 3, :o48, 541847091
-          tz.transition 1987, 3, :o49, 541933476
-          tz.transition 1987, 3, :o50, 542019861
-          tz.transition 1987, 3, :o51, 542106251
-          tz.transition 1987, 3, :o52, 542192636
-          tz.transition 1987, 3, :o53, 542279021
-          tz.transition 1987, 3, :o54, 542365406
-          tz.transition 1987, 3, :o18, 542451791
-          tz.transition 1987, 3, :o17, 542538171
-          tz.transition 1987, 3, :o55, 542624556
-          tz.transition 1987, 3, :o56, 542710941
-          tz.transition 1987, 3, :o57, 542797326
-          tz.transition 1987, 3, :o58, 542883706
-          tz.transition 1987, 3, :o59, 542970091
-          tz.transition 1987, 3, :o60, 543056471
-          tz.transition 1987, 3, :o61, 543142856
-          tz.transition 1987, 3, :o62, 543229236
-          tz.transition 1987, 3, :o63, 543315621
-          tz.transition 1987, 3, :o64, 543402001
-          tz.transition 1987, 3, :o65, 543488386
-          tz.transition 1987, 3, :o8, 543574766
-          tz.transition 1987, 3, :o66, 543661146
-          tz.transition 1987, 3, :o67, 543747531
-          tz.transition 1987, 3, :o68, 543833911
-          tz.transition 1987, 3, :o69, 543920291
-          tz.transition 1987, 3, :o70, 544006676
-          tz.transition 1987, 3, :o71, 544093056
-          tz.transition 1987, 3, :o72, 544179441
-          tz.transition 1987, 4, :o73, 544265821
-          tz.transition 1987, 4, :o74, 544352201
-          tz.transition 1987, 4, :o75, 544438586
-          tz.transition 1987, 4, :o76, 544524966
-          tz.transition 1987, 4, :o77, 544611351
-          tz.transition 1987, 4, :o78, 544697731
-          tz.transition 1987, 4, :o79, 544784116
-          tz.transition 1987, 4, :o80, 544870501
-          tz.transition 1987, 4, :o81, 544956881
-          tz.transition 1987, 4, :o82, 545043266
-          tz.transition 1987, 4, :o83, 545129651
-          tz.transition 1987, 4, :o84, 545216031
-          tz.transition 1987, 4, :o85, 545302416
-          tz.transition 1987, 4, :o86, 545388801
-          tz.transition 1987, 4, :o87, 545475186
-          tz.transition 1987, 4, :o88, 545561571
-          tz.transition 1987, 4, :o89, 545647961
-          tz.transition 1987, 4, :o90, 545734346
-          tz.transition 1987, 4, :o91, 545820731
-          tz.transition 1987, 4, :o92, 545907121
-          tz.transition 1987, 4, :o93, 545993506
-          tz.transition 1987, 4, :o94, 546079896
-          tz.transition 1987, 4, :o95, 546166281
-          tz.transition 1987, 4, :o96, 546252671
-          tz.transition 1987, 4, :o97, 546339061
-          tz.transition 1987, 4, :o98, 546425451
-          tz.transition 1987, 4, :o99, 546511841
-          tz.transition 1987, 4, :o100, 546598231
-          tz.transition 1987, 4, :o101, 546684621
-          tz.transition 1987, 4, :o102, 546771011
-          tz.transition 1987, 5, :o103, 546857406
-          tz.transition 1987, 5, :o104, 546943796
-          tz.transition 1987, 5, :o105, 547030191
-          tz.transition 1987, 5, :o106, 547116586
-          tz.transition 1987, 5, :o107, 547202981
-          tz.transition 1987, 5, :o108, 547289376
-          tz.transition 1987, 5, :o109, 547375771
-          tz.transition 1987, 5, :o110, 547462166
-          tz.transition 1987, 5, :o111, 547548561
-          tz.transition 1987, 5, :o112, 547721356
-          tz.transition 1987, 5, :o111, 548412561
-          tz.transition 1987, 5, :o110, 548585366
-          tz.transition 1987, 5, :o109, 548671771
-          tz.transition 1987, 5, :o108, 548758176
-          tz.transition 1987, 5, :o107, 548844581
-          tz.transition 1987, 5, :o106, 548930986
-          tz.transition 1987, 5, :o105, 549017391
-          tz.transition 1987, 5, :o104, 549103796
-          tz.transition 1987, 5, :o103, 549190206
-          tz.transition 1987, 5, :o102, 549276611
-          tz.transition 1987, 5, :o101, 549363021
-          tz.transition 1987, 5, :o113, 549449426
-          tz.transition 1987, 6, :o114, 549535836
-          tz.transition 1987, 6, :o115, 549622246
-          tz.transition 1987, 6, :o116, 549708656
-          tz.transition 1987, 6, :o117, 549795066
-          tz.transition 1987, 6, :o118, 549881476
-          tz.transition 1987, 6, :o119, 549967886
-          tz.transition 1987, 6, :o94, 550054296
-          tz.transition 1987, 6, :o93, 550140706
-          tz.transition 1987, 6, :o92, 550227121
-          tz.transition 1987, 6, :o91, 550313531
-          tz.transition 1987, 6, :o90, 550399946
-          tz.transition 1987, 6, :o120, 550486356
-          tz.transition 1987, 6, :o121, 550572766
-          tz.transition 1987, 6, :o122, 550659181
-          tz.transition 1987, 6, :o123, 550745591
-          tz.transition 1987, 6, :o124, 550832006
-          tz.transition 1987, 6, :o125, 550918421
-          tz.transition 1987, 6, :o84, 551004831
-          tz.transition 1987, 6, :o126, 551091246
-          tz.transition 1987, 6, :o127, 551177656
-          tz.transition 1987, 6, :o128, 551264071
-          tz.transition 1987, 6, :o129, 551350486
-          tz.transition 1987, 6, :o130, 551436896
-          tz.transition 1987, 6, :o131, 551523311
-          tz.transition 1987, 6, :o132, 551609721
-          tz.transition 1987, 6, :o133, 551696136
-          tz.transition 1987, 6, :o134, 551782546
-          tz.transition 1987, 6, :o135, 551868961
-          tz.transition 1987, 6, :o136, 551955371
-          tz.transition 1987, 6, :o75, 552041786
-          tz.transition 1987, 7, :o137, 552128196
-          tz.transition 1987, 7, :o2, 552214606
-          tz.transition 1987, 7, :o73, 552301021
-          tz.transition 1987, 7, :o3, 552387431
-          tz.transition 1987, 7, :o72, 552473841
-          tz.transition 1987, 7, :o138, 552560251
-          tz.transition 1987, 7, :o4, 552646661
-          tz.transition 1987, 7, :o139, 552733071
-          tz.transition 1987, 7, :o140, 552819481
-          tz.transition 1987, 7, :o69, 552905891
-          tz.transition 1987, 7, :o141, 552992296
-          tz.transition 1987, 7, :o142, 553078706
-          tz.transition 1987, 7, :o6, 553165116
-          tz.transition 1987, 7, :o143, 553251521
-          tz.transition 1987, 7, :o144, 553337926
-          tz.transition 1987, 7, :o145, 553424336
-          tz.transition 1987, 7, :o7, 553510741
-          tz.transition 1987, 7, :o66, 553597146
-          tz.transition 1987, 7, :o146, 553683551
-          tz.transition 1987, 7, :o147, 553856356
-          tz.transition 1987, 7, :o148, 553942761
-          tz.transition 1987, 7, :o8, 554201966
-          tz.transition 1987, 7, :o148, 554547561
-          tz.transition 1987, 8, :o147, 554806756
-          tz.transition 1987, 8, :o146, 554893151
-          tz.transition 1987, 8, :o66, 554979546
-          tz.transition 1987, 8, :o7, 555065941
-          tz.transition 1987, 8, :o145, 555152336
-          tz.transition 1987, 8, :o67, 555238731
-          tz.transition 1987, 8, :o144, 555325126
-          tz.transition 1987, 8, :o6, 555411516
-          tz.transition 1987, 8, :o68, 555497911
-          tz.transition 1987, 8, :o149, 555584301
-          tz.transition 1987, 8, :o69, 555670691
-          tz.transition 1987, 8, :o140, 555757081
-          tz.transition 1987, 8, :o139, 555843471
-          tz.transition 1987, 8, :o4, 555929861
-          tz.transition 1987, 8, :o138, 556016251
-          tz.transition 1987, 8, :o72, 556102641
-          tz.transition 1987, 8, :o150, 556189026
-          tz.transition 1987, 8, :o151, 556275416
-          tz.transition 1987, 8, :o74, 556361801
-          tz.transition 1987, 8, :o75, 556448186
-          tz.transition 1987, 8, :o136, 556534571
-          tz.transition 1987, 8, :o152, 556620956
-          tz.transition 1987, 8, :o153, 556707341
-          tz.transition 1987, 8, :o154, 556793726
-          tz.transition 1987, 8, :o131, 556880111
-          tz.transition 1987, 8, :o130, 556966496
-          tz.transition 1987, 8, :o155, 557052876
-          tz.transition 1987, 8, :o156, 557139261
-          tz.transition 1987, 8, :o157, 557225641
-          tz.transition 1987, 8, :o158, 557312026
-          tz.transition 1987, 8, :o124, 557398406
-          tz.transition 1987, 9, :o87, 557484786
-          tz.transition 1987, 9, :o121, 557571166
-          tz.transition 1987, 9, :o159, 557657551
-          tz.transition 1987, 9, :o91, 557743931
-          tz.transition 1987, 9, :o160, 557830311
-          tz.transition 1987, 9, :o161, 557916691
-          tz.transition 1987, 9, :o96, 558003071
-          tz.transition 1987, 9, :o98, 558089451
-          tz.transition 1987, 9, :o113, 558175826
-          tz.transition 1987, 9, :o103, 558262206
-          tz.transition 1987, 9, :o106, 558348586
-          tz.transition 1987, 9, :o110, 558434966
-          tz.transition 1987, 9, :o162, 558521346
-          tz.transition 1987, 9, :o163, 558607721
-          tz.transition 1987, 9, :o164, 558694101
-          tz.transition 1987, 9, :o165, 558780481
-          tz.transition 1987, 9, :o166, 558866861
-          tz.transition 1987, 9, :o167, 558953236
-          tz.transition 1987, 9, :o168, 559039616
-          tz.transition 1987, 9, :o169, 559125996
-          tz.transition 1987, 9, :o170, 559212371
-          tz.transition 1987, 9, :o171, 559298751
-          tz.transition 1987, 9, :o172, 559385131
-          tz.transition 1987, 9, :o173, 559471511
-          tz.transition 1987, 9, :o174, 559557891
-          tz.transition 1987, 9, :o175, 559644271
-          tz.transition 1987, 9, :o176, 559730646
-          tz.transition 1987, 9, :o177, 559817026
-          tz.transition 1987, 9, :o178, 559903406
-          tz.transition 1987, 9, :o179, 559989786
-          tz.transition 1987, 10, :o180, 560076166
-          tz.transition 1987, 10, :o181, 560162551
-          tz.transition 1987, 10, :o182, 560248931
-          tz.transition 1987, 10, :o183, 560335311
-          tz.transition 1987, 10, :o184, 560421691
-          tz.transition 1987, 10, :o185, 560508076
-          tz.transition 1987, 10, :o186, 560594456
-          tz.transition 1987, 10, :o187, 560680841
-          tz.transition 1987, 10, :o188, 560767221
-          tz.transition 1987, 10, :o189, 560853606
-          tz.transition 1987, 10, :o190, 560939991
-          tz.transition 1987, 10, :o191, 561026376
-          tz.transition 1987, 10, :o192, 561112761
-          tz.transition 1987, 10, :o193, 561199146
-          tz.transition 1987, 10, :o194, 561285531
-          tz.transition 1987, 10, :o195, 561371921
-          tz.transition 1987, 10, :o196, 561458306
-          tz.transition 1987, 10, :o197, 561544696
-          tz.transition 1987, 10, :o198, 561631081
-          tz.transition 1987, 10, :o199, 561717471
-          tz.transition 1987, 10, :o200, 561803861
-          tz.transition 1987, 10, :o201, 561890251
-          tz.transition 1987, 10, :o202, 561976641
-          tz.transition 1987, 10, :o203, 562063036
-          tz.transition 1987, 10, :o204, 562149426
-          tz.transition 1987, 10, :o205, 562235821
-          tz.transition 1987, 10, :o206, 562322211
-          tz.transition 1987, 10, :o207, 562408606
-          tz.transition 1987, 10, :o208, 562495001
-          tz.transition 1987, 10, :o209, 562667796
-          tz.transition 1987, 11, :o210, 562840591
-          tz.transition 1987, 11, :o209, 563186196
-          tz.transition 1987, 11, :o208, 563359001
-          tz.transition 1987, 11, :o207, 563445406
-          tz.transition 1987, 11, :o206, 563531811
-          tz.transition 1987, 11, :o211, 563618216
-          tz.transition 1987, 11, :o205, 563704621
-          tz.transition 1987, 11, :o212, 563791031
-          tz.transition 1987, 11, :o203, 563877436
-          tz.transition 1987, 11, :o213, 563963846
-          tz.transition 1987, 11, :o214, 564050256
-          tz.transition 1987, 11, :o215, 564136666
-          tz.transition 1987, 11, :o198, 564223081
-          tz.transition 1987, 11, :o216, 564309491
-          tz.transition 1987, 11, :o196, 564395906
-          tz.transition 1987, 11, :o195, 564482321
-          tz.transition 1987, 11, :o217, 564568736
-          tz.transition 1987, 11, :o218, 564655151
-          tz.transition 1987, 11, :o219, 564741566
-          tz.transition 1987, 11, :o220, 564827986
-          tz.transition 1987, 11, :o189, 564914406
-          tz.transition 1987, 11, :o188, 565000821
-          tz.transition 1987, 11, :o187, 565087241
-          tz.transition 1987, 11, :o221, 565173661
-          tz.transition 1987, 11, :o222, 565260086
-          tz.transition 1987, 12, :o223, 565346506
-          tz.transition 1987, 12, :o224, 565432926
-          tz.transition 1987, 12, :o181, 565519351
-          tz.transition 1987, 12, :o225, 565605776
-          tz.transition 1987, 12, :o226, 565692201
-          tz.transition 1987, 12, :o177, 565778626
-          tz.transition 1987, 12, :o227, 565865051
-          tz.transition 1987, 12, :o228, 565951476
-          tz.transition 1987, 12, :o229, 566037901
-          tz.transition 1987, 12, :o230, 566124326
-          tz.transition 1987, 12, :o231, 566210756
-          tz.transition 1987, 12, :o232, 566297181
-          tz.transition 1987, 12, :o233, 566383611
-          tz.transition 1987, 12, :o234, 566470041
-          tz.transition 1987, 12, :o235, 566556466
-          tz.transition 1987, 12, :o236, 566642896
-          tz.transition 1987, 12, :o237, 566729326
-          tz.transition 1987, 12, :o112, 566815756
-          tz.transition 1987, 12, :o106, 566902186
-          tz.transition 1987, 12, :o238, 566988616
-          tz.transition 1987, 12, :o115, 567075046
-          tz.transition 1987, 12, :o118, 567161476
-          tz.transition 1987, 12, :o93, 567247906
-          tz.transition 1987, 12, :o239, 567334336
-          tz.transition 1987, 12, :o121, 567420766
-          tz.transition 1987, 12, :o240, 567507196
-          tz.transition 1987, 12, :o125, 567593621
-          tz.transition 1987, 12, :o83, 567680051
-          tz.transition 1987, 12, :o81, 567766481
-          tz.transition 1987, 12, :o131, 567852911
-          tz.transition 1987, 12, :o153, 567939341
-          tz.transition 1987, 12, :o0, 567982541
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh88.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh88.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh88.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh88.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,582 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Riyadh88
-        include TimezoneDefinition
-        
-        timezone 'Asia/Riyadh88' do |tz|
-          tz.offset :o0, 11224, 0, :zzz
-          tz.offset :o1, 11224, -195, :zzz
-          tz.offset :o2, 11224, -220, :zzz
-          tz.offset :o3, 11224, -250, :zzz
-          tz.offset :o4, 11224, -280, :zzz
-          tz.offset :o5, 11224, -305, :zzz
-          tz.offset :o6, 11224, -330, :zzz
-          tz.offset :o7, 11224, -360, :zzz
-          tz.offset :o8, 11224, -385, :zzz
-          tz.offset :o9, 11224, -410, :zzz
-          tz.offset :o10, 11224, -435, :zzz
-          tz.offset :o11, 11224, -460, :zzz
-          tz.offset :o12, 11224, -485, :zzz
-          tz.offset :o13, 11224, -505, :zzz
-          tz.offset :o14, 11224, -530, :zzz
-          tz.offset :o15, 11224, -550, :zzz
-          tz.offset :o16, 11224, -570, :zzz
-          tz.offset :o17, 11224, -590, :zzz
-          tz.offset :o18, 11224, -610, :zzz
-          tz.offset :o19, 11224, -630, :zzz
-          tz.offset :o20, 11224, -650, :zzz
-          tz.offset :o21, 11224, -665, :zzz
-          tz.offset :o22, 11224, -685, :zzz
-          tz.offset :o23, 11224, -700, :zzz
-          tz.offset :o24, 11224, -715, :zzz
-          tz.offset :o25, 11224, -730, :zzz
-          tz.offset :o26, 11224, -745, :zzz
-          tz.offset :o27, 11224, -760, :zzz
-          tz.offset :o28, 11224, -770, :zzz
-          tz.offset :o29, 11224, -780, :zzz
-          tz.offset :o30, 11224, -790, :zzz
-          tz.offset :o31, 11224, -800, :zzz
-          tz.offset :o32, 11224, -810, :zzz
-          tz.offset :o33, 11224, -820, :zzz
-          tz.offset :o34, 11224, -825, :zzz
-          tz.offset :o35, 11224, -835, :zzz
-          tz.offset :o36, 11224, -840, :zzz
-          tz.offset :o37, 11224, -845, :zzz
-          tz.offset :o38, 11224, -850, :zzz
-          tz.offset :o39, 11224, -855, :zzz
-          tz.offset :o40, 11224, -830, :zzz
-          tz.offset :o41, 11224, -795, :zzz
-          tz.offset :o42, 11224, -785, :zzz
-          tz.offset :o43, 11224, -775, :zzz
-          tz.offset :o44, 11224, -765, :zzz
-          tz.offset :o45, 11224, -750, :zzz
-          tz.offset :o46, 11224, -740, :zzz
-          tz.offset :o47, 11224, -705, :zzz
-          tz.offset :o48, 11224, -690, :zzz
-          tz.offset :o49, 11224, -675, :zzz
-          tz.offset :o50, 11224, -660, :zzz
-          tz.offset :o51, 11224, -645, :zzz
-          tz.offset :o52, 11224, -615, :zzz
-          tz.offset :o53, 11224, -600, :zzz
-          tz.offset :o54, 11224, -585, :zzz
-          tz.offset :o55, 11224, -535, :zzz
-          tz.offset :o56, 11224, -520, :zzz
-          tz.offset :o57, 11224, -500, :zzz
-          tz.offset :o58, 11224, -465, :zzz
-          tz.offset :o59, 11224, -450, :zzz
-          tz.offset :o60, 11224, -430, :zzz
-          tz.offset :o61, 11224, -395, :zzz
-          tz.offset :o62, 11224, -375, :zzz
-          tz.offset :o63, 11224, -340, :zzz
-          tz.offset :o64, 11224, -320, :zzz
-          tz.offset :o65, 11224, -285, :zzz
-          tz.offset :o66, 11224, -265, :zzz
-          tz.offset :o67, 11224, -230, :zzz
-          tz.offset :o68, 11224, -215, :zzz
-          tz.offset :o69, 11224, -180, :zzz
-          tz.offset :o70, 11224, -160, :zzz
-          tz.offset :o71, 11224, -145, :zzz
-          tz.offset :o72, 11224, -125, :zzz
-          tz.offset :o73, 11224, -110, :zzz
-          tz.offset :o74, 11224, -95, :zzz
-          tz.offset :o75, 11224, -75, :zzz
-          tz.offset :o76, 11224, -60, :zzz
-          tz.offset :o77, 11224, -45, :zzz
-          tz.offset :o78, 11224, -30, :zzz
-          tz.offset :o79, 11224, -15, :zzz
-          tz.offset :o80, 11224, 15, :zzz
-          tz.offset :o81, 11224, 30, :zzz
-          tz.offset :o82, 11224, 40, :zzz
-          tz.offset :o83, 11224, 55, :zzz
-          tz.offset :o84, 11224, 65, :zzz
-          tz.offset :o85, 11224, 80, :zzz
-          tz.offset :o86, 11224, 90, :zzz
-          tz.offset :o87, 11224, 105, :zzz
-          tz.offset :o88, 11224, 115, :zzz
-          tz.offset :o89, 11224, 125, :zzz
-          tz.offset :o90, 11224, 135, :zzz
-          tz.offset :o91, 11224, 145, :zzz
-          tz.offset :o92, 11224, 150, :zzz
-          tz.offset :o93, 11224, 160, :zzz
-          tz.offset :o94, 11224, 170, :zzz
-          tz.offset :o95, 11224, 175, :zzz
-          tz.offset :o96, 11224, 185, :zzz
-          tz.offset :o97, 11224, 190, :zzz
-          tz.offset :o98, 11224, 195, :zzz
-          tz.offset :o99, 11224, 200, :zzz
-          tz.offset :o100, 11224, 205, :zzz
-          tz.offset :o101, 11224, 210, :zzz
-          tz.offset :o102, 11224, 215, :zzz
-          tz.offset :o103, 11224, 220, :zzz
-          tz.offset :o104, 11224, 180, :zzz
-          tz.offset :o105, 11224, 165, :zzz
-          tz.offset :o106, 11224, 140, :zzz
-          tz.offset :o107, 11224, 130, :zzz
-          tz.offset :o108, 11224, 70, :zzz
-          tz.offset :o109, 11224, 60, :zzz
-          tz.offset :o110, 11224, 45, :zzz
-          tz.offset :o111, 11224, 35, :zzz
-          tz.offset :o112, 11224, 25, :zzz
-          tz.offset :o113, 11224, 10, :zzz
-          tz.offset :o114, 11224, -25, :zzz
-          tz.offset :o115, 11224, -40, :zzz
-          tz.offset :o116, 11224, -55, :zzz
-          tz.offset :o117, 11224, -65, :zzz
-          tz.offset :o118, 11224, -80, :zzz
-          tz.offset :o119, 11224, -90, :zzz
-          tz.offset :o120, 11224, -105, :zzz
-          tz.offset :o121, 11224, -120, :zzz
-          tz.offset :o122, 11224, -130, :zzz
-          tz.offset :o123, 11224, -155, :zzz
-          tz.offset :o124, 11224, -170, :zzz
-          tz.offset :o125, 11224, -205, :zzz
-          tz.offset :o126, 11224, -240, :zzz
-          tz.offset :o127, 11224, -275, :zzz
-          tz.offset :o128, 11224, -295, :zzz
-          tz.offset :o129, 11224, -310, :zzz
-          tz.offset :o130, 11224, -335, :zzz
-          tz.offset :o131, 11224, -345, :zzz
-          tz.offset :o132, 11224, -350, :zzz
-          tz.offset :o133, 11224, -355, :zzz
-          tz.offset :o134, 11224, -365, :zzz
-          tz.offset :o135, 11224, -370, :zzz
-          tz.offset :o136, 11224, -380, :zzz
-          tz.offset :o137, 11224, -390, :zzz
-          tz.offset :o138, 11224, -325, :zzz
-          tz.offset :o139, 11224, -300, :zzz
-          tz.offset :o140, 11224, -290, :zzz
-          tz.offset :o141, 11224, -255, :zzz
-          tz.offset :o142, 11224, -200, :zzz
-          tz.offset :o143, 11224, -185, :zzz
-          tz.offset :o144, 11224, -140, :zzz
-          tz.offset :o145, 11224, -70, :zzz
-          tz.offset :o146, 11224, -50, :zzz
-          tz.offset :o147, 11224, -35, :zzz
-          tz.offset :o148, 11224, 5, :zzz
-          tz.offset :o149, 11224, 100, :zzz
-          tz.offset :o150, 11224, 120, :zzz
-          tz.offset :o151, 11224, 225, :zzz
-          tz.offset :o152, 11224, 250, :zzz
-          tz.offset :o153, 11224, 270, :zzz
-          tz.offset :o154, 11224, 290, :zzz
-          tz.offset :o155, 11224, 310, :zzz
-          tz.offset :o156, 11224, 335, :zzz
-          tz.offset :o157, 11224, 355, :zzz
-          tz.offset :o158, 11224, 375, :zzz
-          tz.offset :o159, 11224, 395, :zzz
-          tz.offset :o160, 11224, 420, :zzz
-          tz.offset :o161, 11224, 440, :zzz
-          tz.offset :o162, 11224, 460, :zzz
-          tz.offset :o163, 11224, 480, :zzz
-          tz.offset :o164, 11224, 500, :zzz
-          tz.offset :o165, 11224, 525, :zzz
-          tz.offset :o166, 11224, 545, :zzz
-          tz.offset :o167, 11224, 565, :zzz
-          tz.offset :o168, 11224, 585, :zzz
-          tz.offset :o169, 11224, 605, :zzz
-          tz.offset :o170, 11224, 625, :zzz
-          tz.offset :o171, 11224, 640, :zzz
-          tz.offset :o172, 11224, 660, :zzz
-          tz.offset :o173, 11224, 680, :zzz
-          tz.offset :o174, 11224, 695, :zzz
-          tz.offset :o175, 11224, 715, :zzz
-          tz.offset :o176, 11224, 730, :zzz
-          tz.offset :o177, 11224, 750, :zzz
-          tz.offset :o178, 11224, 765, :zzz
-          tz.offset :o179, 11224, 780, :zzz
-          tz.offset :o180, 11224, 795, :zzz
-          tz.offset :o181, 11224, 810, :zzz
-          tz.offset :o182, 11224, 825, :zzz
-          tz.offset :o183, 11224, 840, :zzz
-          tz.offset :o184, 11224, 855, :zzz
-          tz.offset :o185, 11224, 865, :zzz
-          tz.offset :o186, 11224, 880, :zzz
-          tz.offset :o187, 11224, 890, :zzz
-          tz.offset :o188, 11224, 900, :zzz
-          tz.offset :o189, 11224, 915, :zzz
-          tz.offset :o190, 11224, 920, :zzz
-          tz.offset :o191, 11224, 930, :zzz
-          tz.offset :o192, 11224, 940, :zzz
-          tz.offset :o193, 11224, 950, :zzz
-          tz.offset :o194, 11224, 955, :zzz
-          tz.offset :o195, 11224, 960, :zzz
-          tz.offset :o196, 11224, 965, :zzz
-          tz.offset :o197, 11224, 970, :zzz
-          tz.offset :o198, 11224, 975, :zzz
-          tz.offset :o199, 11224, 980, :zzz
-          tz.offset :o200, 11224, 985, :zzz
-          tz.offset :o201, 11224, 910, :zzz
-          tz.offset :o202, 11224, 885, :zzz
-          tz.offset :o203, 11224, 875, :zzz
-          tz.offset :o204, 11224, 860, :zzz
-          tz.offset :o205, 11224, 845, :zzz
-          tz.offset :o206, 11224, 830, :zzz
-          tz.offset :o207, 11224, 775, :zzz
-          tz.offset :o208, 11224, 760, :zzz
-          tz.offset :o209, 11224, 740, :zzz
-          tz.offset :o210, 11224, 720, :zzz
-          tz.offset :o211, 11224, 675, :zzz
-          tz.offset :o212, 11224, 655, :zzz
-          tz.offset :o213, 11224, 630, :zzz
-          tz.offset :o214, 11224, 560, :zzz
-          tz.offset :o215, 11224, 535, :zzz
-          tz.offset :o216, 11224, 505, :zzz
-          tz.offset :o217, 11224, 455, :zzz
-          tz.offset :o218, 11224, 425, :zzz
-          tz.offset :o219, 11224, 400, :zzz
-          tz.offset :o220, 11224, 370, :zzz
-          tz.offset :o221, 11224, 345, :zzz
-          tz.offset :o222, 11224, 315, :zzz
-          tz.offset :o223, 11224, 285, :zzz
-          tz.offset :o224, 11224, 255, :zzz
-          tz.offset :o225, 11224, 110, :zzz
-          tz.offset :o226, 11224, 50, :zzz
-          tz.offset :o227, 11224, 20, :zzz
-          tz.offset :o228, 11224, -10, :zzz
-          tz.offset :o229, 11224, -100, :zzz
-          
-          tz.transition 1988, 1, :o1, 568025771
-          tz.transition 1988, 1, :o2, 568112196
-          tz.transition 1988, 1, :o3, 568198626
-          tz.transition 1988, 1, :o4, 568285056
-          tz.transition 1988, 1, :o5, 568371481
-          tz.transition 1988, 1, :o6, 568457906
-          tz.transition 1988, 1, :o7, 568544336
-          tz.transition 1988, 1, :o8, 568630761
-          tz.transition 1988, 1, :o9, 568717186
-          tz.transition 1988, 1, :o10, 568803611
-          tz.transition 1988, 1, :o11, 568890036
-          tz.transition 1988, 1, :o12, 568976461
-          tz.transition 1988, 1, :o13, 569062881
-          tz.transition 1988, 1, :o14, 569149306
-          tz.transition 1988, 1, :o15, 569235726
-          tz.transition 1988, 1, :o16, 569322146
-          tz.transition 1988, 1, :o17, 569408566
-          tz.transition 1988, 1, :o18, 569494986
-          tz.transition 1988, 1, :o19, 569581406
-          tz.transition 1988, 1, :o20, 569667826
-          tz.transition 1988, 1, :o21, 569754241
-          tz.transition 1988, 1, :o22, 569840661
-          tz.transition 1988, 1, :o23, 569927076
-          tz.transition 1988, 1, :o24, 570013491
-          tz.transition 1988, 1, :o25, 570099906
-          tz.transition 1988, 1, :o26, 570186321
-          tz.transition 1988, 1, :o27, 570272736
-          tz.transition 1988, 1, :o28, 570359146
-          tz.transition 1988, 1, :o29, 570445556
-          tz.transition 1988, 1, :o30, 570531966
-          tz.transition 1988, 1, :o31, 570618376
-          tz.transition 1988, 2, :o32, 570704786
-          tz.transition 1988, 2, :o33, 570791196
-          tz.transition 1988, 2, :o34, 570877601
-          tz.transition 1988, 2, :o35, 570964011
-          tz.transition 1988, 2, :o36, 571050416
-          tz.transition 1988, 2, :o37, 571136821
-          tz.transition 1988, 2, :o38, 571223226
-          tz.transition 1988, 2, :o39, 571396031
-          tz.transition 1988, 2, :o38, 571914426
-          tz.transition 1988, 2, :o37, 572087221
-          tz.transition 1988, 2, :o36, 572173616
-          tz.transition 1988, 2, :o35, 572260011
-          tz.transition 1988, 2, :o40, 572346406
-          tz.transition 1988, 2, :o34, 572432801
-          tz.transition 1988, 2, :o33, 572519196
-          tz.transition 1988, 2, :o32, 572605586
-          tz.transition 1988, 2, :o31, 572691976
-          tz.transition 1988, 2, :o41, 572778371
-          tz.transition 1988, 2, :o42, 572864761
-          tz.transition 1988, 2, :o43, 572951151
-          tz.transition 1988, 2, :o44, 573037541
-          tz.transition 1988, 2, :o45, 573123926
-          tz.transition 1988, 3, :o46, 573210316
-          tz.transition 1988, 3, :o25, 573296706
-          tz.transition 1988, 3, :o24, 573383091
-          tz.transition 1988, 3, :o47, 573469481
-          tz.transition 1988, 3, :o48, 573555866
-          tz.transition 1988, 3, :o49, 573642251
-          tz.transition 1988, 3, :o50, 573728636
-          tz.transition 1988, 3, :o51, 573815021
-          tz.transition 1988, 3, :o19, 573901406
-          tz.transition 1988, 3, :o52, 573987791
-          tz.transition 1988, 3, :o53, 574074176
-          tz.transition 1988, 3, :o54, 574160561
-          tz.transition 1988, 3, :o16, 574246946
-          tz.transition 1988, 3, :o15, 574333326
-          tz.transition 1988, 3, :o55, 574419711
-          tz.transition 1988, 3, :o56, 574506096
-          tz.transition 1988, 3, :o57, 574592476
-          tz.transition 1988, 3, :o12, 574678861
-          tz.transition 1988, 3, :o58, 574765241
-          tz.transition 1988, 3, :o59, 574851626
-          tz.transition 1988, 3, :o60, 574938006
-          tz.transition 1988, 3, :o9, 575024386
-          tz.transition 1988, 3, :o61, 575110771
-          tz.transition 1988, 3, :o62, 575197151
-          tz.transition 1988, 3, :o7, 575283536
-          tz.transition 1988, 3, :o63, 575369916
-          tz.transition 1988, 3, :o64, 575456296
-          tz.transition 1988, 3, :o5, 575542681
-          tz.transition 1988, 3, :o65, 575629061
-          tz.transition 1988, 3, :o66, 575715441
-          tz.transition 1988, 3, :o3, 575801826
-          tz.transition 1988, 4, :o67, 575888206
-          tz.transition 1988, 4, :o68, 575974591
-          tz.transition 1988, 4, :o1, 576060971
-          tz.transition 1988, 4, :o69, 576147356
-          tz.transition 1988, 4, :o70, 576233736
-          tz.transition 1988, 4, :o71, 576320121
-          tz.transition 1988, 4, :o72, 576406501
-          tz.transition 1988, 4, :o73, 576492886
-          tz.transition 1988, 4, :o74, 576579271
-          tz.transition 1988, 4, :o75, 576665651
-          tz.transition 1988, 4, :o76, 576752036
-          tz.transition 1988, 4, :o77, 576838421
-          tz.transition 1988, 4, :o78, 576924806
-          tz.transition 1988, 4, :o79, 577011191
-          tz.transition 1988, 4, :o0, 577097576
-          tz.transition 1988, 4, :o80, 577183961
-          tz.transition 1988, 4, :o81, 577270346
-          tz.transition 1988, 4, :o82, 577356736
-          tz.transition 1988, 4, :o83, 577443121
-          tz.transition 1988, 4, :o84, 577529511
-          tz.transition 1988, 4, :o85, 577615896
-          tz.transition 1988, 4, :o86, 577702286
-          tz.transition 1988, 4, :o87, 577788671
-          tz.transition 1988, 4, :o88, 577875061
-          tz.transition 1988, 4, :o89, 577961451
-          tz.transition 1988, 4, :o90, 578047841
-          tz.transition 1988, 4, :o91, 578134231
-          tz.transition 1988, 4, :o92, 578220626
-          tz.transition 1988, 4, :o93, 578307016
-          tz.transition 1988, 4, :o94, 578393406
-          tz.transition 1988, 5, :o95, 578479801
-          tz.transition 1988, 5, :o96, 578566191
-          tz.transition 1988, 5, :o97, 578652586
-          tz.transition 1988, 5, :o98, 578738981
-          tz.transition 1988, 5, :o99, 578825376
-          tz.transition 1988, 5, :o100, 578911771
-          tz.transition 1988, 5, :o101, 578998166
-          tz.transition 1988, 5, :o102, 579084561
-          tz.transition 1988, 5, :o103, 579257356
-          tz.transition 1988, 5, :o102, 579948561
-          tz.transition 1988, 5, :o101, 580121366
-          tz.transition 1988, 5, :o100, 580207771
-          tz.transition 1988, 5, :o99, 580294176
-          tz.transition 1988, 5, :o98, 580380581
-          tz.transition 1988, 5, :o97, 580466986
-          tz.transition 1988, 5, :o96, 580553391
-          tz.transition 1988, 5, :o104, 580639796
-          tz.transition 1988, 5, :o95, 580726201
-          tz.transition 1988, 5, :o105, 580812611
-          tz.transition 1988, 5, :o93, 580899016
-          tz.transition 1988, 5, :o92, 580985426
-          tz.transition 1988, 5, :o106, 581071836
-          tz.transition 1988, 6, :o107, 581158246
-          tz.transition 1988, 6, :o89, 581244651
-          tz.transition 1988, 6, :o88, 581331061
-          tz.transition 1988, 6, :o87, 581417471
-          tz.transition 1988, 6, :o86, 581503886
-          tz.transition 1988, 6, :o85, 581590296
-          tz.transition 1988, 6, :o108, 581676706
-          tz.transition 1988, 6, :o109, 581763116
-          tz.transition 1988, 6, :o110, 581849531
-          tz.transition 1988, 6, :o111, 581935941
-          tz.transition 1988, 6, :o112, 582022351
-          tz.transition 1988, 6, :o113, 582108766
-          tz.transition 1988, 6, :o0, 582195176
-          tz.transition 1988, 6, :o79, 582281591
-          tz.transition 1988, 6, :o114, 582368001
-          tz.transition 1988, 6, :o115, 582454416
-          tz.transition 1988, 6, :o116, 582540831
-          tz.transition 1988, 6, :o117, 582627241
-          tz.transition 1988, 6, :o118, 582713656
-          tz.transition 1988, 6, :o119, 582800066
-          tz.transition 1988, 6, :o120, 582886481
-          tz.transition 1988, 6, :o121, 582972896
-          tz.transition 1988, 6, :o122, 583059306
-          tz.transition 1988, 6, :o71, 583145721
-          tz.transition 1988, 6, :o123, 583232131
-          tz.transition 1988, 6, :o124, 583318546
-          tz.transition 1988, 6, :o69, 583404956
-          tz.transition 1988, 6, :o1, 583491371
-          tz.transition 1988, 6, :o125, 583577781
-          tz.transition 1988, 6, :o2, 583664196
-          tz.transition 1988, 7, :o67, 583750606
-          tz.transition 1988, 7, :o126, 583837016
-          tz.transition 1988, 7, :o3, 583923426
-          tz.transition 1988, 7, :o66, 584009841
-          tz.transition 1988, 7, :o127, 584096251
-          tz.transition 1988, 7, :o65, 584182661
-          tz.transition 1988, 7, :o128, 584269071
-          tz.transition 1988, 7, :o5, 584355481
-          tz.transition 1988, 7, :o129, 584441886
-          tz.transition 1988, 7, :o64, 584528296
-          tz.transition 1988, 7, :o6, 584614706
-          tz.transition 1988, 7, :o130, 584701111
-          tz.transition 1988, 7, :o131, 584787521
-          tz.transition 1988, 7, :o132, 584873926
-          tz.transition 1988, 7, :o133, 584960331
-          tz.transition 1988, 7, :o7, 585046736
-          tz.transition 1988, 7, :o134, 585133141
-          tz.transition 1988, 7, :o135, 585219546
-          tz.transition 1988, 7, :o62, 585305951
-          tz.transition 1988, 7, :o136, 585392356
-          tz.transition 1988, 7, :o8, 585478761
-          tz.transition 1988, 7, :o137, 585737966
-          tz.transition 1988, 7, :o8, 586169961
-          tz.transition 1988, 7, :o136, 586342756
-          tz.transition 1988, 8, :o62, 586429151
-          tz.transition 1988, 8, :o135, 586601946
-          tz.transition 1988, 8, :o134, 586688341
-          tz.transition 1988, 8, :o133, 586774731
-          tz.transition 1988, 8, :o132, 586861126
-          tz.transition 1988, 8, :o131, 586947521
-          tz.transition 1988, 8, :o130, 587033911
-          tz.transition 1988, 8, :o138, 587120301
-          tz.transition 1988, 8, :o64, 587206696
-          tz.transition 1988, 8, :o129, 587293086
-          tz.transition 1988, 8, :o139, 587379476
-          tz.transition 1988, 8, :o140, 587465866
-          tz.transition 1988, 8, :o127, 587552251
-          tz.transition 1988, 8, :o66, 587638641
-          tz.transition 1988, 8, :o141, 587725031
-          tz.transition 1988, 8, :o126, 587811416
-          tz.transition 1988, 8, :o67, 587897806
-          tz.transition 1988, 8, :o68, 587984191
-          tz.transition 1988, 8, :o142, 588070576
-          tz.transition 1988, 8, :o143, 588156961
-          tz.transition 1988, 8, :o124, 588243346
-          tz.transition 1988, 8, :o123, 588329731
-          tz.transition 1988, 8, :o144, 588416116
-          tz.transition 1988, 8, :o121, 588502496
-          tz.transition 1988, 8, :o120, 588588881
-          tz.transition 1988, 8, :o119, 588675266
-          tz.transition 1988, 8, :o145, 588761646
-          tz.transition 1988, 8, :o146, 588848026
-          tz.transition 1988, 8, :o147, 588934411
-          tz.transition 1988, 8, :o79, 589020791
-          tz.transition 1988, 9, :o148, 589107171
-          tz.transition 1988, 9, :o112, 589193551
-          tz.transition 1988, 9, :o82, 589279936
-          tz.transition 1988, 9, :o109, 589366316
-          tz.transition 1988, 9, :o85, 589452696
-          tz.transition 1988, 9, :o149, 589539076
-          tz.transition 1988, 9, :o150, 589625456
-          tz.transition 1988, 9, :o91, 589711831
-          tz.transition 1988, 9, :o105, 589798211
-          tz.transition 1988, 9, :o96, 589884591
-          tz.transition 1988, 9, :o100, 589970971
-          tz.transition 1988, 9, :o151, 590057351
-          tz.transition 1988, 9, :o152, 590143726
-          tz.transition 1988, 9, :o153, 590230106
-          tz.transition 1988, 9, :o154, 590316486
-          tz.transition 1988, 9, :o155, 590402866
-          tz.transition 1988, 9, :o156, 590489241
-          tz.transition 1988, 9, :o157, 590575621
-          tz.transition 1988, 9, :o158, 590662001
-          tz.transition 1988, 9, :o159, 590748381
-          tz.transition 1988, 9, :o160, 590834756
-          tz.transition 1988, 9, :o161, 590921136
-          tz.transition 1988, 9, :o162, 591007516
-          tz.transition 1988, 9, :o163, 591093896
-          tz.transition 1988, 9, :o164, 591180276
-          tz.transition 1988, 9, :o165, 591266651
-          tz.transition 1988, 9, :o166, 591353031
-          tz.transition 1988, 9, :o167, 591439411
-          tz.transition 1988, 9, :o168, 591525791
-          tz.transition 1988, 9, :o169, 591612171
-          tz.transition 1988, 10, :o170, 591698551
-          tz.transition 1988, 10, :o171, 591784936
-          tz.transition 1988, 10, :o172, 591871316
-          tz.transition 1988, 10, :o173, 591957696
-          tz.transition 1988, 10, :o174, 592044081
-          tz.transition 1988, 10, :o175, 592130461
-          tz.transition 1988, 10, :o176, 592216846
-          tz.transition 1988, 10, :o177, 592303226
-          tz.transition 1988, 10, :o178, 592389611
-          tz.transition 1988, 10, :o179, 592475996
-          tz.transition 1988, 10, :o180, 592562381
-          tz.transition 1988, 10, :o181, 592648766
-          tz.transition 1988, 10, :o182, 592735151
-          tz.transition 1988, 10, :o183, 592821536
-          tz.transition 1988, 10, :o184, 592907921
-          tz.transition 1988, 10, :o185, 592994311
-          tz.transition 1988, 10, :o186, 593080696
-          tz.transition 1988, 10, :o187, 593167086
-          tz.transition 1988, 10, :o188, 593253476
-          tz.transition 1988, 10, :o189, 593339861
-          tz.transition 1988, 10, :o190, 593426256
-          tz.transition 1988, 10, :o191, 593512646
-          tz.transition 1988, 10, :o192, 593599036
-          tz.transition 1988, 10, :o193, 593685426
-          tz.transition 1988, 10, :o194, 593771821
-          tz.transition 1988, 10, :o195, 593858216
-          tz.transition 1988, 10, :o196, 593944611
-          tz.transition 1988, 10, :o197, 594031006
-          tz.transition 1988, 10, :o198, 594117401
-          tz.transition 1988, 10, :o199, 594203796
-          tz.transition 1988, 11, :o200, 594376591
-          tz.transition 1988, 11, :o199, 594722196
-          tz.transition 1988, 11, :o198, 594895001
-          tz.transition 1988, 11, :o197, 595067806
-          tz.transition 1988, 11, :o195, 595154216
-          tz.transition 1988, 11, :o194, 595240621
-          tz.transition 1988, 11, :o193, 595327026
-          tz.transition 1988, 11, :o192, 595413436
-          tz.transition 1988, 11, :o191, 595499846
-          tz.transition 1988, 11, :o190, 595586256
-          tz.transition 1988, 11, :o201, 595672666
-          tz.transition 1988, 11, :o188, 595759076
-          tz.transition 1988, 11, :o202, 595845491
-          tz.transition 1988, 11, :o203, 595931901
-          tz.transition 1988, 11, :o204, 596018316
-          tz.transition 1988, 11, :o205, 596104731
-          tz.transition 1988, 11, :o206, 596191146
-          tz.transition 1988, 11, :o181, 596277566
-          tz.transition 1988, 11, :o180, 596363981
-          tz.transition 1988, 11, :o207, 596450401
-          tz.transition 1988, 11, :o208, 596536816
-          tz.transition 1988, 11, :o209, 596623236
-          tz.transition 1988, 11, :o210, 596709656
-          tz.transition 1988, 11, :o174, 596796081
-          tz.transition 1988, 11, :o211, 596882501
-          tz.transition 1988, 12, :o212, 596968921
-          tz.transition 1988, 12, :o213, 597055346
-          tz.transition 1988, 12, :o169, 597141771
-          tz.transition 1988, 12, :o168, 597228191
-          tz.transition 1988, 12, :o214, 597314616
-          tz.transition 1988, 12, :o215, 597401041
-          tz.transition 1988, 12, :o216, 597487471
-          tz.transition 1988, 12, :o163, 597573896
-          tz.transition 1988, 12, :o217, 597660321
-          tz.transition 1988, 12, :o218, 597746751
-          tz.transition 1988, 12, :o219, 597833176
-          tz.transition 1988, 12, :o220, 597919606
-          tz.transition 1988, 12, :o221, 598006031
-          tz.transition 1988, 12, :o222, 598092461
-          tz.transition 1988, 12, :o223, 598178891
-          tz.transition 1988, 12, :o224, 598265321
-          tz.transition 1988, 12, :o151, 598351751
-          tz.transition 1988, 12, :o99, 598438176
-          tz.transition 1988, 12, :o94, 598524606
-          tz.transition 1988, 12, :o106, 598611036
-          tz.transition 1988, 12, :o225, 598697466
-          tz.transition 1988, 12, :o85, 598783896
-          tz.transition 1988, 12, :o226, 598870326
-          tz.transition 1988, 12, :o227, 598956756
-          tz.transition 1988, 12, :o228, 599043186
-          tz.transition 1988, 12, :o115, 599129616
-          tz.transition 1988, 12, :o145, 599216046
-          tz.transition 1988, 12, :o229, 599302476
-          tz.transition 1988, 12, :o122, 599388906
-          tz.transition 1988, 12, :o123, 599475331
-          tz.transition 1988, 12, :o143, 599561761
-          tz.transition 1988, 12, :o0, 599604961
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh89.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh89.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh89.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Riyadh89.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,582 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Riyadh89
-        include TimezoneDefinition
-        
-        timezone 'Asia/Riyadh89' do |tz|
-          tz.offset :o0, 11224, 0, :zzz
-          tz.offset :o1, 11224, -215, :zzz
-          tz.offset :o2, 11224, -245, :zzz
-          tz.offset :o3, 11224, -270, :zzz
-          tz.offset :o4, 11224, -300, :zzz
-          tz.offset :o5, 11224, -325, :zzz
-          tz.offset :o6, 11224, -350, :zzz
-          tz.offset :o7, 11224, -375, :zzz
-          tz.offset :o8, 11224, -405, :zzz
-          tz.offset :o9, 11224, -430, :zzz
-          tz.offset :o10, 11224, -455, :zzz
-          tz.offset :o11, 11224, -475, :zzz
-          tz.offset :o12, 11224, -500, :zzz
-          tz.offset :o13, 11224, -525, :zzz
-          tz.offset :o14, 11224, -545, :zzz
-          tz.offset :o15, 11224, -565, :zzz
-          tz.offset :o16, 11224, -585, :zzz
-          tz.offset :o17, 11224, -605, :zzz
-          tz.offset :o18, 11224, -625, :zzz
-          tz.offset :o19, 11224, -645, :zzz
-          tz.offset :o20, 11224, -665, :zzz
-          tz.offset :o21, 11224, -680, :zzz
-          tz.offset :o22, 11224, -695, :zzz
-          tz.offset :o23, 11224, -715, :zzz
-          tz.offset :o24, 11224, -730, :zzz
-          tz.offset :o25, 11224, -740, :zzz
-          tz.offset :o26, 11224, -755, :zzz
-          tz.offset :o27, 11224, -770, :zzz
-          tz.offset :o28, 11224, -780, :zzz
-          tz.offset :o29, 11224, -790, :zzz
-          tz.offset :o30, 11224, -800, :zzz
-          tz.offset :o31, 11224, -810, :zzz
-          tz.offset :o32, 11224, -820, :zzz
-          tz.offset :o33, 11224, -825, :zzz
-          tz.offset :o34, 11224, -835, :zzz
-          tz.offset :o35, 11224, -840, :zzz
-          tz.offset :o36, 11224, -845, :zzz
-          tz.offset :o37, 11224, -850, :zzz
-          tz.offset :o38, 11224, -855, :zzz
-          tz.offset :o39, 11224, -860, :zzz
-          tz.offset :o40, 11224, -830, :zzz
-          tz.offset :o41, 11224, -815, :zzz
-          tz.offset :o42, 11224, -805, :zzz
-          tz.offset :o43, 11224, -795, :zzz
-          tz.offset :o44, 11224, -785, :zzz
-          tz.offset :o45, 11224, -775, :zzz
-          tz.offset :o46, 11224, -765, :zzz
-          tz.offset :o47, 11224, -745, :zzz
-          tz.offset :o48, 11224, -720, :zzz
-          tz.offset :o49, 11224, -705, :zzz
-          tz.offset :o50, 11224, -650, :zzz
-          tz.offset :o51, 11224, -635, :zzz
-          tz.offset :o52, 11224, -620, :zzz
-          tz.offset :o53, 11224, -590, :zzz
-          tz.offset :o54, 11224, -570, :zzz
-          tz.offset :o55, 11224, -555, :zzz
-          tz.offset :o56, 11224, -540, :zzz
-          tz.offset :o57, 11224, -520, :zzz
-          tz.offset :o58, 11224, -505, :zzz
-          tz.offset :o59, 11224, -485, :zzz
-          tz.offset :o60, 11224, -470, :zzz
-          tz.offset :o61, 11224, -450, :zzz
-          tz.offset :o62, 11224, -435, :zzz
-          tz.offset :o63, 11224, -415, :zzz
-          tz.offset :o64, 11224, -395, :zzz
-          tz.offset :o65, 11224, -380, :zzz
-          tz.offset :o66, 11224, -360, :zzz
-          tz.offset :o67, 11224, -340, :zzz
-          tz.offset :o68, 11224, -305, :zzz
-          tz.offset :o69, 11224, -290, :zzz
-          tz.offset :o70, 11224, -250, :zzz
-          tz.offset :o71, 11224, -235, :zzz
-          tz.offset :o72, 11224, -200, :zzz
-          tz.offset :o73, 11224, -180, :zzz
-          tz.offset :o74, 11224, -165, :zzz
-          tz.offset :o75, 11224, -145, :zzz
-          tz.offset :o76, 11224, -130, :zzz
-          tz.offset :o77, 11224, -110, :zzz
-          tz.offset :o78, 11224, -95, :zzz
-          tz.offset :o79, 11224, -80, :zzz
-          tz.offset :o80, 11224, -65, :zzz
-          tz.offset :o81, 11224, -50, :zzz
-          tz.offset :o82, 11224, -35, :zzz
-          tz.offset :o83, 11224, -20, :zzz
-          tz.offset :o84, 11224, -5, :zzz
-          tz.offset :o85, 11224, 10, :zzz
-          tz.offset :o86, 11224, 25, :zzz
-          tz.offset :o87, 11224, 40, :zzz
-          tz.offset :o88, 11224, 50, :zzz
-          tz.offset :o89, 11224, 65, :zzz
-          tz.offset :o90, 11224, 75, :zzz
-          tz.offset :o91, 11224, 90, :zzz
-          tz.offset :o92, 11224, 100, :zzz
-          tz.offset :o93, 11224, 110, :zzz
-          tz.offset :o94, 11224, 120, :zzz
-          tz.offset :o95, 11224, 130, :zzz
-          tz.offset :o96, 11224, 140, :zzz
-          tz.offset :o97, 11224, 150, :zzz
-          tz.offset :o98, 11224, 160, :zzz
-          tz.offset :o99, 11224, 165, :zzz
-          tz.offset :o100, 11224, 175, :zzz
-          tz.offset :o101, 11224, 180, :zzz
-          tz.offset :o102, 11224, 190, :zzz
-          tz.offset :o103, 11224, 195, :zzz
-          tz.offset :o104, 11224, 200, :zzz
-          tz.offset :o105, 11224, 205, :zzz
-          tz.offset :o106, 11224, 210, :zzz
-          tz.offset :o107, 11224, 215, :zzz
-          tz.offset :o108, 11224, 220, :zzz
-          tz.offset :o109, 11224, 185, :zzz
-          tz.offset :o110, 11224, 145, :zzz
-          tz.offset :o111, 11224, 135, :zzz
-          tz.offset :o112, 11224, 125, :zzz
-          tz.offset :o113, 11224, 115, :zzz
-          tz.offset :o114, 11224, 105, :zzz
-          tz.offset :o115, 11224, 95, :zzz
-          tz.offset :o116, 11224, 85, :zzz
-          tz.offset :o117, 11224, 60, :zzz
-          tz.offset :o118, 11224, 15, :zzz
-          tz.offset :o119, 11224, -10, :zzz
-          tz.offset :o120, 11224, -25, :zzz
-          tz.offset :o121, 11224, -75, :zzz
-          tz.offset :o122, 11224, -90, :zzz
-          tz.offset :o123, 11224, -100, :zzz
-          tz.offset :o124, 11224, -115, :zzz
-          tz.offset :o125, 11224, -140, :zzz
-          tz.offset :o126, 11224, -155, :zzz
-          tz.offset :o127, 11224, -190, :zzz
-          tz.offset :o128, 11224, -205, :zzz
-          tz.offset :o129, 11224, -225, :zzz
-          tz.offset :o130, 11224, -240, :zzz
-          tz.offset :o131, 11224, -260, :zzz
-          tz.offset :o132, 11224, -280, :zzz
-          tz.offset :o133, 11224, -310, :zzz
-          tz.offset :o134, 11224, -320, :zzz
-          tz.offset :o135, 11224, -335, :zzz
-          tz.offset :o136, 11224, -355, :zzz
-          tz.offset :o137, 11224, -365, :zzz
-          tz.offset :o138, 11224, -370, :zzz
-          tz.offset :o139, 11224, -385, :zzz
-          tz.offset :o140, 11224, -390, :zzz
-          tz.offset :o141, 11224, -345, :zzz
-          tz.offset :o142, 11224, -330, :zzz
-          tz.offset :o143, 11224, -255, :zzz
-          tz.offset :o144, 11224, -230, :zzz
-          tz.offset :o145, 11224, -175, :zzz
-          tz.offset :o146, 11224, -160, :zzz
-          tz.offset :o147, 11224, -125, :zzz
-          tz.offset :o148, 11224, -55, :zzz
-          tz.offset :o149, 11224, -40, :zzz
-          tz.offset :o150, 11224, 35, :zzz
-          tz.offset :o151, 11224, 55, :zzz
-          tz.offset :o152, 11224, 240, :zzz
-          tz.offset :o153, 11224, 265, :zzz
-          tz.offset :o154, 11224, 285, :zzz
-          tz.offset :o155, 11224, 305, :zzz
-          tz.offset :o156, 11224, 325, :zzz
-          tz.offset :o157, 11224, 350, :zzz
-          tz.offset :o158, 11224, 370, :zzz
-          tz.offset :o159, 11224, 390, :zzz
-          tz.offset :o160, 11224, 410, :zzz
-          tz.offset :o161, 11224, 435, :zzz
-          tz.offset :o162, 11224, 455, :zzz
-          tz.offset :o163, 11224, 475, :zzz
-          tz.offset :o164, 11224, 495, :zzz
-          tz.offset :o165, 11224, 515, :zzz
-          tz.offset :o166, 11224, 535, :zzz
-          tz.offset :o167, 11224, 560, :zzz
-          tz.offset :o168, 11224, 580, :zzz
-          tz.offset :o169, 11224, 600, :zzz
-          tz.offset :o170, 11224, 615, :zzz
-          tz.offset :o171, 11224, 635, :zzz
-          tz.offset :o172, 11224, 655, :zzz
-          tz.offset :o173, 11224, 675, :zzz
-          tz.offset :o174, 11224, 690, :zzz
-          tz.offset :o175, 11224, 710, :zzz
-          tz.offset :o176, 11224, 730, :zzz
-          tz.offset :o177, 11224, 745, :zzz
-          tz.offset :o178, 11224, 760, :zzz
-          tz.offset :o179, 11224, 780, :zzz
-          tz.offset :o180, 11224, 795, :zzz
-          tz.offset :o181, 11224, 810, :zzz
-          tz.offset :o182, 11224, 825, :zzz
-          tz.offset :o183, 11224, 840, :zzz
-          tz.offset :o184, 11224, 850, :zzz
-          tz.offset :o185, 11224, 865, :zzz
-          tz.offset :o186, 11224, 880, :zzz
-          tz.offset :o187, 11224, 890, :zzz
-          tz.offset :o188, 11224, 900, :zzz
-          tz.offset :o189, 11224, 910, :zzz
-          tz.offset :o190, 11224, 920, :zzz
-          tz.offset :o191, 11224, 930, :zzz
-          tz.offset :o192, 11224, 940, :zzz
-          tz.offset :o193, 11224, 950, :zzz
-          tz.offset :o194, 11224, 955, :zzz
-          tz.offset :o195, 11224, 960, :zzz
-          tz.offset :o196, 11224, 970, :zzz
-          tz.offset :o197, 11224, 975, :zzz
-          tz.offset :o198, 11224, 980, :zzz
-          tz.offset :o199, 11224, 985, :zzz
-          tz.offset :o200, 11224, 990, :zzz
-          tz.offset :o201, 11224, 965, :zzz
-          tz.offset :o202, 11224, 945, :zzz
-          tz.offset :o203, 11224, 935, :zzz
-          tz.offset :o204, 11224, 925, :zzz
-          tz.offset :o205, 11224, 915, :zzz
-          tz.offset :o206, 11224, 905, :zzz
-          tz.offset :o207, 11224, 835, :zzz
-          tz.offset :o208, 11224, 815, :zzz
-          tz.offset :o209, 11224, 800, :zzz
-          tz.offset :o210, 11224, 725, :zzz
-          tz.offset :o211, 11224, 700, :zzz
-          tz.offset :o212, 11224, 680, :zzz
-          tz.offset :o213, 11224, 660, :zzz
-          tz.offset :o214, 11224, 610, :zzz
-          tz.offset :o215, 11224, 585, :zzz
-          tz.offset :o216, 11224, 565, :zzz
-          tz.offset :o217, 11224, 540, :zzz
-          tz.offset :o218, 11224, 510, :zzz
-          tz.offset :o219, 11224, 485, :zzz
-          tz.offset :o220, 11224, 460, :zzz
-          tz.offset :o221, 11224, 430, :zzz
-          tz.offset :o222, 11224, 405, :zzz
-          tz.offset :o223, 11224, 375, :zzz
-          tz.offset :o224, 11224, 320, :zzz
-          tz.offset :o225, 11224, 290, :zzz
-          tz.offset :o226, 11224, 260, :zzz
-          tz.offset :o227, 11224, 235, :zzz
-          tz.offset :o228, 11224, -120, :zzz
-          tz.offset :o229, 11224, -150, :zzz
-          
-          tz.transition 1989, 1, :o1, 599648191
-          tz.transition 1989, 1, :o2, 599734621
-          tz.transition 1989, 1, :o3, 599821046
-          tz.transition 1989, 1, :o4, 599907476
-          tz.transition 1989, 1, :o5, 599993901
-          tz.transition 1989, 1, :o6, 600080326
-          tz.transition 1989, 1, :o7, 600166751
-          tz.transition 1989, 1, :o8, 600253181
-          tz.transition 1989, 1, :o9, 600339606
-          tz.transition 1989, 1, :o10, 600426031
-          tz.transition 1989, 1, :o11, 600512451
-          tz.transition 1989, 1, :o12, 600598876
-          tz.transition 1989, 1, :o13, 600685301
-          tz.transition 1989, 1, :o14, 600771721
-          tz.transition 1989, 1, :o15, 600858141
-          tz.transition 1989, 1, :o16, 600944561
-          tz.transition 1989, 1, :o17, 601030981
-          tz.transition 1989, 1, :o18, 601117401
-          tz.transition 1989, 1, :o19, 601203821
-          tz.transition 1989, 1, :o20, 601290241
-          tz.transition 1989, 1, :o21, 601376656
-          tz.transition 1989, 1, :o22, 601463071
-          tz.transition 1989, 1, :o23, 601549491
-          tz.transition 1989, 1, :o24, 601635906
-          tz.transition 1989, 1, :o25, 601722316
-          tz.transition 1989, 1, :o26, 601808731
-          tz.transition 1989, 1, :o27, 601895146
-          tz.transition 1989, 1, :o28, 601981556
-          tz.transition 1989, 1, :o29, 602067966
-          tz.transition 1989, 1, :o30, 602154376
-          tz.transition 1989, 1, :o31, 602240786
-          tz.transition 1989, 2, :o32, 602327196
-          tz.transition 1989, 2, :o33, 602413601
-          tz.transition 1989, 2, :o34, 602500011
-          tz.transition 1989, 2, :o35, 602586416
-          tz.transition 1989, 2, :o36, 602672821
-          tz.transition 1989, 2, :o37, 602759226
-          tz.transition 1989, 2, :o38, 602932031
-          tz.transition 1989, 2, :o39, 603104836
-          tz.transition 1989, 2, :o38, 603364031
-          tz.transition 1989, 2, :o37, 603536826
-          tz.transition 1989, 2, :o36, 603709621
-          tz.transition 1989, 2, :o35, 603796016
-          tz.transition 1989, 2, :o34, 603882411
-          tz.transition 1989, 2, :o40, 603968806
-          tz.transition 1989, 2, :o32, 604055196
-          tz.transition 1989, 2, :o41, 604141591
-          tz.transition 1989, 2, :o42, 604227981
-          tz.transition 1989, 2, :o43, 604314371
-          tz.transition 1989, 2, :o44, 604400761
-          tz.transition 1989, 2, :o45, 604487151
-          tz.transition 1989, 2, :o46, 604573541
-          tz.transition 1989, 2, :o26, 604659931
-          tz.transition 1989, 3, :o47, 604746321
-          tz.transition 1989, 3, :o24, 604832706
-          tz.transition 1989, 3, :o48, 604919096
-          tz.transition 1989, 3, :o49, 605005481
-          tz.transition 1989, 3, :o22, 605091871
-          tz.transition 1989, 3, :o21, 605178256
-          tz.transition 1989, 3, :o20, 605264641
-          tz.transition 1989, 3, :o50, 605351026
-          tz.transition 1989, 3, :o51, 605437411
-          tz.transition 1989, 3, :o52, 605523796
-          tz.transition 1989, 3, :o17, 605610181
-          tz.transition 1989, 3, :o53, 605696566
-          tz.transition 1989, 3, :o54, 605782946
-          tz.transition 1989, 3, :o55, 605869331
-          tz.transition 1989, 3, :o56, 605955716
-          tz.transition 1989, 3, :o57, 606042096
-          tz.transition 1989, 3, :o58, 606128481
-          tz.transition 1989, 3, :o59, 606214861
-          tz.transition 1989, 3, :o60, 606301246
-          tz.transition 1989, 3, :o61, 606387626
-          tz.transition 1989, 3, :o62, 606474011
-          tz.transition 1989, 3, :o63, 606560391
-          tz.transition 1989, 3, :o64, 606646771
-          tz.transition 1989, 3, :o65, 606733156
-          tz.transition 1989, 3, :o66, 606819536
-          tz.transition 1989, 3, :o67, 606905916
-          tz.transition 1989, 3, :o5, 606992301
-          tz.transition 1989, 3, :o68, 607078681
-          tz.transition 1989, 3, :o69, 607165066
-          tz.transition 1989, 3, :o3, 607251446
-          tz.transition 1989, 3, :o70, 607337826
-          tz.transition 1989, 4, :o71, 607424211
-          tz.transition 1989, 4, :o1, 607510591
-          tz.transition 1989, 4, :o72, 607596976
-          tz.transition 1989, 4, :o73, 607683356
-          tz.transition 1989, 4, :o74, 607769741
-          tz.transition 1989, 4, :o75, 607856121
-          tz.transition 1989, 4, :o76, 607942506
-          tz.transition 1989, 4, :o77, 608028886
-          tz.transition 1989, 4, :o78, 608115271
-          tz.transition 1989, 4, :o79, 608201656
-          tz.transition 1989, 4, :o80, 608288041
-          tz.transition 1989, 4, :o81, 608374426
-          tz.transition 1989, 4, :o82, 608460811
-          tz.transition 1989, 4, :o83, 608547196
-          tz.transition 1989, 4, :o84, 608633581
-          tz.transition 1989, 4, :o85, 608719966
-          tz.transition 1989, 4, :o86, 608806351
-          tz.transition 1989, 4, :o87, 608892736
-          tz.transition 1989, 4, :o88, 608979126
-          tz.transition 1989, 4, :o89, 609065511
-          tz.transition 1989, 4, :o90, 609151901
-          tz.transition 1989, 4, :o91, 609238286
-          tz.transition 1989, 4, :o92, 609324676
-          tz.transition 1989, 4, :o93, 609411066
-          tz.transition 1989, 4, :o94, 609497456
-          tz.transition 1989, 4, :o95, 609583846
-          tz.transition 1989, 4, :o96, 609670236
-          tz.transition 1989, 4, :o97, 609756626
-          tz.transition 1989, 4, :o98, 609843016
-          tz.transition 1989, 4, :o99, 609929411
-          tz.transition 1989, 5, :o100, 610015801
-          tz.transition 1989, 5, :o101, 610102196
-          tz.transition 1989, 5, :o102, 610188586
-          tz.transition 1989, 5, :o103, 610274981
-          tz.transition 1989, 5, :o104, 610361376
-          tz.transition 1989, 5, :o105, 610447771
-          tz.transition 1989, 5, :o106, 610534166
-          tz.transition 1989, 5, :o107, 610706961
-          tz.transition 1989, 5, :o108, 610879756
-          tz.transition 1989, 5, :o107, 611484561
-          tz.transition 1989, 5, :o106, 611657366
-          tz.transition 1989, 5, :o105, 611743771
-          tz.transition 1989, 5, :o104, 611916576
-          tz.transition 1989, 5, :o103, 612002981
-          tz.transition 1989, 5, :o109, 612089391
-          tz.transition 1989, 5, :o101, 612175796
-          tz.transition 1989, 5, :o100, 612262201
-          tz.transition 1989, 5, :o99, 612348611
-          tz.transition 1989, 5, :o98, 612435016
-          tz.transition 1989, 5, :o97, 612521426
-          tz.transition 1989, 5, :o110, 612607831
-          tz.transition 1989, 6, :o111, 612694241
-          tz.transition 1989, 6, :o112, 612780651
-          tz.transition 1989, 6, :o113, 612867061
-          tz.transition 1989, 6, :o114, 612953471
-          tz.transition 1989, 6, :o115, 613039881
-          tz.transition 1989, 6, :o116, 613126291
-          tz.transition 1989, 6, :o90, 613212701
-          tz.transition 1989, 6, :o117, 613299116
-          tz.transition 1989, 6, :o88, 613385526
-          tz.transition 1989, 6, :o87, 613471936
-          tz.transition 1989, 6, :o86, 613558351
-          tz.transition 1989, 6, :o118, 613644761
-          tz.transition 1989, 6, :o0, 613731176
-          tz.transition 1989, 6, :o119, 613817586
-          tz.transition 1989, 6, :o120, 613904001
-          tz.transition 1989, 6, :o82, 613990411
-          tz.transition 1989, 6, :o81, 614076826
-          tz.transition 1989, 6, :o80, 614163241
-          tz.transition 1989, 6, :o121, 614249651
-          tz.transition 1989, 6, :o122, 614336066
-          tz.transition 1989, 6, :o123, 614422476
-          tz.transition 1989, 6, :o124, 614508891
-          tz.transition 1989, 6, :o76, 614595306
-          tz.transition 1989, 6, :o125, 614681716
-          tz.transition 1989, 6, :o126, 614768131
-          tz.transition 1989, 6, :o74, 614854541
-          tz.transition 1989, 6, :o73, 614940956
-          tz.transition 1989, 6, :o127, 615027366
-          tz.transition 1989, 6, :o128, 615113781
-          tz.transition 1989, 6, :o1, 615200191
-          tz.transition 1989, 7, :o129, 615286601
-          tz.transition 1989, 7, :o130, 615373016
-          tz.transition 1989, 7, :o70, 615459426
-          tz.transition 1989, 7, :o131, 615545836
-          tz.transition 1989, 7, :o3, 615632246
-          tz.transition 1989, 7, :o132, 615718656
-          tz.transition 1989, 7, :o69, 615805066
-          tz.transition 1989, 7, :o4, 615891476
-          tz.transition 1989, 7, :o133, 615977886
-          tz.transition 1989, 7, :o134, 616064296
-          tz.transition 1989, 7, :o5, 616150701
-          tz.transition 1989, 7, :o135, 616237111
-          tz.transition 1989, 7, :o67, 616323516
-          tz.transition 1989, 7, :o6, 616409926
-          tz.transition 1989, 7, :o136, 616496331
-          tz.transition 1989, 7, :o66, 616582736
-          tz.transition 1989, 7, :o137, 616669141
-          tz.transition 1989, 7, :o138, 616755546
-          tz.transition 1989, 7, :o7, 616841951
-          tz.transition 1989, 7, :o65, 616928356
-          tz.transition 1989, 7, :o139, 617101161
-          tz.transition 1989, 7, :o140, 617273966
-          tz.transition 1989, 7, :o139, 617705961
-          tz.transition 1989, 7, :o65, 617878756
-          tz.transition 1989, 8, :o7, 618051551
-          tz.transition 1989, 8, :o138, 618137946
-          tz.transition 1989, 8, :o137, 618224341
-          tz.transition 1989, 8, :o66, 618310736
-          tz.transition 1989, 8, :o6, 618397126
-          tz.transition 1989, 8, :o141, 618483521
-          tz.transition 1989, 8, :o135, 618569911
-          tz.transition 1989, 8, :o142, 618656306
-          tz.transition 1989, 8, :o134, 618742696
-          tz.transition 1989, 8, :o133, 618829086
-          tz.transition 1989, 8, :o4, 618915476
-          tz.transition 1989, 8, :o69, 619001866
-          tz.transition 1989, 8, :o132, 619088256
-          tz.transition 1989, 8, :o3, 619174646
-          tz.transition 1989, 8, :o143, 619261031
-          tz.transition 1989, 8, :o2, 619347421
-          tz.transition 1989, 8, :o144, 619433806
-          tz.transition 1989, 8, :o1, 619520191
-          tz.transition 1989, 8, :o128, 619606581
-          tz.transition 1989, 8, :o127, 619692966
-          tz.transition 1989, 8, :o145, 619779351
-          tz.transition 1989, 8, :o146, 619865736
-          tz.transition 1989, 8, :o125, 619952116
-          tz.transition 1989, 8, :o147, 620038501
-          tz.transition 1989, 8, :o77, 620124886
-          tz.transition 1989, 8, :o122, 620211266
-          tz.transition 1989, 8, :o121, 620297651
-          tz.transition 1989, 8, :o148, 620384031
-          tz.transition 1989, 8, :o149, 620470416
-          tz.transition 1989, 8, :o83, 620556796
-          tz.transition 1989, 9, :o0, 620643176
-          tz.transition 1989, 9, :o118, 620729561
-          tz.transition 1989, 9, :o150, 620815941
-          tz.transition 1989, 9, :o151, 620902321
-          tz.transition 1989, 9, :o90, 620988701
-          tz.transition 1989, 9, :o115, 621075081
-          tz.transition 1989, 9, :o113, 621161461
-          tz.transition 1989, 9, :o111, 621247841
-          tz.transition 1989, 9, :o98, 621334216
-          tz.transition 1989, 9, :o101, 621420596
-          tz.transition 1989, 9, :o104, 621506976
-          tz.transition 1989, 9, :o108, 621593356
-          tz.transition 1989, 9, :o152, 621679736
-          tz.transition 1989, 9, :o153, 621766111
-          tz.transition 1989, 9, :o154, 621852491
-          tz.transition 1989, 9, :o155, 621938871
-          tz.transition 1989, 9, :o156, 622025251
-          tz.transition 1989, 9, :o157, 622111626
-          tz.transition 1989, 9, :o158, 622198006
-          tz.transition 1989, 9, :o159, 622284386
-          tz.transition 1989, 9, :o160, 622370766
-          tz.transition 1989, 9, :o161, 622457141
-          tz.transition 1989, 9, :o162, 622543521
-          tz.transition 1989, 9, :o163, 622629901
-          tz.transition 1989, 9, :o164, 622716281
-          tz.transition 1989, 9, :o165, 622802661
-          tz.transition 1989, 9, :o166, 622889041
-          tz.transition 1989, 9, :o167, 622975416
-          tz.transition 1989, 9, :o168, 623061796
-          tz.transition 1989, 9, :o169, 623148176
-          tz.transition 1989, 10, :o170, 623234561
-          tz.transition 1989, 10, :o171, 623320941
-          tz.transition 1989, 10, :o172, 623407321
-          tz.transition 1989, 10, :o173, 623493701
-          tz.transition 1989, 10, :o174, 623580086
-          tz.transition 1989, 10, :o175, 623666466
-          tz.transition 1989, 10, :o176, 623752846
-          tz.transition 1989, 10, :o177, 623839231
-          tz.transition 1989, 10, :o178, 623925616
-          tz.transition 1989, 10, :o179, 624011996
-          tz.transition 1989, 10, :o180, 624098381
-          tz.transition 1989, 10, :o181, 624184766
-          tz.transition 1989, 10, :o182, 624271151
-          tz.transition 1989, 10, :o183, 624357536
-          tz.transition 1989, 10, :o184, 624443926
-          tz.transition 1989, 10, :o185, 624530311
-          tz.transition 1989, 10, :o186, 624616696
-          tz.transition 1989, 10, :o187, 624703086
-          tz.transition 1989, 10, :o188, 624789476
-          tz.transition 1989, 10, :o189, 624875866
-          tz.transition 1989, 10, :o190, 624962256
-          tz.transition 1989, 10, :o191, 625048646
-          tz.transition 1989, 10, :o192, 625135036
-          tz.transition 1989, 10, :o193, 625221426
-          tz.transition 1989, 10, :o194, 625307821
-          tz.transition 1989, 10, :o195, 625394216
-          tz.transition 1989, 10, :o196, 625480606
-          tz.transition 1989, 10, :o197, 625567001
-          tz.transition 1989, 10, :o198, 625653396
-          tz.transition 1989, 10, :o199, 625826191
-          tz.transition 1989, 11, :o200, 626085386
-          tz.transition 1989, 11, :o199, 626171791
-          tz.transition 1989, 11, :o198, 626430996
-          tz.transition 1989, 11, :o197, 626517401
-          tz.transition 1989, 11, :o196, 626603806
-          tz.transition 1989, 11, :o201, 626690211
-          tz.transition 1989, 11, :o195, 626776616
-          tz.transition 1989, 11, :o194, 626863021
-          tz.transition 1989, 11, :o202, 626949431
-          tz.transition 1989, 11, :o203, 627035841
-          tz.transition 1989, 11, :o204, 627122251
-          tz.transition 1989, 11, :o205, 627208661
-          tz.transition 1989, 11, :o206, 627295071
-          tz.transition 1989, 11, :o187, 627381486
-          tz.transition 1989, 11, :o186, 627467896
-          tz.transition 1989, 11, :o185, 627554311
-          tz.transition 1989, 11, :o184, 627640726
-          tz.transition 1989, 11, :o207, 627727141
-          tz.transition 1989, 11, :o208, 627813561
-          tz.transition 1989, 11, :o209, 627899976
-          tz.transition 1989, 11, :o179, 627986396
-          tz.transition 1989, 11, :o178, 628072816
-          tz.transition 1989, 11, :o177, 628159231
-          tz.transition 1989, 11, :o210, 628245651
-          tz.transition 1989, 11, :o211, 628332076
-          tz.transition 1989, 11, :o212, 628418496
-          tz.transition 1989, 12, :o213, 628504916
-          tz.transition 1989, 12, :o171, 628591341
-          tz.transition 1989, 12, :o214, 628677766
-          tz.transition 1989, 12, :o215, 628764191
-          tz.transition 1989, 12, :o216, 628850611
-          tz.transition 1989, 12, :o217, 628937036
-          tz.transition 1989, 12, :o218, 629023466
-          tz.transition 1989, 12, :o219, 629109891
-          tz.transition 1989, 12, :o220, 629196316
-          tz.transition 1989, 12, :o221, 629282746
-          tz.transition 1989, 12, :o222, 629369171
-          tz.transition 1989, 12, :o223, 629455601
-          tz.transition 1989, 12, :o157, 629542026
-          tz.transition 1989, 12, :o224, 629628456
-          tz.transition 1989, 12, :o225, 629714886
-          tz.transition 1989, 12, :o226, 629801316
-          tz.transition 1989, 12, :o227, 629887741
-          tz.transition 1989, 12, :o105, 629974171
-          tz.transition 1989, 12, :o100, 630060601
-          tz.transition 1989, 12, :o110, 630147031
-          tz.transition 1989, 12, :o113, 630233461
-          tz.transition 1989, 12, :o116, 630319891
-          tz.transition 1989, 12, :o151, 630406321
-          tz.transition 1989, 12, :o86, 630492751
-          tz.transition 1989, 12, :o84, 630579181
-          tz.transition 1989, 12, :o82, 630665611
-          tz.transition 1989, 12, :o80, 630752041
-          tz.transition 1989, 12, :o78, 630838471
-          tz.transition 1989, 12, :o228, 630924896
-          tz.transition 1989, 12, :o229, 631011326
-          tz.transition 1989, 12, :o73, 631097756
-          tz.transition 1989, 12, :o0, 631140956
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Saigon.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Saigon.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Saigon.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Saigon.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Saigon
-        include TimezoneDefinition
-        
-        timezone 'Asia/Saigon' do |tz|
-          tz.offset :o0, 25600, 0, :LMT
-          tz.offset :o1, 25580, 0, :SMT
-          tz.offset :o2, 25200, 0, :ICT
-          tz.offset :o3, 28800, 0, :ICT
-          
-          tz.transition 1906, 6, :o1, 130537991, 54
-          tz.transition 1911, 3, :o2, 2612634701, 1080
-          tz.transition 1912, 4, :o3, 58068557, 24
-          tz.transition 1931, 4, :o2, 14558773, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Sakhalin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Sakhalin.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Sakhalin.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Sakhalin.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,166 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Sakhalin
-        include TimezoneDefinition
-        
-        timezone 'Asia/Sakhalin' do |tz|
-          tz.offset :o0, 34248, 0, :LMT
-          tz.offset :o1, 32400, 0, :CJT
-          tz.offset :o2, 32400, 0, :JST
-          tz.offset :o3, 39600, 0, :SAKT
-          tz.offset :o4, 39600, 3600, :SAKST
-          tz.offset :o5, 36000, 3600, :SAKST
-          tz.offset :o6, 36000, 0, :SAKT
-          
-          tz.transition 1905, 8, :o1, 8701488373, 3600
-          tz.transition 1937, 12, :o2, 19431193, 8
-          tz.transition 1945, 8, :o3, 19453537, 8
-          tz.transition 1981, 3, :o4, 354891600
-          tz.transition 1981, 9, :o3, 370699200
-          tz.transition 1982, 3, :o4, 386427600
-          tz.transition 1982, 9, :o3, 402235200
-          tz.transition 1983, 3, :o4, 417963600
-          tz.transition 1983, 9, :o3, 433771200
-          tz.transition 1984, 3, :o4, 449586000
-          tz.transition 1984, 9, :o3, 465318000
-          tz.transition 1985, 3, :o4, 481042800
-          tz.transition 1985, 9, :o3, 496767600
-          tz.transition 1986, 3, :o4, 512492400
-          tz.transition 1986, 9, :o3, 528217200
-          tz.transition 1987, 3, :o4, 543942000
-          tz.transition 1987, 9, :o3, 559666800
-          tz.transition 1988, 3, :o4, 575391600
-          tz.transition 1988, 9, :o3, 591116400
-          tz.transition 1989, 3, :o4, 606841200
-          tz.transition 1989, 9, :o3, 622566000
-          tz.transition 1990, 3, :o4, 638290800
-          tz.transition 1990, 9, :o3, 654620400
-          tz.transition 1991, 3, :o5, 670345200
-          tz.transition 1991, 9, :o6, 686073600
-          tz.transition 1992, 1, :o3, 695750400
-          tz.transition 1992, 3, :o4, 701784000
-          tz.transition 1992, 9, :o3, 717505200
-          tz.transition 1993, 3, :o4, 733244400
-          tz.transition 1993, 9, :o3, 748969200
-          tz.transition 1994, 3, :o4, 764694000
-          tz.transition 1994, 9, :o3, 780418800
-          tz.transition 1995, 3, :o4, 796143600
-          tz.transition 1995, 9, :o3, 811868400
-          tz.transition 1996, 3, :o4, 828198000
-          tz.transition 1996, 10, :o3, 846342000
-          tz.transition 1997, 3, :o5, 859647600
-          tz.transition 1997, 10, :o6, 877795200
-          tz.transition 1998, 3, :o5, 891100800
-          tz.transition 1998, 10, :o6, 909244800
-          tz.transition 1999, 3, :o5, 922550400
-          tz.transition 1999, 10, :o6, 941299200
-          tz.transition 2000, 3, :o5, 954000000
-          tz.transition 2000, 10, :o6, 972748800
-          tz.transition 2001, 3, :o5, 985449600
-          tz.transition 2001, 10, :o6, 1004198400
-          tz.transition 2002, 3, :o5, 1017504000
-          tz.transition 2002, 10, :o6, 1035648000
-          tz.transition 2003, 3, :o5, 1048953600
-          tz.transition 2003, 10, :o6, 1067097600
-          tz.transition 2004, 3, :o5, 1080403200
-          tz.transition 2004, 10, :o6, 1099152000
-          tz.transition 2005, 3, :o5, 1111852800
-          tz.transition 2005, 10, :o6, 1130601600
-          tz.transition 2006, 3, :o5, 1143302400
-          tz.transition 2006, 10, :o6, 1162051200
-          tz.transition 2007, 3, :o5, 1174752000
-          tz.transition 2007, 10, :o6, 1193500800
-          tz.transition 2008, 3, :o5, 1206806400
-          tz.transition 2008, 10, :o6, 1224950400
-          tz.transition 2009, 3, :o5, 1238256000
-          tz.transition 2009, 10, :o6, 1256400000
-          tz.transition 2010, 3, :o5, 1269705600
-          tz.transition 2010, 10, :o6, 1288454400
-          tz.transition 2011, 3, :o5, 1301155200
-          tz.transition 2011, 10, :o6, 1319904000
-          tz.transition 2012, 3, :o5, 1332604800
-          tz.transition 2012, 10, :o6, 1351353600
-          tz.transition 2013, 3, :o5, 1364659200
-          tz.transition 2013, 10, :o6, 1382803200
-          tz.transition 2014, 3, :o5, 1396108800
-          tz.transition 2014, 10, :o6, 1414252800
-          tz.transition 2015, 3, :o5, 1427558400
-          tz.transition 2015, 10, :o6, 1445702400
-          tz.transition 2016, 3, :o5, 1459008000
-          tz.transition 2016, 10, :o6, 1477756800
-          tz.transition 2017, 3, :o5, 1490457600
-          tz.transition 2017, 10, :o6, 1509206400
-          tz.transition 2018, 3, :o5, 1521907200
-          tz.transition 2018, 10, :o6, 1540656000
-          tz.transition 2019, 3, :o5, 1553961600
-          tz.transition 2019, 10, :o6, 1572105600
-          tz.transition 2020, 3, :o5, 1585411200
-          tz.transition 2020, 10, :o6, 1603555200
-          tz.transition 2021, 3, :o5, 1616860800
-          tz.transition 2021, 10, :o6, 1635609600
-          tz.transition 2022, 3, :o5, 1648310400
-          tz.transition 2022, 10, :o6, 1667059200
-          tz.transition 2023, 3, :o5, 1679760000
-          tz.transition 2023, 10, :o6, 1698508800
-          tz.transition 2024, 3, :o5, 1711814400
-          tz.transition 2024, 10, :o6, 1729958400
-          tz.transition 2025, 3, :o5, 1743264000
-          tz.transition 2025, 10, :o6, 1761408000
-          tz.transition 2026, 3, :o5, 1774713600
-          tz.transition 2026, 10, :o6, 1792857600
-          tz.transition 2027, 3, :o5, 1806163200
-          tz.transition 2027, 10, :o6, 1824912000
-          tz.transition 2028, 3, :o5, 1837612800
-          tz.transition 2028, 10, :o6, 1856361600
-          tz.transition 2029, 3, :o5, 1869062400
-          tz.transition 2029, 10, :o6, 1887811200
-          tz.transition 2030, 3, :o5, 1901116800
-          tz.transition 2030, 10, :o6, 1919260800
-          tz.transition 2031, 3, :o5, 1932566400
-          tz.transition 2031, 10, :o6, 1950710400
-          tz.transition 2032, 3, :o5, 1964016000
-          tz.transition 2032, 10, :o6, 1982764800
-          tz.transition 2033, 3, :o5, 1995465600
-          tz.transition 2033, 10, :o6, 2014214400
-          tz.transition 2034, 3, :o5, 2026915200
-          tz.transition 2034, 10, :o6, 2045664000
-          tz.transition 2035, 3, :o5, 2058364800
-          tz.transition 2035, 10, :o6, 2077113600
-          tz.transition 2036, 3, :o5, 2090419200
-          tz.transition 2036, 10, :o6, 2108563200
-          tz.transition 2037, 3, :o5, 2121868800
-          tz.transition 2037, 10, :o6, 2140012800
-          tz.transition 2038, 3, :o5, 14793061, 6
-          tz.transition 2038, 10, :o6, 14794363, 6
-          tz.transition 2039, 3, :o5, 14795245, 6
-          tz.transition 2039, 10, :o6, 14796547, 6
-          tz.transition 2040, 3, :o5, 14797429, 6
-          tz.transition 2040, 10, :o6, 14798731, 6
-          tz.transition 2041, 3, :o5, 14799655, 6
-          tz.transition 2041, 10, :o6, 14800915, 6
-          tz.transition 2042, 3, :o5, 14801839, 6
-          tz.transition 2042, 10, :o6, 14803099, 6
-          tz.transition 2043, 3, :o5, 14804023, 6
-          tz.transition 2043, 10, :o6, 14805283, 6
-          tz.transition 2044, 3, :o5, 14806207, 6
-          tz.transition 2044, 10, :o6, 14807509, 6
-          tz.transition 2045, 3, :o5, 14808391, 6
-          tz.transition 2045, 10, :o6, 14809693, 6
-          tz.transition 2046, 3, :o5, 14810575, 6
-          tz.transition 2046, 10, :o6, 14811877, 6
-          tz.transition 2047, 3, :o5, 14812801, 6
-          tz.transition 2047, 10, :o6, 14814061, 6
-          tz.transition 2048, 3, :o5, 14814985, 6
-          tz.transition 2048, 10, :o6, 14816245, 6
-          tz.transition 2049, 3, :o5, 14817169, 6
-          tz.transition 2049, 10, :o6, 14818471, 6
-          tz.transition 2050, 3, :o5, 14819353, 6
-          tz.transition 2050, 10, :o6, 14820655, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Samarkand.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Samarkand.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Samarkand.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Samarkand.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Samarkand
-        include TimezoneDefinition
-        
-        timezone 'Asia/Samarkand' do |tz|
-          tz.offset :o0, 16032, 0, :LMT
-          tz.offset :o1, 14400, 0, :SAMT
-          tz.offset :o2, 18000, 0, :SAMT
-          tz.offset :o3, 18000, 3600, :SAMST
-          tz.offset :o4, 21600, 0, :TAST
-          tz.offset :o5, 18000, 3600, :UZST
-          tz.offset :o6, 18000, 0, :UZT
-          
-          tz.transition 1924, 5, :o1, 2181516583, 900
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1981, 3, :o3, 354913200
-          tz.transition 1981, 9, :o4, 370720800
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402256800
-          tz.transition 1983, 3, :o3, 417985200
-          tz.transition 1983, 9, :o2, 433792800
-          tz.transition 1984, 3, :o3, 449607600
-          tz.transition 1984, 9, :o2, 465339600
-          tz.transition 1985, 3, :o3, 481064400
-          tz.transition 1985, 9, :o2, 496789200
-          tz.transition 1986, 3, :o3, 512514000
-          tz.transition 1986, 9, :o2, 528238800
-          tz.transition 1987, 3, :o3, 543963600
-          tz.transition 1987, 9, :o2, 559688400
-          tz.transition 1988, 3, :o3, 575413200
-          tz.transition 1988, 9, :o2, 591138000
-          tz.transition 1989, 3, :o3, 606862800
-          tz.transition 1989, 9, :o2, 622587600
-          tz.transition 1990, 3, :o3, 638312400
-          tz.transition 1990, 9, :o2, 654642000
-          tz.transition 1991, 3, :o3, 670366800
-          tz.transition 1991, 8, :o5, 683661600
-          tz.transition 1991, 9, :o6, 686091600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Seoul.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Seoul.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Seoul.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Seoul.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,34 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Seoul
-        include TimezoneDefinition
-        
-        timezone 'Asia/Seoul' do |tz|
-          tz.offset :o0, 30472, 0, :LMT
-          tz.offset :o1, 30600, 0, :KST
-          tz.offset :o2, 32400, 0, :KST
-          tz.offset :o3, 28800, 0, :KST
-          tz.offset :o4, 28800, 3600, :KDT
-          tz.offset :o5, 32400, 3600, :KDT
-          
-          tz.transition 1889, 12, :o1, 26042775991, 10800
-          tz.transition 1904, 11, :o2, 116007127, 48
-          tz.transition 1927, 12, :o1, 19401969, 8
-          tz.transition 1931, 12, :o2, 116481943, 48
-          tz.transition 1954, 3, :o3, 19478577, 8
-          tz.transition 1960, 5, :o4, 14622415, 6
-          tz.transition 1960, 9, :o3, 19497521, 8
-          tz.transition 1961, 8, :o1, 14625127, 6
-          tz.transition 1968, 9, :o2, 117126247, 48
-          tz.transition 1987, 5, :o5, 547570800
-          tz.transition 1987, 10, :o2, 560872800
-          tz.transition 1988, 5, :o5, 579020400
-          tz.transition 1988, 10, :o2, 592322400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Shanghai.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Shanghai.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Shanghai.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Shanghai.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Shanghai
-        include TimezoneDefinition
-        
-        timezone 'Asia/Shanghai' do |tz|
-          tz.offset :o0, 29152, 0, :LMT
-          tz.offset :o1, 28800, 0, :CST
-          tz.offset :o2, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 6548164639, 2700
-          tz.transition 1940, 6, :o2, 14578699, 6
-          tz.transition 1940, 9, :o1, 19439225, 8
-          tz.transition 1941, 3, :o2, 14580415, 6
-          tz.transition 1941, 9, :o1, 19442145, 8
-          tz.transition 1986, 5, :o2, 515520000
-          tz.transition 1986, 9, :o1, 527007600
-          tz.transition 1987, 4, :o2, 545155200
-          tz.transition 1987, 9, :o1, 558457200
-          tz.transition 1988, 4, :o2, 576604800
-          tz.transition 1988, 9, :o1, 589906800
-          tz.transition 1989, 4, :o2, 608659200
-          tz.transition 1989, 9, :o1, 621961200
-          tz.transition 1990, 4, :o2, 640108800
-          tz.transition 1990, 9, :o1, 653410800
-          tz.transition 1991, 4, :o2, 671558400
-          tz.transition 1991, 9, :o1, 684860400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Singapore.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Singapore.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Singapore.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Singapore.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Singapore
-        include TimezoneDefinition
-        
-        timezone 'Asia/Singapore' do |tz|
-          tz.offset :o0, 24925, 0, :LMT
-          tz.offset :o1, 24925, 0, :SMT
-          tz.offset :o2, 25200, 0, :MALT
-          tz.offset :o3, 25200, 1200, :MALST
-          tz.offset :o4, 26400, 0, :MALT
-          tz.offset :o5, 27000, 0, :MALT
-          tz.offset :o6, 32400, 0, :JST
-          tz.offset :o7, 27000, 0, :SGT
-          tz.offset :o8, 28800, 0, :SGT
-          
-          tz.transition 1900, 12, :o1, 8347571291, 3456
-          tz.transition 1905, 5, :o2, 8353142363, 3456
-          tz.transition 1932, 12, :o3, 58249757, 24
-          tz.transition 1935, 12, :o4, 87414055, 36
-          tz.transition 1941, 8, :o5, 87488575, 36
-          tz.transition 1942, 2, :o6, 38886499, 16
-          tz.transition 1945, 9, :o5, 19453681, 8
-          tz.transition 1965, 8, :o7, 39023699, 16
-          tz.transition 1981, 12, :o8, 378664200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Taipei.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Taipei.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Taipei.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Taipei.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,59 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Taipei
-        include TimezoneDefinition
-        
-        timezone 'Asia/Taipei' do |tz|
-          tz.offset :o0, 29160, 0, :LMT
-          tz.offset :o1, 28800, 0, :CST
-          tz.offset :o2, 28800, 3600, :CDT
-          
-          tz.transition 1895, 12, :o1, 193084733, 80
-          tz.transition 1945, 4, :o2, 14589457, 6
-          tz.transition 1945, 9, :o1, 19453833, 8
-          tz.transition 1946, 4, :o2, 14591647, 6
-          tz.transition 1946, 9, :o1, 19456753, 8
-          tz.transition 1947, 4, :o2, 14593837, 6
-          tz.transition 1947, 9, :o1, 19459673, 8
-          tz.transition 1948, 4, :o2, 14596033, 6
-          tz.transition 1948, 9, :o1, 19462601, 8
-          tz.transition 1949, 4, :o2, 14598223, 6
-          tz.transition 1949, 9, :o1, 19465521, 8
-          tz.transition 1950, 4, :o2, 14600413, 6
-          tz.transition 1950, 9, :o1, 19468441, 8
-          tz.transition 1951, 4, :o2, 14602603, 6
-          tz.transition 1951, 9, :o1, 19471361, 8
-          tz.transition 1952, 2, :o2, 14604433, 6
-          tz.transition 1952, 10, :o1, 19474537, 8
-          tz.transition 1953, 3, :o2, 14606809, 6
-          tz.transition 1953, 10, :o1, 19477457, 8
-          tz.transition 1954, 3, :o2, 14608999, 6
-          tz.transition 1954, 10, :o1, 19480377, 8
-          tz.transition 1955, 3, :o2, 14611189, 6
-          tz.transition 1955, 9, :o1, 19483049, 8
-          tz.transition 1956, 3, :o2, 14613385, 6
-          tz.transition 1956, 9, :o1, 19485977, 8
-          tz.transition 1957, 3, :o2, 14615575, 6
-          tz.transition 1957, 9, :o1, 19488897, 8
-          tz.transition 1958, 3, :o2, 14617765, 6
-          tz.transition 1958, 9, :o1, 19491817, 8
-          tz.transition 1959, 3, :o2, 14619955, 6
-          tz.transition 1959, 9, :o1, 19494737, 8
-          tz.transition 1960, 5, :o2, 14622517, 6
-          tz.transition 1960, 9, :o1, 19497665, 8
-          tz.transition 1961, 5, :o2, 14624707, 6
-          tz.transition 1961, 9, :o1, 19500585, 8
-          tz.transition 1974, 3, :o2, 133977600
-          tz.transition 1974, 9, :o1, 149785200
-          tz.transition 1975, 3, :o2, 165513600
-          tz.transition 1975, 9, :o1, 181321200
-          tz.transition 1980, 6, :o2, 331142400
-          tz.transition 1980, 9, :o1, 339087600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tashkent.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tashkent.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tashkent.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tashkent.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tashkent
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tashkent' do |tz|
-          tz.offset :o0, 16632, 0, :LMT
-          tz.offset :o1, 18000, 0, :TAST
-          tz.offset :o2, 21600, 0, :TAST
-          tz.offset :o3, 21600, 3600, :TASST
-          tz.offset :o4, 18000, 3600, :TASST
-          tz.offset :o5, 18000, 3600, :UZST
-          tz.offset :o6, 18000, 0, :UZT
-          
-          tz.transition 1924, 5, :o1, 969562923, 400
-          tz.transition 1930, 6, :o2, 58227559, 24
-          tz.transition 1981, 3, :o3, 354909600
-          tz.transition 1981, 9, :o2, 370717200
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402253200
-          tz.transition 1983, 3, :o3, 417981600
-          tz.transition 1983, 9, :o2, 433789200
-          tz.transition 1984, 3, :o3, 449604000
-          tz.transition 1984, 9, :o2, 465336000
-          tz.transition 1985, 3, :o3, 481060800
-          tz.transition 1985, 9, :o2, 496785600
-          tz.transition 1986, 3, :o3, 512510400
-          tz.transition 1986, 9, :o2, 528235200
-          tz.transition 1987, 3, :o3, 543960000
-          tz.transition 1987, 9, :o2, 559684800
-          tz.transition 1988, 3, :o3, 575409600
-          tz.transition 1988, 9, :o2, 591134400
-          tz.transition 1989, 3, :o3, 606859200
-          tz.transition 1989, 9, :o2, 622584000
-          tz.transition 1990, 3, :o3, 638308800
-          tz.transition 1990, 9, :o2, 654638400
-          tz.transition 1991, 3, :o4, 670363200
-          tz.transition 1991, 8, :o5, 683661600
-          tz.transition 1991, 9, :o6, 686091600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tbilisi.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tbilisi.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tbilisi.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tbilisi.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,78 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tbilisi
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tbilisi' do |tz|
-          tz.offset :o0, 10756, 0, :LMT
-          tz.offset :o1, 10756, 0, :TBMT
-          tz.offset :o2, 10800, 0, :TBIT
-          tz.offset :o3, 14400, 0, :TBIT
-          tz.offset :o4, 14400, 3600, :TBIST
-          tz.offset :o5, 10800, 3600, :TBIST
-          tz.offset :o6, 10800, 3600, :GEST
-          tz.offset :o7, 10800, 0, :GET
-          tz.offset :o8, 14400, 0, :GET
-          tz.offset :o9, 14400, 3600, :GEST
-          
-          tz.transition 1879, 12, :o1, 52006652111, 21600
-          tz.transition 1924, 5, :o2, 52356399311, 21600
-          tz.transition 1957, 2, :o3, 19487187, 8
-          tz.transition 1981, 3, :o4, 354916800
-          tz.transition 1981, 9, :o3, 370724400
-          tz.transition 1982, 3, :o4, 386452800
-          tz.transition 1982, 9, :o3, 402260400
-          tz.transition 1983, 3, :o4, 417988800
-          tz.transition 1983, 9, :o3, 433796400
-          tz.transition 1984, 3, :o4, 449611200
-          tz.transition 1984, 9, :o3, 465343200
-          tz.transition 1985, 3, :o4, 481068000
-          tz.transition 1985, 9, :o3, 496792800
-          tz.transition 1986, 3, :o4, 512517600
-          tz.transition 1986, 9, :o3, 528242400
-          tz.transition 1987, 3, :o4, 543967200
-          tz.transition 1987, 9, :o3, 559692000
-          tz.transition 1988, 3, :o4, 575416800
-          tz.transition 1988, 9, :o3, 591141600
-          tz.transition 1989, 3, :o4, 606866400
-          tz.transition 1989, 9, :o3, 622591200
-          tz.transition 1990, 3, :o4, 638316000
-          tz.transition 1990, 9, :o3, 654645600
-          tz.transition 1991, 3, :o5, 670370400
-          tz.transition 1991, 4, :o6, 671140800
-          tz.transition 1991, 9, :o7, 686098800
-          tz.transition 1992, 3, :o6, 701816400
-          tz.transition 1992, 9, :o7, 717537600
-          tz.transition 1993, 3, :o6, 733266000
-          tz.transition 1993, 9, :o7, 748987200
-          tz.transition 1994, 3, :o6, 764715600
-          tz.transition 1994, 9, :o8, 780436800
-          tz.transition 1995, 3, :o9, 796161600
-          tz.transition 1995, 9, :o8, 811882800
-          tz.transition 1996, 3, :o9, 828216000
-          tz.transition 1997, 3, :o9, 859662000
-          tz.transition 1997, 10, :o8, 877806000
-          tz.transition 1998, 3, :o9, 891115200
-          tz.transition 1998, 10, :o8, 909255600
-          tz.transition 1999, 3, :o9, 922564800
-          tz.transition 1999, 10, :o8, 941310000
-          tz.transition 2000, 3, :o9, 954014400
-          tz.transition 2000, 10, :o8, 972759600
-          tz.transition 2001, 3, :o9, 985464000
-          tz.transition 2001, 10, :o8, 1004209200
-          tz.transition 2002, 3, :o9, 1017518400
-          tz.transition 2002, 10, :o8, 1035658800
-          tz.transition 2003, 3, :o9, 1048968000
-          tz.transition 2003, 10, :o8, 1067108400
-          tz.transition 2004, 3, :o9, 1080417600
-          tz.transition 2004, 6, :o6, 1088276400
-          tz.transition 2004, 10, :o7, 1099177200
-          tz.transition 2005, 3, :o8, 1111878000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tehran.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tehran.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tehran.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tehran.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,61 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tehran
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tehran' do |tz|
-          tz.offset :o0, 12344, 0, :LMT
-          tz.offset :o1, 12344, 0, :TMT
-          tz.offset :o2, 12600, 0, :IRST
-          tz.offset :o3, 14400, 0, :IRST
-          tz.offset :o4, 14400, 3600, :IRDT
-          tz.offset :o5, 12600, 3600, :IRDT
-          
-          tz.transition 1915, 12, :o1, 26145324257, 10800
-          tz.transition 1945, 12, :o2, 26263670657, 10800
-          tz.transition 1977, 10, :o3, 247177800
-          tz.transition 1978, 3, :o4, 259272000
-          tz.transition 1978, 10, :o3, 277758000
-          tz.transition 1978, 12, :o2, 283982400
-          tz.transition 1979, 3, :o5, 290809800
-          tz.transition 1979, 9, :o2, 306531000
-          tz.transition 1980, 3, :o5, 322432200
-          tz.transition 1980, 9, :o2, 338499000
-          tz.transition 1991, 5, :o5, 673216200
-          tz.transition 1991, 9, :o2, 685481400
-          tz.transition 1992, 3, :o5, 701209800
-          tz.transition 1992, 9, :o2, 717103800
-          tz.transition 1993, 3, :o5, 732745800
-          tz.transition 1993, 9, :o2, 748639800
-          tz.transition 1994, 3, :o5, 764281800
-          tz.transition 1994, 9, :o2, 780175800
-          tz.transition 1995, 3, :o5, 795817800
-          tz.transition 1995, 9, :o2, 811711800
-          tz.transition 1996, 3, :o5, 827353800
-          tz.transition 1996, 9, :o2, 843247800
-          tz.transition 1997, 3, :o5, 858976200
-          tz.transition 1997, 9, :o2, 874870200
-          tz.transition 1998, 3, :o5, 890512200
-          tz.transition 1998, 9, :o2, 906406200
-          tz.transition 1999, 3, :o5, 922048200
-          tz.transition 1999, 9, :o2, 937942200
-          tz.transition 2000, 3, :o5, 953584200
-          tz.transition 2000, 9, :o2, 969478200
-          tz.transition 2001, 3, :o5, 985206600
-          tz.transition 2001, 9, :o2, 1001100600
-          tz.transition 2002, 3, :o5, 1016742600
-          tz.transition 2002, 9, :o2, 1032636600
-          tz.transition 2003, 3, :o5, 1048278600
-          tz.transition 2003, 9, :o2, 1064172600
-          tz.transition 2004, 3, :o5, 1079814600
-          tz.transition 2004, 9, :o2, 1095708600
-          tz.transition 2005, 3, :o5, 1111437000
-          tz.transition 2005, 9, :o2, 1127331000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tel_Aviv.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tel_Aviv.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tel_Aviv.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tel_Aviv.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tel_Aviv
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Tel_Aviv', 'Asia/Jerusalem'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimbu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimbu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimbu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimbu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Thimbu
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Thimbu', 'Asia/Thimphu'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimphu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimphu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimphu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Thimphu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Thimphu
-        include TimezoneDefinition
-        
-        timezone 'Asia/Thimphu' do |tz|
-          tz.offset :o0, 21516, 0, :LMT
-          tz.offset :o1, 19800, 0, :IST
-          tz.offset :o2, 21600, 0, :BTT
-          
-          tz.transition 1947, 8, :o1, 17513368207, 7200
-          tz.transition 1987, 9, :o2, 560025000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tokyo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tokyo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tokyo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Tokyo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tokyo
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tokyo' do |tz|
-          tz.offset :o0, 33539, 0, :LMT
-          tz.offset :o1, 32400, 0, :JST
-          tz.offset :o2, 32400, 0, :CJT
-          tz.offset :o3, 32400, 3600, :JDT
-          
-          tz.transition 1887, 12, :o1, 19285097, 8
-          tz.transition 1895, 12, :o2, 19308473, 8
-          tz.transition 1937, 12, :o1, 19431193, 8
-          tz.transition 1948, 5, :o3, 58384157, 24
-          tz.transition 1948, 9, :o1, 14596831, 6
-          tz.transition 1949, 4, :o3, 58392221, 24
-          tz.transition 1949, 9, :o1, 14599015, 6
-          tz.transition 1950, 5, :o3, 58401797, 24
-          tz.transition 1950, 9, :o1, 14601199, 6
-          tz.transition 1951, 5, :o3, 58410533, 24
-          tz.transition 1951, 9, :o1, 14603383, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ujung_Pandang.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ujung_Pandang.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ujung_Pandang.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ujung_Pandang.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Ujung_Pandang
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Ujung_Pandang', 'Asia/Makassar'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,153 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Ulaanbaatar
-        include TimezoneDefinition
-        
-        timezone 'Asia/Ulaanbaatar' do |tz|
-          tz.offset :o0, 25652, 0, :LMT
-          tz.offset :o1, 25200, 0, :ULAT
-          tz.offset :o2, 28800, 0, :ULAT
-          tz.offset :o3, 28800, 3600, :ULAST
-          
-          tz.transition 1905, 7, :o1, 52208457187, 21600
-          tz.transition 1977, 12, :o2, 252435600
-          tz.transition 1983, 3, :o3, 417974400
-          tz.transition 1983, 9, :o2, 433782000
-          tz.transition 1984, 3, :o3, 449596800
-          tz.transition 1984, 9, :o2, 465318000
-          tz.transition 1985, 3, :o3, 481046400
-          tz.transition 1985, 9, :o2, 496767600
-          tz.transition 1986, 3, :o3, 512496000
-          tz.transition 1986, 9, :o2, 528217200
-          tz.transition 1987, 3, :o3, 543945600
-          tz.transition 1987, 9, :o2, 559666800
-          tz.transition 1988, 3, :o3, 575395200
-          tz.transition 1988, 9, :o2, 591116400
-          tz.transition 1989, 3, :o3, 606844800
-          tz.transition 1989, 9, :o2, 622566000
-          tz.transition 1990, 3, :o3, 638294400
-          tz.transition 1990, 9, :o2, 654620400
-          tz.transition 1991, 3, :o3, 670348800
-          tz.transition 1991, 9, :o2, 686070000
-          tz.transition 1992, 3, :o3, 701798400
-          tz.transition 1992, 9, :o2, 717519600
-          tz.transition 1993, 3, :o3, 733248000
-          tz.transition 1993, 9, :o2, 748969200
-          tz.transition 1994, 3, :o3, 764697600
-          tz.transition 1994, 9, :o2, 780418800
-          tz.transition 1995, 3, :o3, 796147200
-          tz.transition 1995, 9, :o2, 811868400
-          tz.transition 1996, 3, :o3, 828201600
-          tz.transition 1996, 9, :o2, 843922800
-          tz.transition 1997, 3, :o3, 859651200
-          tz.transition 1997, 9, :o2, 875372400
-          tz.transition 1998, 3, :o3, 891100800
-          tz.transition 1998, 9, :o2, 906822000
-          tz.transition 2001, 4, :o3, 988394400
-          tz.transition 2001, 9, :o2, 1001696400
-          tz.transition 2002, 3, :o3, 1017424800
-          tz.transition 2002, 9, :o2, 1033146000
-          tz.transition 2003, 3, :o3, 1048874400
-          tz.transition 2003, 9, :o2, 1064595600
-          tz.transition 2004, 3, :o3, 1080324000
-          tz.transition 2004, 9, :o2, 1096045200
-          tz.transition 2005, 3, :o3, 1111773600
-          tz.transition 2005, 9, :o2, 1127494800
-          tz.transition 2006, 3, :o3, 1143223200
-          tz.transition 2006, 9, :o2, 1159549200
-          tz.transition 2007, 3, :o3, 1175277600
-          tz.transition 2007, 9, :o2, 1190998800
-          tz.transition 2008, 3, :o3, 1206727200
-          tz.transition 2008, 9, :o2, 1222448400
-          tz.transition 2009, 3, :o3, 1238176800
-          tz.transition 2009, 9, :o2, 1253898000
-          tz.transition 2010, 3, :o3, 1269626400
-          tz.transition 2010, 9, :o2, 1285347600
-          tz.transition 2011, 3, :o3, 1301076000
-          tz.transition 2011, 9, :o2, 1316797200
-          tz.transition 2012, 3, :o3, 1333130400
-          tz.transition 2012, 9, :o2, 1348851600
-          tz.transition 2013, 3, :o3, 1364580000
-          tz.transition 2013, 9, :o2, 1380301200
-          tz.transition 2014, 3, :o3, 1396029600
-          tz.transition 2014, 9, :o2, 1411750800
-          tz.transition 2015, 3, :o3, 1427479200
-          tz.transition 2015, 9, :o2, 1443200400
-          tz.transition 2016, 3, :o3, 1458928800
-          tz.transition 2016, 9, :o2, 1474650000
-          tz.transition 2017, 3, :o3, 1490378400
-          tz.transition 2017, 9, :o2, 1506704400
-          tz.transition 2018, 3, :o3, 1522432800
-          tz.transition 2018, 9, :o2, 1538154000
-          tz.transition 2019, 3, :o3, 1553882400
-          tz.transition 2019, 9, :o2, 1569603600
-          tz.transition 2020, 3, :o3, 1585332000
-          tz.transition 2020, 9, :o2, 1601053200
-          tz.transition 2021, 3, :o3, 1616781600
-          tz.transition 2021, 9, :o2, 1632502800
-          tz.transition 2022, 3, :o3, 1648231200
-          tz.transition 2022, 9, :o2, 1663952400
-          tz.transition 2023, 3, :o3, 1679680800
-          tz.transition 2023, 9, :o2, 1696006800
-          tz.transition 2024, 3, :o3, 1711735200
-          tz.transition 2024, 9, :o2, 1727456400
-          tz.transition 2025, 3, :o3, 1743184800
-          tz.transition 2025, 9, :o2, 1758906000
-          tz.transition 2026, 3, :o3, 1774634400
-          tz.transition 2026, 9, :o2, 1790355600
-          tz.transition 2027, 3, :o3, 1806084000
-          tz.transition 2027, 9, :o2, 1821805200
-          tz.transition 2028, 3, :o3, 1837533600
-          tz.transition 2028, 9, :o2, 1853859600
-          tz.transition 2029, 3, :o3, 1869588000
-          tz.transition 2029, 9, :o2, 1885309200
-          tz.transition 2030, 3, :o3, 1901037600
-          tz.transition 2030, 9, :o2, 1916758800
-          tz.transition 2031, 3, :o3, 1932487200
-          tz.transition 2031, 9, :o2, 1948208400
-          tz.transition 2032, 3, :o3, 1963936800
-          tz.transition 2032, 9, :o2, 1979658000
-          tz.transition 2033, 3, :o3, 1995386400
-          tz.transition 2033, 9, :o2, 2011107600
-          tz.transition 2034, 3, :o3, 2026836000
-          tz.transition 2034, 9, :o2, 2043162000
-          tz.transition 2035, 3, :o3, 2058890400
-          tz.transition 2035, 9, :o2, 2074611600
-          tz.transition 2036, 3, :o3, 2090340000
-          tz.transition 2036, 9, :o2, 2106061200
-          tz.transition 2037, 3, :o3, 2121789600
-          tz.transition 2037, 9, :o2, 2137510800
-          tz.transition 2038, 3, :o3, 9862037, 4
-          tz.transition 2038, 9, :o2, 59176589, 24
-          tz.transition 2039, 3, :o3, 9863493, 4
-          tz.transition 2039, 9, :o2, 59185325, 24
-          tz.transition 2040, 3, :o3, 9864977, 4
-          tz.transition 2040, 9, :o2, 59194229, 24
-          tz.transition 2041, 3, :o3, 9866433, 4
-          tz.transition 2041, 9, :o2, 59202965, 24
-          tz.transition 2042, 3, :o3, 9867889, 4
-          tz.transition 2042, 9, :o2, 59211701, 24
-          tz.transition 2043, 3, :o3, 9869345, 4
-          tz.transition 2043, 9, :o2, 59220437, 24
-          tz.transition 2044, 3, :o3, 9870801, 4
-          tz.transition 2044, 9, :o2, 59229173, 24
-          tz.transition 2045, 3, :o3, 9872257, 4
-          tz.transition 2045, 9, :o2, 59238077, 24
-          tz.transition 2046, 3, :o3, 9873741, 4
-          tz.transition 2046, 9, :o2, 59246813, 24
-          tz.transition 2047, 3, :o3, 9875197, 4
-          tz.transition 2047, 9, :o2, 59255549, 24
-          tz.transition 2048, 3, :o3, 9876653, 4
-          tz.transition 2048, 9, :o2, 59264285, 24
-          tz.transition 2049, 3, :o3, 9878109, 4
-          tz.transition 2049, 9, :o2, 59273021, 24
-          tz.transition 2050, 3, :o3, 9879565, 4
-          tz.transition 2050, 9, :o2, 59281757, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulan_Bator.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulan_Bator.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulan_Bator.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Ulan_Bator.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Ulan_Bator
-        include TimezoneDefinition
-        
-        linked_timezone 'Asia/Ulan_Bator', 'Asia/Ulaanbaatar'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Urumqi.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Urumqi.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Urumqi.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Urumqi.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Urumqi
-        include TimezoneDefinition
-        
-        timezone 'Asia/Urumqi' do |tz|
-          tz.offset :o0, 21020, 0, :LMT
-          tz.offset :o1, 21600, 0, :URUT
-          tz.offset :o2, 28800, 0, :CST
-          tz.offset :o3, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 10477063829, 4320
-          tz.transition 1980, 4, :o2, 325965600
-          tz.transition 1986, 5, :o3, 515520000
-          tz.transition 1986, 9, :o2, 527007600
-          tz.transition 1987, 4, :o3, 545155200
-          tz.transition 1987, 9, :o2, 558457200
-          tz.transition 1988, 4, :o3, 576604800
-          tz.transition 1988, 9, :o2, 589906800
-          tz.transition 1989, 4, :o3, 608659200
-          tz.transition 1989, 9, :o2, 621961200
-          tz.transition 1990, 4, :o3, 640108800
-          tz.transition 1990, 9, :o2, 653410800
-          tz.transition 1991, 4, :o3, 671558400
-          tz.transition 1991, 9, :o2, 684860400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vientiane.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vientiane.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vientiane.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vientiane.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Vientiane
-        include TimezoneDefinition
-        
-        timezone 'Asia/Vientiane' do |tz|
-          tz.offset :o0, 24624, 0, :LMT
-          tz.offset :o1, 25580, 0, :SMT
-          tz.offset :o2, 25200, 0, :ICT
-          tz.offset :o3, 28800, 0, :ICT
-          
-          tz.transition 1906, 6, :o1, 483474043, 200
-          tz.transition 1911, 3, :o2, 2612634701, 1080
-          tz.transition 1912, 4, :o3, 58068557, 24
-          tz.transition 1931, 4, :o2, 14558773, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vladivostok.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vladivostok.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vladivostok.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Vladivostok.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,164 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Vladivostok
-        include TimezoneDefinition
-        
-        timezone 'Asia/Vladivostok' do |tz|
-          tz.offset :o0, 31664, 0, :LMT
-          tz.offset :o1, 32400, 0, :VLAT
-          tz.offset :o2, 36000, 0, :VLAT
-          tz.offset :o3, 36000, 3600, :VLAST
-          tz.offset :o4, 32400, 3600, :VLASST
-          tz.offset :o5, 32400, 0, :VLAST
-          
-          tz.transition 1922, 11, :o1, 13086214921, 5400
-          tz.transition 1930, 6, :o2, 19409185, 8
-          tz.transition 1981, 3, :o3, 354895200
-          tz.transition 1981, 9, :o2, 370702800
-          tz.transition 1982, 3, :o3, 386431200
-          tz.transition 1982, 9, :o2, 402238800
-          tz.transition 1983, 3, :o3, 417967200
-          tz.transition 1983, 9, :o2, 433774800
-          tz.transition 1984, 3, :o3, 449589600
-          tz.transition 1984, 9, :o2, 465321600
-          tz.transition 1985, 3, :o3, 481046400
-          tz.transition 1985, 9, :o2, 496771200
-          tz.transition 1986, 3, :o3, 512496000
-          tz.transition 1986, 9, :o2, 528220800
-          tz.transition 1987, 3, :o3, 543945600
-          tz.transition 1987, 9, :o2, 559670400
-          tz.transition 1988, 3, :o3, 575395200
-          tz.transition 1988, 9, :o2, 591120000
-          tz.transition 1989, 3, :o3, 606844800
-          tz.transition 1989, 9, :o2, 622569600
-          tz.transition 1990, 3, :o3, 638294400
-          tz.transition 1990, 9, :o2, 654624000
-          tz.transition 1991, 3, :o4, 670348800
-          tz.transition 1991, 9, :o5, 686077200
-          tz.transition 1992, 1, :o2, 695754000
-          tz.transition 1992, 3, :o3, 701787600
-          tz.transition 1992, 9, :o2, 717508800
-          tz.transition 1993, 3, :o3, 733248000
-          tz.transition 1993, 9, :o2, 748972800
-          tz.transition 1994, 3, :o3, 764697600
-          tz.transition 1994, 9, :o2, 780422400
-          tz.transition 1995, 3, :o3, 796147200
-          tz.transition 1995, 9, :o2, 811872000
-          tz.transition 1996, 3, :o3, 828201600
-          tz.transition 1996, 10, :o2, 846345600
-          tz.transition 1997, 3, :o3, 859651200
-          tz.transition 1997, 10, :o2, 877795200
-          tz.transition 1998, 3, :o3, 891100800
-          tz.transition 1998, 10, :o2, 909244800
-          tz.transition 1999, 3, :o3, 922550400
-          tz.transition 1999, 10, :o2, 941299200
-          tz.transition 2000, 3, :o3, 954000000
-          tz.transition 2000, 10, :o2, 972748800
-          tz.transition 2001, 3, :o3, 985449600
-          tz.transition 2001, 10, :o2, 1004198400
-          tz.transition 2002, 3, :o3, 1017504000
-          tz.transition 2002, 10, :o2, 1035648000
-          tz.transition 2003, 3, :o3, 1048953600
-          tz.transition 2003, 10, :o2, 1067097600
-          tz.transition 2004, 3, :o3, 1080403200
-          tz.transition 2004, 10, :o2, 1099152000
-          tz.transition 2005, 3, :o3, 1111852800
-          tz.transition 2005, 10, :o2, 1130601600
-          tz.transition 2006, 3, :o3, 1143302400
-          tz.transition 2006, 10, :o2, 1162051200
-          tz.transition 2007, 3, :o3, 1174752000
-          tz.transition 2007, 10, :o2, 1193500800
-          tz.transition 2008, 3, :o3, 1206806400
-          tz.transition 2008, 10, :o2, 1224950400
-          tz.transition 2009, 3, :o3, 1238256000
-          tz.transition 2009, 10, :o2, 1256400000
-          tz.transition 2010, 3, :o3, 1269705600
-          tz.transition 2010, 10, :o2, 1288454400
-          tz.transition 2011, 3, :o3, 1301155200
-          tz.transition 2011, 10, :o2, 1319904000
-          tz.transition 2012, 3, :o3, 1332604800
-          tz.transition 2012, 10, :o2, 1351353600
-          tz.transition 2013, 3, :o3, 1364659200
-          tz.transition 2013, 10, :o2, 1382803200
-          tz.transition 2014, 3, :o3, 1396108800
-          tz.transition 2014, 10, :o2, 1414252800
-          tz.transition 2015, 3, :o3, 1427558400
-          tz.transition 2015, 10, :o2, 1445702400
-          tz.transition 2016, 3, :o3, 1459008000
-          tz.transition 2016, 10, :o2, 1477756800
-          tz.transition 2017, 3, :o3, 1490457600
-          tz.transition 2017, 10, :o2, 1509206400
-          tz.transition 2018, 3, :o3, 1521907200
-          tz.transition 2018, 10, :o2, 1540656000
-          tz.transition 2019, 3, :o3, 1553961600
-          tz.transition 2019, 10, :o2, 1572105600
-          tz.transition 2020, 3, :o3, 1585411200
-          tz.transition 2020, 10, :o2, 1603555200
-          tz.transition 2021, 3, :o3, 1616860800
-          tz.transition 2021, 10, :o2, 1635609600
-          tz.transition 2022, 3, :o3, 1648310400
-          tz.transition 2022, 10, :o2, 1667059200
-          tz.transition 2023, 3, :o3, 1679760000
-          tz.transition 2023, 10, :o2, 1698508800
-          tz.transition 2024, 3, :o3, 1711814400
-          tz.transition 2024, 10, :o2, 1729958400
-          tz.transition 2025, 3, :o3, 1743264000
-          tz.transition 2025, 10, :o2, 1761408000
-          tz.transition 2026, 3, :o3, 1774713600
-          tz.transition 2026, 10, :o2, 1792857600
-          tz.transition 2027, 3, :o3, 1806163200
-          tz.transition 2027, 10, :o2, 1824912000
-          tz.transition 2028, 3, :o3, 1837612800
-          tz.transition 2028, 10, :o2, 1856361600
-          tz.transition 2029, 3, :o3, 1869062400
-          tz.transition 2029, 10, :o2, 1887811200
-          tz.transition 2030, 3, :o3, 1901116800
-          tz.transition 2030, 10, :o2, 1919260800
-          tz.transition 2031, 3, :o3, 1932566400
-          tz.transition 2031, 10, :o2, 1950710400
-          tz.transition 2032, 3, :o3, 1964016000
-          tz.transition 2032, 10, :o2, 1982764800
-          tz.transition 2033, 3, :o3, 1995465600
-          tz.transition 2033, 10, :o2, 2014214400
-          tz.transition 2034, 3, :o3, 2026915200
-          tz.transition 2034, 10, :o2, 2045664000
-          tz.transition 2035, 3, :o3, 2058364800
-          tz.transition 2035, 10, :o2, 2077113600
-          tz.transition 2036, 3, :o3, 2090419200
-          tz.transition 2036, 10, :o2, 2108563200
-          tz.transition 2037, 3, :o3, 2121868800
-          tz.transition 2037, 10, :o2, 2140012800
-          tz.transition 2038, 3, :o3, 14793061, 6
-          tz.transition 2038, 10, :o2, 14794363, 6
-          tz.transition 2039, 3, :o3, 14795245, 6
-          tz.transition 2039, 10, :o2, 14796547, 6
-          tz.transition 2040, 3, :o3, 14797429, 6
-          tz.transition 2040, 10, :o2, 14798731, 6
-          tz.transition 2041, 3, :o3, 14799655, 6
-          tz.transition 2041, 10, :o2, 14800915, 6
-          tz.transition 2042, 3, :o3, 14801839, 6
-          tz.transition 2042, 10, :o2, 14803099, 6
-          tz.transition 2043, 3, :o3, 14804023, 6
-          tz.transition 2043, 10, :o2, 14805283, 6
-          tz.transition 2044, 3, :o3, 14806207, 6
-          tz.transition 2044, 10, :o2, 14807509, 6
-          tz.transition 2045, 3, :o3, 14808391, 6
-          tz.transition 2045, 10, :o2, 14809693, 6
-          tz.transition 2046, 3, :o3, 14810575, 6
-          tz.transition 2046, 10, :o2, 14811877, 6
-          tz.transition 2047, 3, :o3, 14812801, 6
-          tz.transition 2047, 10, :o2, 14814061, 6
-          tz.transition 2048, 3, :o3, 14814985, 6
-          tz.transition 2048, 10, :o2, 14816245, 6
-          tz.transition 2049, 3, :o3, 14817169, 6
-          tz.transition 2049, 10, :o2, 14818471, 6
-          tz.transition 2050, 3, :o3, 14819353, 6
-          tz.transition 2050, 10, :o2, 14820655, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yakutsk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yakutsk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yakutsk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yakutsk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Yakutsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Yakutsk' do |tz|
-          tz.offset :o0, 31120, 0, :LMT
-          tz.offset :o1, 28800, 0, :YAKT
-          tz.offset :o2, 32400, 0, :YAKT
-          tz.offset :o3, 32400, 3600, :YAKST
-          tz.offset :o4, 28800, 3600, :YAKST
-          
-          tz.transition 1919, 12, :o1, 2616091711, 1080
-          tz.transition 1930, 6, :o2, 14556889, 6
-          tz.transition 1981, 3, :o3, 354898800
-          tz.transition 1981, 9, :o2, 370706400
-          tz.transition 1982, 3, :o3, 386434800
-          tz.transition 1982, 9, :o2, 402242400
-          tz.transition 1983, 3, :o3, 417970800
-          tz.transition 1983, 9, :o2, 433778400
-          tz.transition 1984, 3, :o3, 449593200
-          tz.transition 1984, 9, :o2, 465325200
-          tz.transition 1985, 3, :o3, 481050000
-          tz.transition 1985, 9, :o2, 496774800
-          tz.transition 1986, 3, :o3, 512499600
-          tz.transition 1986, 9, :o2, 528224400
-          tz.transition 1987, 3, :o3, 543949200
-          tz.transition 1987, 9, :o2, 559674000
-          tz.transition 1988, 3, :o3, 575398800
-          tz.transition 1988, 9, :o2, 591123600
-          tz.transition 1989, 3, :o3, 606848400
-          tz.transition 1989, 9, :o2, 622573200
-          tz.transition 1990, 3, :o3, 638298000
-          tz.transition 1990, 9, :o2, 654627600
-          tz.transition 1991, 3, :o4, 670352400
-          tz.transition 1991, 9, :o1, 686080800
-          tz.transition 1992, 1, :o2, 695757600
-          tz.transition 1992, 3, :o3, 701791200
-          tz.transition 1992, 9, :o2, 717512400
-          tz.transition 1993, 3, :o3, 733251600
-          tz.transition 1993, 9, :o2, 748976400
-          tz.transition 1994, 3, :o3, 764701200
-          tz.transition 1994, 9, :o2, 780426000
-          tz.transition 1995, 3, :o3, 796150800
-          tz.transition 1995, 9, :o2, 811875600
-          tz.transition 1996, 3, :o3, 828205200
-          tz.transition 1996, 10, :o2, 846349200
-          tz.transition 1997, 3, :o3, 859654800
-          tz.transition 1997, 10, :o2, 877798800
-          tz.transition 1998, 3, :o3, 891104400
-          tz.transition 1998, 10, :o2, 909248400
-          tz.transition 1999, 3, :o3, 922554000
-          tz.transition 1999, 10, :o2, 941302800
-          tz.transition 2000, 3, :o3, 954003600
-          tz.transition 2000, 10, :o2, 972752400
-          tz.transition 2001, 3, :o3, 985453200
-          tz.transition 2001, 10, :o2, 1004202000
-          tz.transition 2002, 3, :o3, 1017507600
-          tz.transition 2002, 10, :o2, 1035651600
-          tz.transition 2003, 3, :o3, 1048957200
-          tz.transition 2003, 10, :o2, 1067101200
-          tz.transition 2004, 3, :o3, 1080406800
-          tz.transition 2004, 10, :o2, 1099155600
-          tz.transition 2005, 3, :o3, 1111856400
-          tz.transition 2005, 10, :o2, 1130605200
-          tz.transition 2006, 3, :o3, 1143306000
-          tz.transition 2006, 10, :o2, 1162054800
-          tz.transition 2007, 3, :o3, 1174755600
-          tz.transition 2007, 10, :o2, 1193504400
-          tz.transition 2008, 3, :o3, 1206810000
-          tz.transition 2008, 10, :o2, 1224954000
-          tz.transition 2009, 3, :o3, 1238259600
-          tz.transition 2009, 10, :o2, 1256403600
-          tz.transition 2010, 3, :o3, 1269709200
-          tz.transition 2010, 10, :o2, 1288458000
-          tz.transition 2011, 3, :o3, 1301158800
-          tz.transition 2011, 10, :o2, 1319907600
-          tz.transition 2012, 3, :o3, 1332608400
-          tz.transition 2012, 10, :o2, 1351357200
-          tz.transition 2013, 3, :o3, 1364662800
-          tz.transition 2013, 10, :o2, 1382806800
-          tz.transition 2014, 3, :o3, 1396112400
-          tz.transition 2014, 10, :o2, 1414256400
-          tz.transition 2015, 3, :o3, 1427562000
-          tz.transition 2015, 10, :o2, 1445706000
-          tz.transition 2016, 3, :o3, 1459011600
-          tz.transition 2016, 10, :o2, 1477760400
-          tz.transition 2017, 3, :o3, 1490461200
-          tz.transition 2017, 10, :o2, 1509210000
-          tz.transition 2018, 3, :o3, 1521910800
-          tz.transition 2018, 10, :o2, 1540659600
-          tz.transition 2019, 3, :o3, 1553965200
-          tz.transition 2019, 10, :o2, 1572109200
-          tz.transition 2020, 3, :o3, 1585414800
-          tz.transition 2020, 10, :o2, 1603558800
-          tz.transition 2021, 3, :o3, 1616864400
-          tz.transition 2021, 10, :o2, 1635613200
-          tz.transition 2022, 3, :o3, 1648314000
-          tz.transition 2022, 10, :o2, 1667062800
-          tz.transition 2023, 3, :o3, 1679763600
-          tz.transition 2023, 10, :o2, 1698512400
-          tz.transition 2024, 3, :o3, 1711818000
-          tz.transition 2024, 10, :o2, 1729962000
-          tz.transition 2025, 3, :o3, 1743267600
-          tz.transition 2025, 10, :o2, 1761411600
-          tz.transition 2026, 3, :o3, 1774717200
-          tz.transition 2026, 10, :o2, 1792861200
-          tz.transition 2027, 3, :o3, 1806166800
-          tz.transition 2027, 10, :o2, 1824915600
-          tz.transition 2028, 3, :o3, 1837616400
-          tz.transition 2028, 10, :o2, 1856365200
-          tz.transition 2029, 3, :o3, 1869066000
-          tz.transition 2029, 10, :o2, 1887814800
-          tz.transition 2030, 3, :o3, 1901120400
-          tz.transition 2030, 10, :o2, 1919264400
-          tz.transition 2031, 3, :o3, 1932570000
-          tz.transition 2031, 10, :o2, 1950714000
-          tz.transition 2032, 3, :o3, 1964019600
-          tz.transition 2032, 10, :o2, 1982768400
-          tz.transition 2033, 3, :o3, 1995469200
-          tz.transition 2033, 10, :o2, 2014218000
-          tz.transition 2034, 3, :o3, 2026918800
-          tz.transition 2034, 10, :o2, 2045667600
-          tz.transition 2035, 3, :o3, 2058368400
-          tz.transition 2035, 10, :o2, 2077117200
-          tz.transition 2036, 3, :o3, 2090422800
-          tz.transition 2036, 10, :o2, 2108566800
-          tz.transition 2037, 3, :o3, 2121872400
-          tz.transition 2037, 10, :o2, 2140016400
-          tz.transition 2038, 3, :o3, 59172245, 24
-          tz.transition 2038, 10, :o2, 59177453, 24
-          tz.transition 2039, 3, :o3, 59180981, 24
-          tz.transition 2039, 10, :o2, 59186189, 24
-          tz.transition 2040, 3, :o3, 59189717, 24
-          tz.transition 2040, 10, :o2, 59194925, 24
-          tz.transition 2041, 3, :o3, 59198621, 24
-          tz.transition 2041, 10, :o2, 59203661, 24
-          tz.transition 2042, 3, :o3, 59207357, 24
-          tz.transition 2042, 10, :o2, 59212397, 24
-          tz.transition 2043, 3, :o3, 59216093, 24
-          tz.transition 2043, 10, :o2, 59221133, 24
-          tz.transition 2044, 3, :o3, 59224829, 24
-          tz.transition 2044, 10, :o2, 59230037, 24
-          tz.transition 2045, 3, :o3, 59233565, 24
-          tz.transition 2045, 10, :o2, 59238773, 24
-          tz.transition 2046, 3, :o3, 59242301, 24
-          tz.transition 2046, 10, :o2, 59247509, 24
-          tz.transition 2047, 3, :o3, 59251205, 24
-          tz.transition 2047, 10, :o2, 59256245, 24
-          tz.transition 2048, 3, :o3, 59259941, 24
-          tz.transition 2048, 10, :o2, 59264981, 24
-          tz.transition 2049, 3, :o3, 59268677, 24
-          tz.transition 2049, 10, :o2, 59273885, 24
-          tz.transition 2050, 3, :o3, 59277413, 24
-          tz.transition 2050, 10, :o2, 59282621, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yekaterinburg.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yekaterinburg.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yekaterinburg.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yekaterinburg.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Yekaterinburg
-        include TimezoneDefinition
-        
-        timezone 'Asia/Yekaterinburg' do |tz|
-          tz.offset :o0, 14544, 0, :LMT
-          tz.offset :o1, 14400, 0, :SVET
-          tz.offset :o2, 18000, 0, :SVET
-          tz.offset :o3, 18000, 3600, :SVEST
-          tz.offset :o4, 14400, 3600, :SVEST
-          tz.offset :o5, 18000, 0, :YEKT
-          tz.offset :o6, 18000, 3600, :YEKST
-          
-          tz.transition 1919, 7, :o1, 1453292699, 600
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1981, 3, :o3, 354913200
-          tz.transition 1981, 9, :o2, 370720800
-          tz.transition 1982, 3, :o3, 386449200
-          tz.transition 1982, 9, :o2, 402256800
-          tz.transition 1983, 3, :o3, 417985200
-          tz.transition 1983, 9, :o2, 433792800
-          tz.transition 1984, 3, :o3, 449607600
-          tz.transition 1984, 9, :o2, 465339600
-          tz.transition 1985, 3, :o3, 481064400
-          tz.transition 1985, 9, :o2, 496789200
-          tz.transition 1986, 3, :o3, 512514000
-          tz.transition 1986, 9, :o2, 528238800
-          tz.transition 1987, 3, :o3, 543963600
-          tz.transition 1987, 9, :o2, 559688400
-          tz.transition 1988, 3, :o3, 575413200
-          tz.transition 1988, 9, :o2, 591138000
-          tz.transition 1989, 3, :o3, 606862800
-          tz.transition 1989, 9, :o2, 622587600
-          tz.transition 1990, 3, :o3, 638312400
-          tz.transition 1990, 9, :o2, 654642000
-          tz.transition 1991, 3, :o4, 670366800
-          tz.transition 1991, 9, :o1, 686095200
-          tz.transition 1992, 1, :o5, 695772000
-          tz.transition 1992, 3, :o6, 701805600
-          tz.transition 1992, 9, :o5, 717526800
-          tz.transition 1993, 3, :o6, 733266000
-          tz.transition 1993, 9, :o5, 748990800
-          tz.transition 1994, 3, :o6, 764715600
-          tz.transition 1994, 9, :o5, 780440400
-          tz.transition 1995, 3, :o6, 796165200
-          tz.transition 1995, 9, :o5, 811890000
-          tz.transition 1996, 3, :o6, 828219600
-          tz.transition 1996, 10, :o5, 846363600
-          tz.transition 1997, 3, :o6, 859669200
-          tz.transition 1997, 10, :o5, 877813200
-          tz.transition 1998, 3, :o6, 891118800
-          tz.transition 1998, 10, :o5, 909262800
-          tz.transition 1999, 3, :o6, 922568400
-          tz.transition 1999, 10, :o5, 941317200
-          tz.transition 2000, 3, :o6, 954018000
-          tz.transition 2000, 10, :o5, 972766800
-          tz.transition 2001, 3, :o6, 985467600
-          tz.transition 2001, 10, :o5, 1004216400
-          tz.transition 2002, 3, :o6, 1017522000
-          tz.transition 2002, 10, :o5, 1035666000
-          tz.transition 2003, 3, :o6, 1048971600
-          tz.transition 2003, 10, :o5, 1067115600
-          tz.transition 2004, 3, :o6, 1080421200
-          tz.transition 2004, 10, :o5, 1099170000
-          tz.transition 2005, 3, :o6, 1111870800
-          tz.transition 2005, 10, :o5, 1130619600
-          tz.transition 2006, 3, :o6, 1143320400
-          tz.transition 2006, 10, :o5, 1162069200
-          tz.transition 2007, 3, :o6, 1174770000
-          tz.transition 2007, 10, :o5, 1193518800
-          tz.transition 2008, 3, :o6, 1206824400
-          tz.transition 2008, 10, :o5, 1224968400
-          tz.transition 2009, 3, :o6, 1238274000
-          tz.transition 2009, 10, :o5, 1256418000
-          tz.transition 2010, 3, :o6, 1269723600
-          tz.transition 2010, 10, :o5, 1288472400
-          tz.transition 2011, 3, :o6, 1301173200
-          tz.transition 2011, 10, :o5, 1319922000
-          tz.transition 2012, 3, :o6, 1332622800
-          tz.transition 2012, 10, :o5, 1351371600
-          tz.transition 2013, 3, :o6, 1364677200
-          tz.transition 2013, 10, :o5, 1382821200
-          tz.transition 2014, 3, :o6, 1396126800
-          tz.transition 2014, 10, :o5, 1414270800
-          tz.transition 2015, 3, :o6, 1427576400
-          tz.transition 2015, 10, :o5, 1445720400
-          tz.transition 2016, 3, :o6, 1459026000
-          tz.transition 2016, 10, :o5, 1477774800
-          tz.transition 2017, 3, :o6, 1490475600
-          tz.transition 2017, 10, :o5, 1509224400
-          tz.transition 2018, 3, :o6, 1521925200
-          tz.transition 2018, 10, :o5, 1540674000
-          tz.transition 2019, 3, :o6, 1553979600
-          tz.transition 2019, 10, :o5, 1572123600
-          tz.transition 2020, 3, :o6, 1585429200
-          tz.transition 2020, 10, :o5, 1603573200
-          tz.transition 2021, 3, :o6, 1616878800
-          tz.transition 2021, 10, :o5, 1635627600
-          tz.transition 2022, 3, :o6, 1648328400
-          tz.transition 2022, 10, :o5, 1667077200
-          tz.transition 2023, 3, :o6, 1679778000
-          tz.transition 2023, 10, :o5, 1698526800
-          tz.transition 2024, 3, :o6, 1711832400
-          tz.transition 2024, 10, :o5, 1729976400
-          tz.transition 2025, 3, :o6, 1743282000
-          tz.transition 2025, 10, :o5, 1761426000
-          tz.transition 2026, 3, :o6, 1774731600
-          tz.transition 2026, 10, :o5, 1792875600
-          tz.transition 2027, 3, :o6, 1806181200
-          tz.transition 2027, 10, :o5, 1824930000
-          tz.transition 2028, 3, :o6, 1837630800
-          tz.transition 2028, 10, :o5, 1856379600
-          tz.transition 2029, 3, :o6, 1869080400
-          tz.transition 2029, 10, :o5, 1887829200
-          tz.transition 2030, 3, :o6, 1901134800
-          tz.transition 2030, 10, :o5, 1919278800
-          tz.transition 2031, 3, :o6, 1932584400
-          tz.transition 2031, 10, :o5, 1950728400
-          tz.transition 2032, 3, :o6, 1964034000
-          tz.transition 2032, 10, :o5, 1982782800
-          tz.transition 2033, 3, :o6, 1995483600
-          tz.transition 2033, 10, :o5, 2014232400
-          tz.transition 2034, 3, :o6, 2026933200
-          tz.transition 2034, 10, :o5, 2045682000
-          tz.transition 2035, 3, :o6, 2058382800
-          tz.transition 2035, 10, :o5, 2077131600
-          tz.transition 2036, 3, :o6, 2090437200
-          tz.transition 2036, 10, :o5, 2108581200
-          tz.transition 2037, 3, :o6, 2121886800
-          tz.transition 2037, 10, :o5, 2140030800
-          tz.transition 2038, 3, :o6, 19724083, 8
-          tz.transition 2038, 10, :o5, 19725819, 8
-          tz.transition 2039, 3, :o6, 19726995, 8
-          tz.transition 2039, 10, :o5, 19728731, 8
-          tz.transition 2040, 3, :o6, 19729907, 8
-          tz.transition 2040, 10, :o5, 19731643, 8
-          tz.transition 2041, 3, :o6, 19732875, 8
-          tz.transition 2041, 10, :o5, 19734555, 8
-          tz.transition 2042, 3, :o6, 19735787, 8
-          tz.transition 2042, 10, :o5, 19737467, 8
-          tz.transition 2043, 3, :o6, 19738699, 8
-          tz.transition 2043, 10, :o5, 19740379, 8
-          tz.transition 2044, 3, :o6, 19741611, 8
-          tz.transition 2044, 10, :o5, 19743347, 8
-          tz.transition 2045, 3, :o6, 19744523, 8
-          tz.transition 2045, 10, :o5, 19746259, 8
-          tz.transition 2046, 3, :o6, 19747435, 8
-          tz.transition 2046, 10, :o5, 19749171, 8
-          tz.transition 2047, 3, :o6, 19750403, 8
-          tz.transition 2047, 10, :o5, 19752083, 8
-          tz.transition 2048, 3, :o6, 19753315, 8
-          tz.transition 2048, 10, :o5, 19754995, 8
-          tz.transition 2049, 3, :o6, 19756227, 8
-          tz.transition 2049, 10, :o5, 19757963, 8
-          tz.transition 2050, 3, :o6, 19759139, 8
-          tz.transition 2050, 10, :o5, 19760875, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yerevan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yerevan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yerevan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Asia/Yerevan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Yerevan
-        include TimezoneDefinition
-        
-        timezone 'Asia/Yerevan' do |tz|
-          tz.offset :o0, 10680, 0, :LMT
-          tz.offset :o1, 10800, 0, :YERT
-          tz.offset :o2, 14400, 0, :YERT
-          tz.offset :o3, 14400, 3600, :YERST
-          tz.offset :o4, 10800, 3600, :YERST
-          tz.offset :o5, 10800, 3600, :AMST
-          tz.offset :o6, 10800, 0, :AMT
-          tz.offset :o7, 14400, 0, :AMT
-          tz.offset :o8, 14400, 3600, :AMST
-          
-          tz.transition 1924, 5, :o1, 1745213311, 720
-          tz.transition 1957, 2, :o2, 19487187, 8
-          tz.transition 1981, 3, :o3, 354916800
-          tz.transition 1981, 9, :o2, 370724400
-          tz.transition 1982, 3, :o3, 386452800
-          tz.transition 1982, 9, :o2, 402260400
-          tz.transition 1983, 3, :o3, 417988800
-          tz.transition 1983, 9, :o2, 433796400
-          tz.transition 1984, 3, :o3, 449611200
-          tz.transition 1984, 9, :o2, 465343200
-          tz.transition 1985, 3, :o3, 481068000
-          tz.transition 1985, 9, :o2, 496792800
-          tz.transition 1986, 3, :o3, 512517600
-          tz.transition 1986, 9, :o2, 528242400
-          tz.transition 1987, 3, :o3, 543967200
-          tz.transition 1987, 9, :o2, 559692000
-          tz.transition 1988, 3, :o3, 575416800
-          tz.transition 1988, 9, :o2, 591141600
-          tz.transition 1989, 3, :o3, 606866400
-          tz.transition 1989, 9, :o2, 622591200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 9, :o2, 654645600
-          tz.transition 1991, 3, :o4, 670370400
-          tz.transition 1991, 9, :o5, 685569600
-          tz.transition 1991, 9, :o6, 686098800
-          tz.transition 1992, 3, :o5, 701812800
-          tz.transition 1992, 9, :o6, 717534000
-          tz.transition 1993, 3, :o5, 733273200
-          tz.transition 1993, 9, :o6, 748998000
-          tz.transition 1994, 3, :o5, 764722800
-          tz.transition 1994, 9, :o6, 780447600
-          tz.transition 1995, 3, :o5, 796172400
-          tz.transition 1995, 9, :o7, 811897200
-          tz.transition 1997, 3, :o8, 859672800
-          tz.transition 1997, 10, :o7, 877816800
-          tz.transition 1998, 3, :o8, 891122400
-          tz.transition 1998, 10, :o7, 909266400
-          tz.transition 1999, 3, :o8, 922572000
-          tz.transition 1999, 10, :o7, 941320800
-          tz.transition 2000, 3, :o8, 954021600
-          tz.transition 2000, 10, :o7, 972770400
-          tz.transition 2001, 3, :o8, 985471200
-          tz.transition 2001, 10, :o7, 1004220000
-          tz.transition 2002, 3, :o8, 1017525600
-          tz.transition 2002, 10, :o7, 1035669600
-          tz.transition 2003, 3, :o8, 1048975200
-          tz.transition 2003, 10, :o7, 1067119200
-          tz.transition 2004, 3, :o8, 1080424800
-          tz.transition 2004, 10, :o7, 1099173600
-          tz.transition 2005, 3, :o8, 1111874400
-          tz.transition 2005, 10, :o7, 1130623200
-          tz.transition 2006, 3, :o8, 1143324000
-          tz.transition 2006, 10, :o7, 1162072800
-          tz.transition 2007, 3, :o8, 1174773600
-          tz.transition 2007, 10, :o7, 1193522400
-          tz.transition 2008, 3, :o8, 1206828000
-          tz.transition 2008, 10, :o7, 1224972000
-          tz.transition 2009, 3, :o8, 1238277600
-          tz.transition 2009, 10, :o7, 1256421600
-          tz.transition 2010, 3, :o8, 1269727200
-          tz.transition 2010, 10, :o7, 1288476000
-          tz.transition 2011, 3, :o8, 1301176800
-          tz.transition 2011, 10, :o7, 1319925600
-          tz.transition 2012, 3, :o8, 1332626400
-          tz.transition 2012, 10, :o7, 1351375200
-          tz.transition 2013, 3, :o8, 1364680800
-          tz.transition 2013, 10, :o7, 1382824800
-          tz.transition 2014, 3, :o8, 1396130400
-          tz.transition 2014, 10, :o7, 1414274400
-          tz.transition 2015, 3, :o8, 1427580000
-          tz.transition 2015, 10, :o7, 1445724000
-          tz.transition 2016, 3, :o8, 1459029600
-          tz.transition 2016, 10, :o7, 1477778400
-          tz.transition 2017, 3, :o8, 1490479200
-          tz.transition 2017, 10, :o7, 1509228000
-          tz.transition 2018, 3, :o8, 1521928800
-          tz.transition 2018, 10, :o7, 1540677600
-          tz.transition 2019, 3, :o8, 1553983200
-          tz.transition 2019, 10, :o7, 1572127200
-          tz.transition 2020, 3, :o8, 1585432800
-          tz.transition 2020, 10, :o7, 1603576800
-          tz.transition 2021, 3, :o8, 1616882400
-          tz.transition 2021, 10, :o7, 1635631200
-          tz.transition 2022, 3, :o8, 1648332000
-          tz.transition 2022, 10, :o7, 1667080800
-          tz.transition 2023, 3, :o8, 1679781600
-          tz.transition 2023, 10, :o7, 1698530400
-          tz.transition 2024, 3, :o8, 1711836000
-          tz.transition 2024, 10, :o7, 1729980000
-          tz.transition 2025, 3, :o8, 1743285600
-          tz.transition 2025, 10, :o7, 1761429600
-          tz.transition 2026, 3, :o8, 1774735200
-          tz.transition 2026, 10, :o7, 1792879200
-          tz.transition 2027, 3, :o8, 1806184800
-          tz.transition 2027, 10, :o7, 1824933600
-          tz.transition 2028, 3, :o8, 1837634400
-          tz.transition 2028, 10, :o7, 1856383200
-          tz.transition 2029, 3, :o8, 1869084000
-          tz.transition 2029, 10, :o7, 1887832800
-          tz.transition 2030, 3, :o8, 1901138400
-          tz.transition 2030, 10, :o7, 1919282400
-          tz.transition 2031, 3, :o8, 1932588000
-          tz.transition 2031, 10, :o7, 1950732000
-          tz.transition 2032, 3, :o8, 1964037600
-          tz.transition 2032, 10, :o7, 1982786400
-          tz.transition 2033, 3, :o8, 1995487200
-          tz.transition 2033, 10, :o7, 2014236000
-          tz.transition 2034, 3, :o8, 2026936800
-          tz.transition 2034, 10, :o7, 2045685600
-          tz.transition 2035, 3, :o8, 2058386400
-          tz.transition 2035, 10, :o7, 2077135200
-          tz.transition 2036, 3, :o8, 2090440800
-          tz.transition 2036, 10, :o7, 2108584800
-          tz.transition 2037, 3, :o8, 2121890400
-          tz.transition 2037, 10, :o7, 2140034400
-          tz.transition 2038, 3, :o8, 29586125, 12
-          tz.transition 2038, 10, :o7, 29588729, 12
-          tz.transition 2039, 3, :o8, 29590493, 12
-          tz.transition 2039, 10, :o7, 29593097, 12
-          tz.transition 2040, 3, :o8, 29594861, 12
-          tz.transition 2040, 10, :o7, 29597465, 12
-          tz.transition 2041, 3, :o8, 29599313, 12
-          tz.transition 2041, 10, :o7, 29601833, 12
-          tz.transition 2042, 3, :o8, 29603681, 12
-          tz.transition 2042, 10, :o7, 29606201, 12
-          tz.transition 2043, 3, :o8, 29608049, 12
-          tz.transition 2043, 10, :o7, 29610569, 12
-          tz.transition 2044, 3, :o8, 29612417, 12
-          tz.transition 2044, 10, :o7, 29615021, 12
-          tz.transition 2045, 3, :o8, 29616785, 12
-          tz.transition 2045, 10, :o7, 29619389, 12
-          tz.transition 2046, 3, :o8, 29621153, 12
-          tz.transition 2046, 10, :o7, 29623757, 12
-          tz.transition 2047, 3, :o8, 29625605, 12
-          tz.transition 2047, 10, :o7, 29628125, 12
-          tz.transition 2048, 3, :o8, 29629973, 12
-          tz.transition 2048, 10, :o7, 29632493, 12
-          tz.transition 2049, 3, :o8, 29634341, 12
-          tz.transition 2049, 10, :o7, 29636945, 12
-          tz.transition 2050, 3, :o8, 29638709, 12
-          tz.transition 2050, 10, :o7, 29641313, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Azores.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Azores.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Azores.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Azores.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,270 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Azores
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Azores' do |tz|
-          tz.offset :o0, -6160, 0, :LMT
-          tz.offset :o1, -6872, 0, :HMT
-          tz.offset :o2, -7200, 0, :AZOT
-          tz.offset :o3, -7200, 3600, :AZOST
-          tz.offset :o4, -7200, 7200, :AZOMT
-          tz.offset :o5, -3600, 0, :AZOT
-          tz.offset :o6, -3600, 3600, :AZOST
-          tz.offset :o7, 0, 0, :WET
-          
-          tz.transition 1884, 1, :o1, 2601910697, 1080
-          tz.transition 1911, 5, :o2, 26127150259, 10800
-          tz.transition 1916, 6, :o3, 58104781, 24
-          tz.transition 1916, 11, :o2, 29054023, 12
-          tz.transition 1917, 3, :o3, 58110925, 24
-          tz.transition 1917, 10, :o2, 58116397, 24
-          tz.transition 1918, 3, :o3, 58119709, 24
-          tz.transition 1918, 10, :o2, 58125157, 24
-          tz.transition 1919, 3, :o3, 58128445, 24
-          tz.transition 1919, 10, :o2, 58133917, 24
-          tz.transition 1920, 3, :o3, 58137229, 24
-          tz.transition 1920, 10, :o2, 58142701, 24
-          tz.transition 1921, 3, :o3, 58145989, 24
-          tz.transition 1921, 10, :o2, 58151461, 24
-          tz.transition 1924, 4, :o3, 58173421, 24
-          tz.transition 1924, 10, :o2, 58177765, 24
-          tz.transition 1926, 4, :o3, 58190965, 24
-          tz.transition 1926, 10, :o2, 58194997, 24
-          tz.transition 1927, 4, :o3, 58199533, 24
-          tz.transition 1927, 10, :o2, 58203733, 24
-          tz.transition 1928, 4, :o3, 58208437, 24
-          tz.transition 1928, 10, :o2, 58212637, 24
-          tz.transition 1929, 4, :o3, 58217341, 24
-          tz.transition 1929, 10, :o2, 58221373, 24
-          tz.transition 1931, 4, :o3, 58234813, 24
-          tz.transition 1931, 10, :o2, 58238845, 24
-          tz.transition 1932, 4, :o3, 58243213, 24
-          tz.transition 1932, 10, :o2, 58247581, 24
-          tz.transition 1934, 4, :o3, 58260853, 24
-          tz.transition 1934, 10, :o2, 58265221, 24
-          tz.transition 1935, 3, :o3, 58269421, 24
-          tz.transition 1935, 10, :o2, 58273957, 24
-          tz.transition 1936, 4, :o3, 58278661, 24
-          tz.transition 1936, 10, :o2, 58282693, 24
-          tz.transition 1937, 4, :o3, 58287061, 24
-          tz.transition 1937, 10, :o2, 58291429, 24
-          tz.transition 1938, 3, :o3, 58295629, 24
-          tz.transition 1938, 10, :o2, 58300165, 24
-          tz.transition 1939, 4, :o3, 58304869, 24
-          tz.transition 1939, 11, :o2, 58310077, 24
-          tz.transition 1940, 2, :o3, 58312429, 24
-          tz.transition 1940, 10, :o2, 58317805, 24
-          tz.transition 1941, 4, :o3, 58322173, 24
-          tz.transition 1941, 10, :o2, 58326565, 24
-          tz.transition 1942, 3, :o3, 58330405, 24
-          tz.transition 1942, 4, :o4, 4860951, 2
-          tz.transition 1942, 8, :o3, 4861175, 2
-          tz.transition 1942, 10, :o2, 58335781, 24
-          tz.transition 1943, 3, :o3, 58339141, 24
-          tz.transition 1943, 4, :o4, 4861665, 2
-          tz.transition 1943, 8, :o3, 4861931, 2
-          tz.transition 1943, 10, :o2, 58344685, 24
-          tz.transition 1944, 3, :o3, 58347877, 24
-          tz.transition 1944, 4, :o4, 4862407, 2
-          tz.transition 1944, 8, :o3, 4862659, 2
-          tz.transition 1944, 10, :o2, 58353421, 24
-          tz.transition 1945, 3, :o3, 58356613, 24
-          tz.transition 1945, 4, :o4, 4863135, 2
-          tz.transition 1945, 8, :o3, 4863387, 2
-          tz.transition 1945, 10, :o2, 58362157, 24
-          tz.transition 1946, 4, :o3, 58366021, 24
-          tz.transition 1946, 10, :o2, 58370389, 24
-          tz.transition 1947, 4, :o3, 7296845, 3
-          tz.transition 1947, 10, :o2, 7297391, 3
-          tz.transition 1948, 4, :o3, 7297937, 3
-          tz.transition 1948, 10, :o2, 7298483, 3
-          tz.transition 1949, 4, :o3, 7299029, 3
-          tz.transition 1949, 10, :o2, 7299575, 3
-          tz.transition 1951, 4, :o3, 7301213, 3
-          tz.transition 1951, 10, :o2, 7301780, 3
-          tz.transition 1952, 4, :o3, 7302326, 3
-          tz.transition 1952, 10, :o2, 7302872, 3
-          tz.transition 1953, 4, :o3, 7303418, 3
-          tz.transition 1953, 10, :o2, 7303964, 3
-          tz.transition 1954, 4, :o3, 7304510, 3
-          tz.transition 1954, 10, :o2, 7305056, 3
-          tz.transition 1955, 4, :o3, 7305602, 3
-          tz.transition 1955, 10, :o2, 7306148, 3
-          tz.transition 1956, 4, :o3, 7306694, 3
-          tz.transition 1956, 10, :o2, 7307261, 3
-          tz.transition 1957, 4, :o3, 7307807, 3
-          tz.transition 1957, 10, :o2, 7308353, 3
-          tz.transition 1958, 4, :o3, 7308899, 3
-          tz.transition 1958, 10, :o2, 7309445, 3
-          tz.transition 1959, 4, :o3, 7309991, 3
-          tz.transition 1959, 10, :o2, 7310537, 3
-          tz.transition 1960, 4, :o3, 7311083, 3
-          tz.transition 1960, 10, :o2, 7311629, 3
-          tz.transition 1961, 4, :o3, 7312175, 3
-          tz.transition 1961, 10, :o2, 7312721, 3
-          tz.transition 1962, 4, :o3, 7313267, 3
-          tz.transition 1962, 10, :o2, 7313834, 3
-          tz.transition 1963, 4, :o3, 7314380, 3
-          tz.transition 1963, 10, :o2, 7314926, 3
-          tz.transition 1964, 4, :o3, 7315472, 3
-          tz.transition 1964, 10, :o2, 7316018, 3
-          tz.transition 1965, 4, :o3, 7316564, 3
-          tz.transition 1965, 10, :o2, 7317110, 3
-          tz.transition 1966, 4, :o5, 7317656, 3
-          tz.transition 1977, 3, :o6, 228272400
-          tz.transition 1977, 9, :o5, 243997200
-          tz.transition 1978, 4, :o6, 260326800
-          tz.transition 1978, 10, :o5, 276051600
-          tz.transition 1979, 4, :o6, 291776400
-          tz.transition 1979, 9, :o5, 307504800
-          tz.transition 1980, 3, :o6, 323226000
-          tz.transition 1980, 9, :o5, 338954400
-          tz.transition 1981, 3, :o6, 354679200
-          tz.transition 1981, 9, :o5, 370404000
-          tz.transition 1982, 3, :o6, 386128800
-          tz.transition 1982, 9, :o5, 401853600
-          tz.transition 1983, 3, :o6, 417582000
-          tz.transition 1983, 9, :o5, 433303200
-          tz.transition 1984, 3, :o6, 449028000
-          tz.transition 1984, 9, :o5, 465357600
-          tz.transition 1985, 3, :o6, 481082400
-          tz.transition 1985, 9, :o5, 496807200
-          tz.transition 1986, 3, :o6, 512532000
-          tz.transition 1986, 9, :o5, 528256800
-          tz.transition 1987, 3, :o6, 543981600
-          tz.transition 1987, 9, :o5, 559706400
-          tz.transition 1988, 3, :o6, 575431200
-          tz.transition 1988, 9, :o5, 591156000
-          tz.transition 1989, 3, :o6, 606880800
-          tz.transition 1989, 9, :o5, 622605600
-          tz.transition 1990, 3, :o6, 638330400
-          tz.transition 1990, 9, :o5, 654660000
-          tz.transition 1991, 3, :o6, 670384800
-          tz.transition 1991, 9, :o5, 686109600
-          tz.transition 1992, 3, :o6, 701834400
-          tz.transition 1992, 9, :o7, 717559200
-          tz.transition 1993, 3, :o6, 733280400
-          tz.transition 1993, 9, :o5, 749005200
-          tz.transition 1994, 3, :o6, 764730000
-          tz.transition 1994, 9, :o5, 780454800
-          tz.transition 1995, 3, :o6, 796179600
-          tz.transition 1995, 9, :o5, 811904400
-          tz.transition 1996, 3, :o6, 828234000
-          tz.transition 1996, 10, :o5, 846378000
-          tz.transition 1997, 3, :o6, 859683600
-          tz.transition 1997, 10, :o5, 877827600
-          tz.transition 1998, 3, :o6, 891133200
-          tz.transition 1998, 10, :o5, 909277200
-          tz.transition 1999, 3, :o6, 922582800
-          tz.transition 1999, 10, :o5, 941331600
-          tz.transition 2000, 3, :o6, 954032400
-          tz.transition 2000, 10, :o5, 972781200
-          tz.transition 2001, 3, :o6, 985482000
-          tz.transition 2001, 10, :o5, 1004230800
-          tz.transition 2002, 3, :o6, 1017536400
-          tz.transition 2002, 10, :o5, 1035680400
-          tz.transition 2003, 3, :o6, 1048986000
-          tz.transition 2003, 10, :o5, 1067130000
-          tz.transition 2004, 3, :o6, 1080435600
-          tz.transition 2004, 10, :o5, 1099184400
-          tz.transition 2005, 3, :o6, 1111885200
-          tz.transition 2005, 10, :o5, 1130634000
-          tz.transition 2006, 3, :o6, 1143334800
-          tz.transition 2006, 10, :o5, 1162083600
-          tz.transition 2007, 3, :o6, 1174784400
-          tz.transition 2007, 10, :o5, 1193533200
-          tz.transition 2008, 3, :o6, 1206838800
-          tz.transition 2008, 10, :o5, 1224982800
-          tz.transition 2009, 3, :o6, 1238288400
-          tz.transition 2009, 10, :o5, 1256432400
-          tz.transition 2010, 3, :o6, 1269738000
-          tz.transition 2010, 10, :o5, 1288486800
-          tz.transition 2011, 3, :o6, 1301187600
-          tz.transition 2011, 10, :o5, 1319936400
-          tz.transition 2012, 3, :o6, 1332637200
-          tz.transition 2012, 10, :o5, 1351386000
-          tz.transition 2013, 3, :o6, 1364691600
-          tz.transition 2013, 10, :o5, 1382835600
-          tz.transition 2014, 3, :o6, 1396141200
-          tz.transition 2014, 10, :o5, 1414285200
-          tz.transition 2015, 3, :o6, 1427590800
-          tz.transition 2015, 10, :o5, 1445734800
-          tz.transition 2016, 3, :o6, 1459040400
-          tz.transition 2016, 10, :o5, 1477789200
-          tz.transition 2017, 3, :o6, 1490490000
-          tz.transition 2017, 10, :o5, 1509238800
-          tz.transition 2018, 3, :o6, 1521939600
-          tz.transition 2018, 10, :o5, 1540688400
-          tz.transition 2019, 3, :o6, 1553994000
-          tz.transition 2019, 10, :o5, 1572138000
-          tz.transition 2020, 3, :o6, 1585443600
-          tz.transition 2020, 10, :o5, 1603587600
-          tz.transition 2021, 3, :o6, 1616893200
-          tz.transition 2021, 10, :o5, 1635642000
-          tz.transition 2022, 3, :o6, 1648342800
-          tz.transition 2022, 10, :o5, 1667091600
-          tz.transition 2023, 3, :o6, 1679792400
-          tz.transition 2023, 10, :o5, 1698541200
-          tz.transition 2024, 3, :o6, 1711846800
-          tz.transition 2024, 10, :o5, 1729990800
-          tz.transition 2025, 3, :o6, 1743296400
-          tz.transition 2025, 10, :o5, 1761440400
-          tz.transition 2026, 3, :o6, 1774746000
-          tz.transition 2026, 10, :o5, 1792890000
-          tz.transition 2027, 3, :o6, 1806195600
-          tz.transition 2027, 10, :o5, 1824944400
-          tz.transition 2028, 3, :o6, 1837645200
-          tz.transition 2028, 10, :o5, 1856394000
-          tz.transition 2029, 3, :o6, 1869094800
-          tz.transition 2029, 10, :o5, 1887843600
-          tz.transition 2030, 3, :o6, 1901149200
-          tz.transition 2030, 10, :o5, 1919293200
-          tz.transition 2031, 3, :o6, 1932598800
-          tz.transition 2031, 10, :o5, 1950742800
-          tz.transition 2032, 3, :o6, 1964048400
-          tz.transition 2032, 10, :o5, 1982797200
-          tz.transition 2033, 3, :o6, 1995498000
-          tz.transition 2033, 10, :o5, 2014246800
-          tz.transition 2034, 3, :o6, 2026947600
-          tz.transition 2034, 10, :o5, 2045696400
-          tz.transition 2035, 3, :o6, 2058397200
-          tz.transition 2035, 10, :o5, 2077146000
-          tz.transition 2036, 3, :o6, 2090451600
-          tz.transition 2036, 10, :o5, 2108595600
-          tz.transition 2037, 3, :o6, 2121901200
-          tz.transition 2037, 10, :o5, 2140045200
-          tz.transition 2038, 3, :o6, 59172253, 24
-          tz.transition 2038, 10, :o5, 59177461, 24
-          tz.transition 2039, 3, :o6, 59180989, 24
-          tz.transition 2039, 10, :o5, 59186197, 24
-          tz.transition 2040, 3, :o6, 59189725, 24
-          tz.transition 2040, 10, :o5, 59194933, 24
-          tz.transition 2041, 3, :o6, 59198629, 24
-          tz.transition 2041, 10, :o5, 59203669, 24
-          tz.transition 2042, 3, :o6, 59207365, 24
-          tz.transition 2042, 10, :o5, 59212405, 24
-          tz.transition 2043, 3, :o6, 59216101, 24
-          tz.transition 2043, 10, :o5, 59221141, 24
-          tz.transition 2044, 3, :o6, 59224837, 24
-          tz.transition 2044, 10, :o5, 59230045, 24
-          tz.transition 2045, 3, :o6, 59233573, 24
-          tz.transition 2045, 10, :o5, 59238781, 24
-          tz.transition 2046, 3, :o6, 59242309, 24
-          tz.transition 2046, 10, :o5, 59247517, 24
-          tz.transition 2047, 3, :o6, 59251213, 24
-          tz.transition 2047, 10, :o5, 59256253, 24
-          tz.transition 2048, 3, :o6, 59259949, 24
-          tz.transition 2048, 10, :o5, 59264989, 24
-          tz.transition 2049, 3, :o6, 59268685, 24
-          tz.transition 2049, 10, :o5, 59273893, 24
-          tz.transition 2050, 3, :o6, 59277421, 24
-          tz.transition 2050, 10, :o5, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Bermuda.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Bermuda.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Bermuda.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Bermuda.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,173 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Bermuda
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Bermuda' do |tz|
-          tz.offset :o0, -15544, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          
-          tz.transition 1930, 1, :o1, 26200559843, 10800
-          tz.transition 1974, 4, :o2, 136360800
-          tz.transition 1974, 10, :o1, 152082000
-          tz.transition 1975, 4, :o2, 167810400
-          tz.transition 1975, 10, :o1, 183531600
-          tz.transition 1976, 4, :o2, 199260000
-          tz.transition 1976, 10, :o1, 215586000
-          tz.transition 1977, 4, :o2, 230709600
-          tz.transition 1977, 10, :o1, 247035600
-          tz.transition 1978, 4, :o2, 262764000
-          tz.transition 1978, 10, :o1, 278485200
-          tz.transition 1979, 4, :o2, 294213600
-          tz.transition 1979, 10, :o1, 309934800
-          tz.transition 1980, 4, :o2, 325663200
-          tz.transition 1980, 10, :o1, 341384400
-          tz.transition 1981, 4, :o2, 357112800
-          tz.transition 1981, 10, :o1, 372834000
-          tz.transition 1982, 4, :o2, 388562400
-          tz.transition 1982, 10, :o1, 404888400
-          tz.transition 1983, 4, :o2, 420012000
-          tz.transition 1983, 10, :o1, 436338000
-          tz.transition 1984, 4, :o2, 452066400
-          tz.transition 1984, 10, :o1, 467787600
-          tz.transition 1985, 4, :o2, 483516000
-          tz.transition 1985, 10, :o1, 499237200
-          tz.transition 1986, 4, :o2, 514965600
-          tz.transition 1986, 10, :o1, 530686800
-          tz.transition 1987, 4, :o2, 544600800
-          tz.transition 1987, 10, :o1, 562136400
-          tz.transition 1988, 4, :o2, 576050400
-          tz.transition 1988, 10, :o1, 594190800
-          tz.transition 1989, 4, :o2, 607500000
-          tz.transition 1989, 10, :o1, 625640400
-          tz.transition 1990, 4, :o2, 638949600
-          tz.transition 1990, 10, :o1, 657090000
-          tz.transition 1991, 4, :o2, 671004000
-          tz.transition 1991, 10, :o1, 688539600
-          tz.transition 1992, 4, :o2, 702453600
-          tz.transition 1992, 10, :o1, 719989200
-          tz.transition 1993, 4, :o2, 733903200
-          tz.transition 1993, 10, :o1, 752043600
-          tz.transition 1994, 4, :o2, 765352800
-          tz.transition 1994, 10, :o1, 783493200
-          tz.transition 1995, 4, :o2, 796802400
-          tz.transition 1995, 10, :o1, 814942800
-          tz.transition 1996, 4, :o2, 828856800
-          tz.transition 1996, 10, :o1, 846392400
-          tz.transition 1997, 4, :o2, 860306400
-          tz.transition 1997, 10, :o1, 877842000
-          tz.transition 1998, 4, :o2, 891756000
-          tz.transition 1998, 10, :o1, 909291600
-          tz.transition 1999, 4, :o2, 923205600
-          tz.transition 1999, 10, :o1, 941346000
-          tz.transition 2000, 4, :o2, 954655200
-          tz.transition 2000, 10, :o1, 972795600
-          tz.transition 2001, 4, :o2, 986104800
-          tz.transition 2001, 10, :o1, 1004245200
-          tz.transition 2002, 4, :o2, 1018159200
-          tz.transition 2002, 10, :o1, 1035694800
-          tz.transition 2003, 4, :o2, 1049608800
-          tz.transition 2003, 10, :o1, 1067144400
-          tz.transition 2004, 4, :o2, 1081058400
-          tz.transition 2004, 10, :o1, 1099198800
-          tz.transition 2005, 4, :o2, 1112508000
-          tz.transition 2005, 10, :o1, 1130648400
-          tz.transition 2006, 4, :o2, 1143957600
-          tz.transition 2006, 10, :o1, 1162098000
-          tz.transition 2007, 3, :o2, 1173592800
-          tz.transition 2007, 11, :o1, 1194152400
-          tz.transition 2008, 3, :o2, 1205042400
-          tz.transition 2008, 11, :o1, 1225602000
-          tz.transition 2009, 3, :o2, 1236492000
-          tz.transition 2009, 11, :o1, 1257051600
-          tz.transition 2010, 3, :o2, 1268546400
-          tz.transition 2010, 11, :o1, 1289106000
-          tz.transition 2011, 3, :o2, 1299996000
-          tz.transition 2011, 11, :o1, 1320555600
-          tz.transition 2012, 3, :o2, 1331445600
-          tz.transition 2012, 11, :o1, 1352005200
-          tz.transition 2013, 3, :o2, 1362895200
-          tz.transition 2013, 11, :o1, 1383454800
-          tz.transition 2014, 3, :o2, 1394344800
-          tz.transition 2014, 11, :o1, 1414904400
-          tz.transition 2015, 3, :o2, 1425794400
-          tz.transition 2015, 11, :o1, 1446354000
-          tz.transition 2016, 3, :o2, 1457848800
-          tz.transition 2016, 11, :o1, 1478408400
-          tz.transition 2017, 3, :o2, 1489298400
-          tz.transition 2017, 11, :o1, 1509858000
-          tz.transition 2018, 3, :o2, 1520748000
-          tz.transition 2018, 11, :o1, 1541307600
-          tz.transition 2019, 3, :o2, 1552197600
-          tz.transition 2019, 11, :o1, 1572757200
-          tz.transition 2020, 3, :o2, 1583647200
-          tz.transition 2020, 11, :o1, 1604206800
-          tz.transition 2021, 3, :o2, 1615701600
-          tz.transition 2021, 11, :o1, 1636261200
-          tz.transition 2022, 3, :o2, 1647151200
-          tz.transition 2022, 11, :o1, 1667710800
-          tz.transition 2023, 3, :o2, 1678600800
-          tz.transition 2023, 11, :o1, 1699160400
-          tz.transition 2024, 3, :o2, 1710050400
-          tz.transition 2024, 11, :o1, 1730610000
-          tz.transition 2025, 3, :o2, 1741500000
-          tz.transition 2025, 11, :o1, 1762059600
-          tz.transition 2026, 3, :o2, 1772949600
-          tz.transition 2026, 11, :o1, 1793509200
-          tz.transition 2027, 3, :o2, 1805004000
-          tz.transition 2027, 11, :o1, 1825563600
-          tz.transition 2028, 3, :o2, 1836453600
-          tz.transition 2028, 11, :o1, 1857013200
-          tz.transition 2029, 3, :o2, 1867903200
-          tz.transition 2029, 11, :o1, 1888462800
-          tz.transition 2030, 3, :o2, 1899352800
-          tz.transition 2030, 11, :o1, 1919912400
-          tz.transition 2031, 3, :o2, 1930802400
-          tz.transition 2031, 11, :o1, 1951362000
-          tz.transition 2032, 3, :o2, 1962856800
-          tz.transition 2032, 11, :o1, 1983416400
-          tz.transition 2033, 3, :o2, 1994306400
-          tz.transition 2033, 11, :o1, 2014866000
-          tz.transition 2034, 3, :o2, 2025756000
-          tz.transition 2034, 11, :o1, 2046315600
-          tz.transition 2035, 3, :o2, 2057205600
-          tz.transition 2035, 11, :o1, 2077765200
-          tz.transition 2036, 3, :o2, 2088655200
-          tz.transition 2036, 11, :o1, 2109214800
-          tz.transition 2037, 3, :o2, 2120104800
-          tz.transition 2037, 11, :o1, 2140664400
-          tz.transition 2038, 3, :o2, 9861987, 4
-          tz.transition 2038, 11, :o1, 59177633, 24
-          tz.transition 2039, 3, :o2, 9863443, 4
-          tz.transition 2039, 11, :o1, 59186369, 24
-          tz.transition 2040, 3, :o2, 9864899, 4
-          tz.transition 2040, 11, :o1, 59195105, 24
-          tz.transition 2041, 3, :o2, 9866355, 4
-          tz.transition 2041, 11, :o1, 59203841, 24
-          tz.transition 2042, 3, :o2, 9867811, 4
-          tz.transition 2042, 11, :o1, 59212577, 24
-          tz.transition 2043, 3, :o2, 9869267, 4
-          tz.transition 2043, 11, :o1, 59221313, 24
-          tz.transition 2044, 3, :o2, 9870751, 4
-          tz.transition 2044, 11, :o1, 59230217, 24
-          tz.transition 2045, 3, :o2, 9872207, 4
-          tz.transition 2045, 11, :o1, 59238953, 24
-          tz.transition 2046, 3, :o2, 9873663, 4
-          tz.transition 2046, 11, :o1, 59247689, 24
-          tz.transition 2047, 3, :o2, 9875119, 4
-          tz.transition 2047, 11, :o1, 59256425, 24
-          tz.transition 2048, 3, :o2, 9876575, 4
-          tz.transition 2048, 11, :o1, 59265161, 24
-          tz.transition 2049, 3, :o2, 9878059, 4
-          tz.transition 2049, 11, :o1, 59274065, 24
-          tz.transition 2050, 3, :o2, 9879515, 4
-          tz.transition 2050, 11, :o1, 59282801, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Canary.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Canary.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Canary.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Canary.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Canary
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Canary' do |tz|
-          tz.offset :o0, -3696, 0, :LMT
-          tz.offset :o1, -3600, 0, :CANT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 0, 3600, :WEST
-          
-          tz.transition 1922, 3, :o1, 4361606177, 1800
-          tz.transition 1946, 9, :o2, 29185123, 12
-          tz.transition 1980, 4, :o3, 323827200
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Cape_Verde
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Cape_Verde' do |tz|
-          tz.offset :o0, -5644, 0, :LMT
-          tz.offset :o1, -7200, 0, :CVT
-          tz.offset :o2, -7200, 3600, :CVST
-          tz.offset :o3, -3600, 0, :CVT
-          
-          tz.transition 1907, 1, :o1, 52219653811, 21600
-          tz.transition 1942, 9, :o2, 29167243, 12
-          tz.transition 1945, 10, :o1, 58361845, 24
-          tz.transition 1975, 11, :o3, 186120000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Faeroe.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Faeroe.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Faeroe.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Faeroe.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,159 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Faeroe
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Faeroe' do |tz|
-          tz.offset :o0, -1624, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          
-          tz.transition 1908, 1, :o1, 26113876403, 10800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Jan_Mayen.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Jan_Mayen.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Jan_Mayen.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Jan_Mayen.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Jan_Mayen
-        include TimezoneDefinition
-        
-        linked_timezone 'Atlantic/Jan_Mayen', 'Europe/Oslo'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Madeira.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Madeira.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Madeira.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Madeira.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,269 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Madeira
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Madeira' do |tz|
-          tz.offset :o0, -4056, 0, :LMT
-          tz.offset :o1, -4056, 0, :FMT
-          tz.offset :o2, -3600, 0, :MADT
-          tz.offset :o3, -3600, 3600, :MADST
-          tz.offset :o4, -3600, 7200, :MADMT
-          tz.offset :o5, 0, 0, :WET
-          tz.offset :o6, 0, 3600, :WEST
-          
-          tz.transition 1884, 1, :o1, 8673035569, 3600
-          tz.transition 1911, 5, :o2, 8709049969, 3600
-          tz.transition 1916, 6, :o3, 4842065, 2
-          tz.transition 1916, 11, :o2, 58108045, 24
-          tz.transition 1917, 3, :o3, 4842577, 2
-          tz.transition 1917, 10, :o2, 4843033, 2
-          tz.transition 1918, 3, :o3, 4843309, 2
-          tz.transition 1918, 10, :o2, 4843763, 2
-          tz.transition 1919, 3, :o3, 4844037, 2
-          tz.transition 1919, 10, :o2, 4844493, 2
-          tz.transition 1920, 3, :o3, 4844769, 2
-          tz.transition 1920, 10, :o2, 4845225, 2
-          tz.transition 1921, 3, :o3, 4845499, 2
-          tz.transition 1921, 10, :o2, 4845955, 2
-          tz.transition 1924, 4, :o3, 4847785, 2
-          tz.transition 1924, 10, :o2, 4848147, 2
-          tz.transition 1926, 4, :o3, 4849247, 2
-          tz.transition 1926, 10, :o2, 4849583, 2
-          tz.transition 1927, 4, :o3, 4849961, 2
-          tz.transition 1927, 10, :o2, 4850311, 2
-          tz.transition 1928, 4, :o3, 4850703, 2
-          tz.transition 1928, 10, :o2, 4851053, 2
-          tz.transition 1929, 4, :o3, 4851445, 2
-          tz.transition 1929, 10, :o2, 4851781, 2
-          tz.transition 1931, 4, :o3, 4852901, 2
-          tz.transition 1931, 10, :o2, 4853237, 2
-          tz.transition 1932, 4, :o3, 4853601, 2
-          tz.transition 1932, 10, :o2, 4853965, 2
-          tz.transition 1934, 4, :o3, 4855071, 2
-          tz.transition 1934, 10, :o2, 4855435, 2
-          tz.transition 1935, 3, :o3, 4855785, 2
-          tz.transition 1935, 10, :o2, 4856163, 2
-          tz.transition 1936, 4, :o3, 4856555, 2
-          tz.transition 1936, 10, :o2, 4856891, 2
-          tz.transition 1937, 4, :o3, 4857255, 2
-          tz.transition 1937, 10, :o2, 4857619, 2
-          tz.transition 1938, 3, :o3, 4857969, 2
-          tz.transition 1938, 10, :o2, 4858347, 2
-          tz.transition 1939, 4, :o3, 4858739, 2
-          tz.transition 1939, 11, :o2, 4859173, 2
-          tz.transition 1940, 2, :o3, 4859369, 2
-          tz.transition 1940, 10, :o2, 4859817, 2
-          tz.transition 1941, 4, :o3, 4860181, 2
-          tz.transition 1941, 10, :o2, 4860547, 2
-          tz.transition 1942, 3, :o3, 4860867, 2
-          tz.transition 1942, 4, :o4, 58331411, 24
-          tz.transition 1942, 8, :o3, 58334099, 24
-          tz.transition 1942, 10, :o2, 4861315, 2
-          tz.transition 1943, 3, :o3, 4861595, 2
-          tz.transition 1943, 4, :o4, 58339979, 24
-          tz.transition 1943, 8, :o3, 58343171, 24
-          tz.transition 1943, 10, :o2, 4862057, 2
-          tz.transition 1944, 3, :o3, 4862323, 2
-          tz.transition 1944, 4, :o4, 58348883, 24
-          tz.transition 1944, 8, :o3, 58351907, 24
-          tz.transition 1944, 10, :o2, 4862785, 2
-          tz.transition 1945, 3, :o3, 4863051, 2
-          tz.transition 1945, 4, :o4, 58357619, 24
-          tz.transition 1945, 8, :o3, 58360643, 24
-          tz.transition 1945, 10, :o2, 4863513, 2
-          tz.transition 1946, 4, :o3, 4863835, 2
-          tz.transition 1946, 10, :o2, 4864199, 2
-          tz.transition 1947, 4, :o3, 19458253, 8
-          tz.transition 1947, 10, :o2, 19459709, 8
-          tz.transition 1948, 4, :o3, 19461165, 8
-          tz.transition 1948, 10, :o2, 19462621, 8
-          tz.transition 1949, 4, :o3, 19464077, 8
-          tz.transition 1949, 10, :o2, 19465533, 8
-          tz.transition 1951, 4, :o3, 19469901, 8
-          tz.transition 1951, 10, :o2, 19471413, 8
-          tz.transition 1952, 4, :o3, 19472869, 8
-          tz.transition 1952, 10, :o2, 19474325, 8
-          tz.transition 1953, 4, :o3, 19475781, 8
-          tz.transition 1953, 10, :o2, 19477237, 8
-          tz.transition 1954, 4, :o3, 19478693, 8
-          tz.transition 1954, 10, :o2, 19480149, 8
-          tz.transition 1955, 4, :o3, 19481605, 8
-          tz.transition 1955, 10, :o2, 19483061, 8
-          tz.transition 1956, 4, :o3, 19484517, 8
-          tz.transition 1956, 10, :o2, 19486029, 8
-          tz.transition 1957, 4, :o3, 19487485, 8
-          tz.transition 1957, 10, :o2, 19488941, 8
-          tz.transition 1958, 4, :o3, 19490397, 8
-          tz.transition 1958, 10, :o2, 19491853, 8
-          tz.transition 1959, 4, :o3, 19493309, 8
-          tz.transition 1959, 10, :o2, 19494765, 8
-          tz.transition 1960, 4, :o3, 19496221, 8
-          tz.transition 1960, 10, :o2, 19497677, 8
-          tz.transition 1961, 4, :o3, 19499133, 8
-          tz.transition 1961, 10, :o2, 19500589, 8
-          tz.transition 1962, 4, :o3, 19502045, 8
-          tz.transition 1962, 10, :o2, 19503557, 8
-          tz.transition 1963, 4, :o3, 19505013, 8
-          tz.transition 1963, 10, :o2, 19506469, 8
-          tz.transition 1964, 4, :o3, 19507925, 8
-          tz.transition 1964, 10, :o2, 19509381, 8
-          tz.transition 1965, 4, :o3, 19510837, 8
-          tz.transition 1965, 10, :o2, 19512293, 8
-          tz.transition 1966, 4, :o5, 19513749, 8
-          tz.transition 1977, 3, :o6, 228268800
-          tz.transition 1977, 9, :o5, 243993600
-          tz.transition 1978, 4, :o6, 260323200
-          tz.transition 1978, 10, :o5, 276048000
-          tz.transition 1979, 4, :o6, 291772800
-          tz.transition 1979, 9, :o5, 307501200
-          tz.transition 1980, 3, :o6, 323222400
-          tz.transition 1980, 9, :o5, 338950800
-          tz.transition 1981, 3, :o6, 354675600
-          tz.transition 1981, 9, :o5, 370400400
-          tz.transition 1982, 3, :o6, 386125200
-          tz.transition 1982, 9, :o5, 401850000
-          tz.transition 1983, 3, :o6, 417578400
-          tz.transition 1983, 9, :o5, 433299600
-          tz.transition 1984, 3, :o6, 449024400
-          tz.transition 1984, 9, :o5, 465354000
-          tz.transition 1985, 3, :o6, 481078800
-          tz.transition 1985, 9, :o5, 496803600
-          tz.transition 1986, 3, :o6, 512528400
-          tz.transition 1986, 9, :o5, 528253200
-          tz.transition 1987, 3, :o6, 543978000
-          tz.transition 1987, 9, :o5, 559702800
-          tz.transition 1988, 3, :o6, 575427600
-          tz.transition 1988, 9, :o5, 591152400
-          tz.transition 1989, 3, :o6, 606877200
-          tz.transition 1989, 9, :o5, 622602000
-          tz.transition 1990, 3, :o6, 638326800
-          tz.transition 1990, 9, :o5, 654656400
-          tz.transition 1991, 3, :o6, 670381200
-          tz.transition 1991, 9, :o5, 686106000
-          tz.transition 1992, 3, :o6, 701830800
-          tz.transition 1992, 9, :o5, 717555600
-          tz.transition 1993, 3, :o6, 733280400
-          tz.transition 1993, 9, :o5, 749005200
-          tz.transition 1994, 3, :o6, 764730000
-          tz.transition 1994, 9, :o5, 780454800
-          tz.transition 1995, 3, :o6, 796179600
-          tz.transition 1995, 9, :o5, 811904400
-          tz.transition 1996, 3, :o6, 828234000
-          tz.transition 1996, 10, :o5, 846378000
-          tz.transition 1997, 3, :o6, 859683600
-          tz.transition 1997, 10, :o5, 877827600
-          tz.transition 1998, 3, :o6, 891133200
-          tz.transition 1998, 10, :o5, 909277200
-          tz.transition 1999, 3, :o6, 922582800
-          tz.transition 1999, 10, :o5, 941331600
-          tz.transition 2000, 3, :o6, 954032400
-          tz.transition 2000, 10, :o5, 972781200
-          tz.transition 2001, 3, :o6, 985482000
-          tz.transition 2001, 10, :o5, 1004230800
-          tz.transition 2002, 3, :o6, 1017536400
-          tz.transition 2002, 10, :o5, 1035680400
-          tz.transition 2003, 3, :o6, 1048986000
-          tz.transition 2003, 10, :o5, 1067130000
-          tz.transition 2004, 3, :o6, 1080435600
-          tz.transition 2004, 10, :o5, 1099184400
-          tz.transition 2005, 3, :o6, 1111885200
-          tz.transition 2005, 10, :o5, 1130634000
-          tz.transition 2006, 3, :o6, 1143334800
-          tz.transition 2006, 10, :o5, 1162083600
-          tz.transition 2007, 3, :o6, 1174784400
-          tz.transition 2007, 10, :o5, 1193533200
-          tz.transition 2008, 3, :o6, 1206838800
-          tz.transition 2008, 10, :o5, 1224982800
-          tz.transition 2009, 3, :o6, 1238288400
-          tz.transition 2009, 10, :o5, 1256432400
-          tz.transition 2010, 3, :o6, 1269738000
-          tz.transition 2010, 10, :o5, 1288486800
-          tz.transition 2011, 3, :o6, 1301187600
-          tz.transition 2011, 10, :o5, 1319936400
-          tz.transition 2012, 3, :o6, 1332637200
-          tz.transition 2012, 10, :o5, 1351386000
-          tz.transition 2013, 3, :o6, 1364691600
-          tz.transition 2013, 10, :o5, 1382835600
-          tz.transition 2014, 3, :o6, 1396141200
-          tz.transition 2014, 10, :o5, 1414285200
-          tz.transition 2015, 3, :o6, 1427590800
-          tz.transition 2015, 10, :o5, 1445734800
-          tz.transition 2016, 3, :o6, 1459040400
-          tz.transition 2016, 10, :o5, 1477789200
-          tz.transition 2017, 3, :o6, 1490490000
-          tz.transition 2017, 10, :o5, 1509238800
-          tz.transition 2018, 3, :o6, 1521939600
-          tz.transition 2018, 10, :o5, 1540688400
-          tz.transition 2019, 3, :o6, 1553994000
-          tz.transition 2019, 10, :o5, 1572138000
-          tz.transition 2020, 3, :o6, 1585443600
-          tz.transition 2020, 10, :o5, 1603587600
-          tz.transition 2021, 3, :o6, 1616893200
-          tz.transition 2021, 10, :o5, 1635642000
-          tz.transition 2022, 3, :o6, 1648342800
-          tz.transition 2022, 10, :o5, 1667091600
-          tz.transition 2023, 3, :o6, 1679792400
-          tz.transition 2023, 10, :o5, 1698541200
-          tz.transition 2024, 3, :o6, 1711846800
-          tz.transition 2024, 10, :o5, 1729990800
-          tz.transition 2025, 3, :o6, 1743296400
-          tz.transition 2025, 10, :o5, 1761440400
-          tz.transition 2026, 3, :o6, 1774746000
-          tz.transition 2026, 10, :o5, 1792890000
-          tz.transition 2027, 3, :o6, 1806195600
-          tz.transition 2027, 10, :o5, 1824944400
-          tz.transition 2028, 3, :o6, 1837645200
-          tz.transition 2028, 10, :o5, 1856394000
-          tz.transition 2029, 3, :o6, 1869094800
-          tz.transition 2029, 10, :o5, 1887843600
-          tz.transition 2030, 3, :o6, 1901149200
-          tz.transition 2030, 10, :o5, 1919293200
-          tz.transition 2031, 3, :o6, 1932598800
-          tz.transition 2031, 10, :o5, 1950742800
-          tz.transition 2032, 3, :o6, 1964048400
-          tz.transition 2032, 10, :o5, 1982797200
-          tz.transition 2033, 3, :o6, 1995498000
-          tz.transition 2033, 10, :o5, 2014246800
-          tz.transition 2034, 3, :o6, 2026947600
-          tz.transition 2034, 10, :o5, 2045696400
-          tz.transition 2035, 3, :o6, 2058397200
-          tz.transition 2035, 10, :o5, 2077146000
-          tz.transition 2036, 3, :o6, 2090451600
-          tz.transition 2036, 10, :o5, 2108595600
-          tz.transition 2037, 3, :o6, 2121901200
-          tz.transition 2037, 10, :o5, 2140045200
-          tz.transition 2038, 3, :o6, 59172253, 24
-          tz.transition 2038, 10, :o5, 59177461, 24
-          tz.transition 2039, 3, :o6, 59180989, 24
-          tz.transition 2039, 10, :o5, 59186197, 24
-          tz.transition 2040, 3, :o6, 59189725, 24
-          tz.transition 2040, 10, :o5, 59194933, 24
-          tz.transition 2041, 3, :o6, 59198629, 24
-          tz.transition 2041, 10, :o5, 59203669, 24
-          tz.transition 2042, 3, :o6, 59207365, 24
-          tz.transition 2042, 10, :o5, 59212405, 24
-          tz.transition 2043, 3, :o6, 59216101, 24
-          tz.transition 2043, 10, :o5, 59221141, 24
-          tz.transition 2044, 3, :o6, 59224837, 24
-          tz.transition 2044, 10, :o5, 59230045, 24
-          tz.transition 2045, 3, :o6, 59233573, 24
-          tz.transition 2045, 10, :o5, 59238781, 24
-          tz.transition 2046, 3, :o6, 59242309, 24
-          tz.transition 2046, 10, :o5, 59247517, 24
-          tz.transition 2047, 3, :o6, 59251213, 24
-          tz.transition 2047, 10, :o5, 59256253, 24
-          tz.transition 2048, 3, :o6, 59259949, 24
-          tz.transition 2048, 10, :o5, 59264989, 24
-          tz.transition 2049, 3, :o6, 59268685, 24
-          tz.transition 2049, 10, :o5, 59273893, 24
-          tz.transition 2050, 3, :o6, 59277421, 24
-          tz.transition 2050, 10, :o5, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Reykjavik.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Reykjavik.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Reykjavik.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Reykjavik.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,85 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Reykjavik
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Reykjavik' do |tz|
-          tz.offset :o0, -5244, 0, :LMT
-          tz.offset :o1, -5268, 0, :RMT
-          tz.offset :o2, -3600, 0, :IST
-          tz.offset :o3, -3600, 3600, :ISST
-          tz.offset :o4, 0, 0, :GMT
-          
-          tz.transition 1837, 1, :o1, 17222476037, 7200
-          tz.transition 1908, 1, :o2, 17409179239, 7200
-          tz.transition 1917, 2, :o3, 4842559, 2
-          tz.transition 1917, 10, :o2, 58116541, 24
-          tz.transition 1918, 2, :o3, 4843289, 2
-          tz.transition 1918, 11, :o2, 58125925, 24
-          tz.transition 1939, 4, :o3, 4858767, 2
-          tz.transition 1939, 11, :o2, 29155159, 12
-          tz.transition 1940, 2, :o3, 19437477, 8
-          tz.transition 1940, 11, :o2, 29159239, 12
-          tz.transition 1941, 3, :o3, 29160667, 12
-          tz.transition 1941, 11, :o2, 29163607, 12
-          tz.transition 1942, 3, :o3, 29165119, 12
-          tz.transition 1942, 10, :o2, 29167891, 12
-          tz.transition 1943, 3, :o3, 29169487, 12
-          tz.transition 1943, 10, :o2, 29172259, 12
-          tz.transition 1944, 3, :o3, 29173855, 12
-          tz.transition 1944, 10, :o2, 29176627, 12
-          tz.transition 1945, 3, :o3, 29178223, 12
-          tz.transition 1945, 10, :o2, 29181079, 12
-          tz.transition 1946, 3, :o3, 29182591, 12
-          tz.transition 1946, 10, :o2, 29185447, 12
-          tz.transition 1947, 4, :o3, 29187379, 12
-          tz.transition 1947, 10, :o2, 29189815, 12
-          tz.transition 1948, 4, :o3, 29191747, 12
-          tz.transition 1948, 10, :o2, 29194183, 12
-          tz.transition 1949, 4, :o3, 29196115, 12
-          tz.transition 1949, 10, :o2, 29198635, 12
-          tz.transition 1950, 4, :o3, 29200483, 12
-          tz.transition 1950, 10, :o2, 29202919, 12
-          tz.transition 1951, 4, :o3, 29204851, 12
-          tz.transition 1951, 10, :o2, 29207371, 12
-          tz.transition 1952, 4, :o3, 29209303, 12
-          tz.transition 1952, 10, :o2, 29211739, 12
-          tz.transition 1953, 4, :o3, 29213671, 12
-          tz.transition 1953, 10, :o2, 29216107, 12
-          tz.transition 1954, 4, :o3, 29218039, 12
-          tz.transition 1954, 10, :o2, 29220475, 12
-          tz.transition 1955, 4, :o3, 29222407, 12
-          tz.transition 1955, 10, :o2, 29224843, 12
-          tz.transition 1956, 4, :o3, 29226775, 12
-          tz.transition 1956, 10, :o2, 29229295, 12
-          tz.transition 1957, 4, :o3, 29231227, 12
-          tz.transition 1957, 10, :o2, 29233663, 12
-          tz.transition 1958, 4, :o3, 29235595, 12
-          tz.transition 1958, 10, :o2, 29238031, 12
-          tz.transition 1959, 4, :o3, 29239963, 12
-          tz.transition 1959, 10, :o2, 29242399, 12
-          tz.transition 1960, 4, :o3, 29244331, 12
-          tz.transition 1960, 10, :o2, 29246767, 12
-          tz.transition 1961, 4, :o3, 29248699, 12
-          tz.transition 1961, 10, :o2, 29251135, 12
-          tz.transition 1962, 4, :o3, 29253067, 12
-          tz.transition 1962, 10, :o2, 29255587, 12
-          tz.transition 1963, 4, :o3, 29257519, 12
-          tz.transition 1963, 10, :o2, 29259955, 12
-          tz.transition 1964, 4, :o3, 29261887, 12
-          tz.transition 1964, 10, :o2, 29264323, 12
-          tz.transition 1965, 4, :o3, 29266255, 12
-          tz.transition 1965, 10, :o2, 29268691, 12
-          tz.transition 1966, 4, :o3, 29270623, 12
-          tz.transition 1966, 10, :o2, 29273059, 12
-          tz.transition 1967, 4, :o3, 29274991, 12
-          tz.transition 1967, 10, :o2, 29277511, 12
-          tz.transition 1968, 4, :o4, 29279443, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/South_Georgia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/South_Georgia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/South_Georgia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/South_Georgia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module South_Georgia
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/South_Georgia' do |tz|
-          tz.offset :o0, -8768, 0, :LMT
-          tz.offset :o1, -7200, 0, :GST
-          
-          tz.transition 1890, 1, :o1, 1627673806, 675
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/St_Helena.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/St_Helena.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/St_Helena.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/St_Helena.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module St_Helena
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/St_Helena' do |tz|
-          tz.offset :o0, -1368, 0, :LMT
-          tz.offset :o1, -1368, 0, :JMT
-          tz.offset :o2, 0, 0, :GMT
-          
-          tz.transition 1890, 1, :o1, 2893642219, 1200
-          tz.transition 1951, 1, :o2, 2920377019, 1200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Stanley.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Stanley.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Stanley.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Atlantic/Stanley.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,170 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Stanley
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Stanley' do |tz|
-          tz.offset :o0, -13884, 0, :LMT
-          tz.offset :o1, -13884, 0, :SMT
-          tz.offset :o2, -14400, 0, :FKT
-          tz.offset :o3, -14400, 3600, :FKST
-          tz.offset :o4, -10800, 0, :FKT
-          tz.offset :o5, -10800, 3600, :FKST
-          
-          tz.transition 1890, 1, :o1, 17361854357, 7200
-          tz.transition 1912, 3, :o2, 17420210357, 7200
-          tz.transition 1937, 9, :o3, 7286408, 3
-          tz.transition 1938, 3, :o2, 19431821, 8
-          tz.transition 1938, 9, :o3, 7287500, 3
-          tz.transition 1939, 3, :o2, 19434733, 8
-          tz.transition 1939, 10, :o3, 7288613, 3
-          tz.transition 1940, 3, :o2, 19437701, 8
-          tz.transition 1940, 9, :o3, 7289705, 3
-          tz.transition 1941, 3, :o2, 19440613, 8
-          tz.transition 1941, 9, :o3, 7290797, 3
-          tz.transition 1942, 3, :o2, 19443525, 8
-          tz.transition 1942, 9, :o3, 7291889, 3
-          tz.transition 1943, 1, :o2, 19445805, 8
-          tz.transition 1983, 5, :o4, 420609600
-          tz.transition 1983, 9, :o5, 433306800
-          tz.transition 1984, 4, :o4, 452052000
-          tz.transition 1984, 9, :o5, 464151600
-          tz.transition 1985, 4, :o4, 483501600
-          tz.transition 1985, 9, :o3, 495601200
-          tz.transition 1986, 4, :o2, 514350000
-          tz.transition 1986, 9, :o3, 527054400
-          tz.transition 1987, 4, :o2, 545799600
-          tz.transition 1987, 9, :o3, 558504000
-          tz.transition 1988, 4, :o2, 577249200
-          tz.transition 1988, 9, :o3, 589953600
-          tz.transition 1989, 4, :o2, 608698800
-          tz.transition 1989, 9, :o3, 621403200
-          tz.transition 1990, 4, :o2, 640753200
-          tz.transition 1990, 9, :o3, 652852800
-          tz.transition 1991, 4, :o2, 672202800
-          tz.transition 1991, 9, :o3, 684907200
-          tz.transition 1992, 4, :o2, 703652400
-          tz.transition 1992, 9, :o3, 716356800
-          tz.transition 1993, 4, :o2, 735102000
-          tz.transition 1993, 9, :o3, 747806400
-          tz.transition 1994, 4, :o2, 766551600
-          tz.transition 1994, 9, :o3, 779256000
-          tz.transition 1995, 4, :o2, 798001200
-          tz.transition 1995, 9, :o3, 810705600
-          tz.transition 1996, 4, :o2, 830055600
-          tz.transition 1996, 9, :o3, 842760000
-          tz.transition 1997, 4, :o2, 861505200
-          tz.transition 1997, 9, :o3, 874209600
-          tz.transition 1998, 4, :o2, 892954800
-          tz.transition 1998, 9, :o3, 905659200
-          tz.transition 1999, 4, :o2, 924404400
-          tz.transition 1999, 9, :o3, 937108800
-          tz.transition 2000, 4, :o2, 955854000
-          tz.transition 2000, 9, :o3, 968558400
-          tz.transition 2001, 4, :o2, 987310800
-          tz.transition 2001, 9, :o3, 999410400
-          tz.transition 2002, 4, :o2, 1019365200
-          tz.transition 2002, 9, :o3, 1030860000
-          tz.transition 2003, 4, :o2, 1050814800
-          tz.transition 2003, 9, :o3, 1062914400
-          tz.transition 2004, 4, :o2, 1082264400
-          tz.transition 2004, 9, :o3, 1094364000
-          tz.transition 2005, 4, :o2, 1113714000
-          tz.transition 2005, 9, :o3, 1125813600
-          tz.transition 2006, 4, :o2, 1145163600
-          tz.transition 2006, 9, :o3, 1157263200
-          tz.transition 2007, 4, :o2, 1176613200
-          tz.transition 2007, 9, :o3, 1188712800
-          tz.transition 2008, 4, :o2, 1208667600
-          tz.transition 2008, 9, :o3, 1220767200
-          tz.transition 2009, 4, :o2, 1240117200
-          tz.transition 2009, 9, :o3, 1252216800
-          tz.transition 2010, 4, :o2, 1271566800
-          tz.transition 2010, 9, :o3, 1283666400
-          tz.transition 2011, 4, :o2, 1303016400
-          tz.transition 2011, 9, :o3, 1315116000
-          tz.transition 2012, 4, :o2, 1334466000
-          tz.transition 2012, 9, :o3, 1346565600
-          tz.transition 2013, 4, :o2, 1366520400
-          tz.transition 2013, 9, :o3, 1378015200
-          tz.transition 2014, 4, :o2, 1397970000
-          tz.transition 2014, 9, :o3, 1410069600
-          tz.transition 2015, 4, :o2, 1429419600
-          tz.transition 2015, 9, :o3, 1441519200
-          tz.transition 2016, 4, :o2, 1460869200
-          tz.transition 2016, 9, :o3, 1472968800
-          tz.transition 2017, 4, :o2, 1492318800
-          tz.transition 2017, 9, :o3, 1504418400
-          tz.transition 2018, 4, :o2, 1523768400
-          tz.transition 2018, 9, :o3, 1535868000
-          tz.transition 2019, 4, :o2, 1555822800
-          tz.transition 2019, 9, :o3, 1567317600
-          tz.transition 2020, 4, :o2, 1587272400
-          tz.transition 2020, 9, :o3, 1599372000
-          tz.transition 2021, 4, :o2, 1618722000
-          tz.transition 2021, 9, :o3, 1630821600
-          tz.transition 2022, 4, :o2, 1650171600
-          tz.transition 2022, 9, :o3, 1662271200
-          tz.transition 2023, 4, :o2, 1681621200
-          tz.transition 2023, 9, :o3, 1693720800
-          tz.transition 2024, 4, :o2, 1713675600
-          tz.transition 2024, 9, :o3, 1725170400
-          tz.transition 2025, 4, :o2, 1745125200
-          tz.transition 2025, 9, :o3, 1757224800
-          tz.transition 2026, 4, :o2, 1776574800
-          tz.transition 2026, 9, :o3, 1788674400
-          tz.transition 2027, 4, :o2, 1808024400
-          tz.transition 2027, 9, :o3, 1820124000
-          tz.transition 2028, 4, :o2, 1839474000
-          tz.transition 2028, 9, :o3, 1851573600
-          tz.transition 2029, 4, :o2, 1870923600
-          tz.transition 2029, 9, :o3, 1883023200
-          tz.transition 2030, 4, :o2, 1902978000
-          tz.transition 2030, 9, :o3, 1914472800
-          tz.transition 2031, 4, :o2, 1934427600
-          tz.transition 2031, 9, :o3, 1946527200
-          tz.transition 2032, 4, :o2, 1965877200
-          tz.transition 2032, 9, :o3, 1977976800
-          tz.transition 2033, 4, :o2, 1997326800
-          tz.transition 2033, 9, :o3, 2009426400
-          tz.transition 2034, 4, :o2, 2028776400
-          tz.transition 2034, 9, :o3, 2040876000
-          tz.transition 2035, 4, :o2, 2060226000
-          tz.transition 2035, 9, :o3, 2072325600
-          tz.transition 2036, 4, :o2, 2092280400
-          tz.transition 2036, 9, :o3, 2104380000
-          tz.transition 2037, 4, :o2, 2123730000
-          tz.transition 2037, 9, :o3, 2135829600
-          tz.transition 2038, 4, :o2, 59172761, 24
-          tz.transition 2038, 9, :o3, 9862687, 4
-          tz.transition 2039, 4, :o2, 59181497, 24
-          tz.transition 2039, 9, :o3, 9864143, 4
-          tz.transition 2040, 4, :o2, 59190233, 24
-          tz.transition 2040, 9, :o3, 9865599, 4
-          tz.transition 2041, 4, :o2, 59199137, 24
-          tz.transition 2041, 9, :o3, 9867055, 4
-          tz.transition 2042, 4, :o2, 59207873, 24
-          tz.transition 2042, 9, :o3, 9868539, 4
-          tz.transition 2043, 4, :o2, 59216609, 24
-          tz.transition 2043, 9, :o3, 9869995, 4
-          tz.transition 2044, 4, :o2, 59225345, 24
-          tz.transition 2044, 9, :o3, 9871451, 4
-          tz.transition 2045, 4, :o2, 59234081, 24
-          tz.transition 2045, 9, :o3, 9872907, 4
-          tz.transition 2046, 4, :o2, 59242817, 24
-          tz.transition 2046, 9, :o3, 9874363, 4
-          tz.transition 2047, 4, :o2, 59251721, 24
-          tz.transition 2047, 9, :o3, 9875819, 4
-          tz.transition 2048, 4, :o2, 59260457, 24
-          tz.transition 2048, 9, :o3, 9877303, 4
-          tz.transition 2049, 4, :o2, 59269193, 24
-          tz.transition 2049, 9, :o3, 9878759, 4
-          tz.transition 2050, 4, :o2, 59277929, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/ACT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/ACT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/ACT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/ACT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module ACT
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/ACT', 'Australia/Sydney'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Adelaide.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Adelaide.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Adelaide.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Adelaide.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,187 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Adelaide
-        include TimezoneDefinition
-        
-        timezone 'Australia/Adelaide' do |tz|
-          tz.offset :o0, 33260, 0, :LMT
-          tz.offset :o1, 32400, 0, :CST
-          tz.offset :o2, 34200, 0, :CST
-          tz.offset :o3, 34200, 3600, :CST
-          
-          tz.transition 1895, 1, :o1, 10425132497, 4320
-          tz.transition 1899, 4, :o2, 19318201, 8
-          tz.transition 1916, 12, :o3, 3486569911, 1440
-          tz.transition 1917, 3, :o2, 116222983, 48
-          tz.transition 1941, 12, :o3, 38885763, 16
-          tz.transition 1942, 3, :o2, 116661463, 48
-          tz.transition 1942, 9, :o3, 38890067, 16
-          tz.transition 1943, 3, :o2, 116678935, 48
-          tz.transition 1943, 10, :o3, 38896003, 16
-          tz.transition 1944, 3, :o2, 116696407, 48
-          tz.transition 1971, 10, :o3, 57688200
-          tz.transition 1972, 2, :o2, 67969800
-          tz.transition 1972, 10, :o3, 89137800
-          tz.transition 1973, 3, :o2, 100024200
-          tz.transition 1973, 10, :o3, 120587400
-          tz.transition 1974, 3, :o2, 131473800
-          tz.transition 1974, 10, :o3, 152037000
-          tz.transition 1975, 3, :o2, 162923400
-          tz.transition 1975, 10, :o3, 183486600
-          tz.transition 1976, 3, :o2, 194977800
-          tz.transition 1976, 10, :o3, 215541000
-          tz.transition 1977, 3, :o2, 226427400
-          tz.transition 1977, 10, :o3, 246990600
-          tz.transition 1978, 3, :o2, 257877000
-          tz.transition 1978, 10, :o3, 278440200
-          tz.transition 1979, 3, :o2, 289326600
-          tz.transition 1979, 10, :o3, 309889800
-          tz.transition 1980, 3, :o2, 320776200
-          tz.transition 1980, 10, :o3, 341339400
-          tz.transition 1981, 2, :o2, 352225800
-          tz.transition 1981, 10, :o3, 372789000
-          tz.transition 1982, 3, :o2, 384280200
-          tz.transition 1982, 10, :o3, 404843400
-          tz.transition 1983, 3, :o2, 415729800
-          tz.transition 1983, 10, :o3, 436293000
-          tz.transition 1984, 3, :o2, 447179400
-          tz.transition 1984, 10, :o3, 467742600
-          tz.transition 1985, 3, :o2, 478629000
-          tz.transition 1985, 10, :o3, 499192200
-          tz.transition 1986, 3, :o2, 511288200
-          tz.transition 1986, 10, :o3, 530037000
-          tz.transition 1987, 3, :o2, 542737800
-          tz.transition 1987, 10, :o3, 562091400
-          tz.transition 1988, 3, :o2, 574792200
-          tz.transition 1988, 10, :o3, 594145800
-          tz.transition 1989, 3, :o2, 606241800
-          tz.transition 1989, 10, :o3, 625595400
-          tz.transition 1990, 3, :o2, 637691400
-          tz.transition 1990, 10, :o3, 657045000
-          tz.transition 1991, 3, :o2, 667931400
-          tz.transition 1991, 10, :o3, 688494600
-          tz.transition 1992, 3, :o2, 701195400
-          tz.transition 1992, 10, :o3, 719944200
-          tz.transition 1993, 3, :o2, 731435400
-          tz.transition 1993, 10, :o3, 751998600
-          tz.transition 1994, 3, :o2, 764094600
-          tz.transition 1994, 10, :o3, 783448200
-          tz.transition 1995, 3, :o2, 796149000
-          tz.transition 1995, 10, :o3, 814897800
-          tz.transition 1996, 3, :o2, 828203400
-          tz.transition 1996, 10, :o3, 846347400
-          tz.transition 1997, 3, :o2, 859653000
-          tz.transition 1997, 10, :o3, 877797000
-          tz.transition 1998, 3, :o2, 891102600
-          tz.transition 1998, 10, :o3, 909246600
-          tz.transition 1999, 3, :o2, 922552200
-          tz.transition 1999, 10, :o3, 941301000
-          tz.transition 2000, 3, :o2, 954001800
-          tz.transition 2000, 10, :o3, 972750600
-          tz.transition 2001, 3, :o2, 985451400
-          tz.transition 2001, 10, :o3, 1004200200
-          tz.transition 2002, 3, :o2, 1017505800
-          tz.transition 2002, 10, :o3, 1035649800
-          tz.transition 2003, 3, :o2, 1048955400
-          tz.transition 2003, 10, :o3, 1067099400
-          tz.transition 2004, 3, :o2, 1080405000
-          tz.transition 2004, 10, :o3, 1099153800
-          tz.transition 2005, 3, :o2, 1111854600
-          tz.transition 2005, 10, :o3, 1130603400
-          tz.transition 2006, 4, :o2, 1143909000
-          tz.transition 2006, 10, :o3, 1162053000
-          tz.transition 2007, 3, :o2, 1174753800
-          tz.transition 2007, 10, :o3, 1193502600
-          tz.transition 2008, 3, :o2, 1206808200
-          tz.transition 2008, 10, :o3, 1224952200
-          tz.transition 2009, 3, :o2, 1238257800
-          tz.transition 2009, 10, :o3, 1256401800
-          tz.transition 2010, 3, :o2, 1269707400
-          tz.transition 2010, 10, :o3, 1288456200
-          tz.transition 2011, 3, :o2, 1301157000
-          tz.transition 2011, 10, :o3, 1319905800
-          tz.transition 2012, 3, :o2, 1332606600
-          tz.transition 2012, 10, :o3, 1351355400
-          tz.transition 2013, 3, :o2, 1364661000
-          tz.transition 2013, 10, :o3, 1382805000
-          tz.transition 2014, 3, :o2, 1396110600
-          tz.transition 2014, 10, :o3, 1414254600
-          tz.transition 2015, 3, :o2, 1427560200
-          tz.transition 2015, 10, :o3, 1445704200
-          tz.transition 2016, 3, :o2, 1459009800
-          tz.transition 2016, 10, :o3, 1477758600
-          tz.transition 2017, 3, :o2, 1490459400
-          tz.transition 2017, 10, :o3, 1509208200
-          tz.transition 2018, 3, :o2, 1521909000
-          tz.transition 2018, 10, :o3, 1540657800
-          tz.transition 2019, 3, :o2, 1553963400
-          tz.transition 2019, 10, :o3, 1572107400
-          tz.transition 2020, 3, :o2, 1585413000
-          tz.transition 2020, 10, :o3, 1603557000
-          tz.transition 2021, 3, :o2, 1616862600
-          tz.transition 2021, 10, :o3, 1635611400
-          tz.transition 2022, 3, :o2, 1648312200
-          tz.transition 2022, 10, :o3, 1667061000
-          tz.transition 2023, 3, :o2, 1679761800
-          tz.transition 2023, 10, :o3, 1698510600
-          tz.transition 2024, 3, :o2, 1711816200
-          tz.transition 2024, 10, :o3, 1729960200
-          tz.transition 2025, 3, :o2, 1743265800
-          tz.transition 2025, 10, :o3, 1761409800
-          tz.transition 2026, 3, :o2, 1774715400
-          tz.transition 2026, 10, :o3, 1792859400
-          tz.transition 2027, 3, :o2, 1806165000
-          tz.transition 2027, 10, :o3, 1824913800
-          tz.transition 2028, 3, :o2, 1837614600
-          tz.transition 2028, 10, :o3, 1856363400
-          tz.transition 2029, 3, :o2, 1869064200
-          tz.transition 2029, 10, :o3, 1887813000
-          tz.transition 2030, 3, :o2, 1901118600
-          tz.transition 2030, 10, :o3, 1919262600
-          tz.transition 2031, 3, :o2, 1932568200
-          tz.transition 2031, 10, :o3, 1950712200
-          tz.transition 2032, 3, :o2, 1964017800
-          tz.transition 2032, 10, :o3, 1982766600
-          tz.transition 2033, 3, :o2, 1995467400
-          tz.transition 2033, 10, :o3, 2014216200
-          tz.transition 2034, 3, :o2, 2026917000
-          tz.transition 2034, 10, :o3, 2045665800
-          tz.transition 2035, 3, :o2, 2058366600
-          tz.transition 2035, 10, :o3, 2077115400
-          tz.transition 2036, 3, :o2, 2090421000
-          tz.transition 2036, 10, :o3, 2108565000
-          tz.transition 2037, 3, :o2, 2121870600
-          tz.transition 2037, 10, :o3, 2140014600
-          tz.transition 2038, 3, :o2, 39448163, 16
-          tz.transition 2038, 10, :o3, 39451635, 16
-          tz.transition 2039, 3, :o2, 39453987, 16
-          tz.transition 2039, 10, :o3, 39457459, 16
-          tz.transition 2040, 3, :o2, 39459811, 16
-          tz.transition 2040, 10, :o3, 39463283, 16
-          tz.transition 2041, 3, :o2, 39465747, 16
-          tz.transition 2041, 10, :o3, 39469107, 16
-          tz.transition 2042, 3, :o2, 39471571, 16
-          tz.transition 2042, 10, :o3, 39474931, 16
-          tz.transition 2043, 3, :o2, 39477395, 16
-          tz.transition 2043, 10, :o3, 39480755, 16
-          tz.transition 2044, 3, :o2, 39483219, 16
-          tz.transition 2044, 10, :o3, 39486691, 16
-          tz.transition 2045, 3, :o2, 39489043, 16
-          tz.transition 2045, 10, :o3, 39492515, 16
-          tz.transition 2046, 3, :o2, 39494867, 16
-          tz.transition 2046, 10, :o3, 39498339, 16
-          tz.transition 2047, 3, :o2, 39500803, 16
-          tz.transition 2047, 10, :o3, 39504163, 16
-          tz.transition 2048, 3, :o2, 39506627, 16
-          tz.transition 2048, 10, :o3, 39509987, 16
-          tz.transition 2049, 3, :o2, 39512451, 16
-          tz.transition 2049, 10, :o3, 39515923, 16
-          tz.transition 2050, 3, :o2, 39518275, 16
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Brisbane.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Brisbane.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Brisbane.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Brisbane.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Brisbane
-        include TimezoneDefinition
-        
-        timezone 'Australia/Brisbane' do |tz|
-          tz.offset :o0, 36728, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1894, 12, :o1, 26062496009, 10800
-          tz.transition 1916, 12, :o2, 3486569881, 1440
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 636480000
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 667929600
-          tz.transition 1991, 10, :o2, 688492800
-          tz.transition 1992, 2, :o1, 699379200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Broken_Hill.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Broken_Hill.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Broken_Hill.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Broken_Hill.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,189 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Broken_Hill
-        include TimezoneDefinition
-        
-        timezone 'Australia/Broken_Hill' do |tz|
-          tz.offset :o0, 33948, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 32400, 0, :CST
-          tz.offset :o3, 34200, 0, :CST
-          tz.offset :o4, 34200, 3600, :CST
-          
-          tz.transition 1895, 1, :o1, 5791740257, 2400
-          tz.transition 1896, 8, :o2, 28965529, 12
-          tz.transition 1899, 4, :o3, 19318201, 8
-          tz.transition 1916, 12, :o4, 3486569911, 1440
-          tz.transition 1917, 3, :o3, 116222983, 48
-          tz.transition 1941, 12, :o4, 38885763, 16
-          tz.transition 1942, 3, :o3, 116661463, 48
-          tz.transition 1942, 9, :o4, 38890067, 16
-          tz.transition 1943, 3, :o3, 116678935, 48
-          tz.transition 1943, 10, :o4, 38896003, 16
-          tz.transition 1944, 3, :o3, 116696407, 48
-          tz.transition 1971, 10, :o4, 57688200
-          tz.transition 1972, 2, :o3, 67969800
-          tz.transition 1972, 10, :o4, 89137800
-          tz.transition 1973, 3, :o3, 100024200
-          tz.transition 1973, 10, :o4, 120587400
-          tz.transition 1974, 3, :o3, 131473800
-          tz.transition 1974, 10, :o4, 152037000
-          tz.transition 1975, 3, :o3, 162923400
-          tz.transition 1975, 10, :o4, 183486600
-          tz.transition 1976, 3, :o3, 194977800
-          tz.transition 1976, 10, :o4, 215541000
-          tz.transition 1977, 3, :o3, 226427400
-          tz.transition 1977, 10, :o4, 246990600
-          tz.transition 1978, 3, :o3, 257877000
-          tz.transition 1978, 10, :o4, 278440200
-          tz.transition 1979, 3, :o3, 289326600
-          tz.transition 1979, 10, :o4, 309889800
-          tz.transition 1980, 3, :o3, 320776200
-          tz.transition 1980, 10, :o4, 341339400
-          tz.transition 1981, 2, :o3, 352225800
-          tz.transition 1981, 10, :o4, 372789000
-          tz.transition 1982, 4, :o3, 386699400
-          tz.transition 1982, 10, :o4, 404843400
-          tz.transition 1983, 3, :o3, 415729800
-          tz.transition 1983, 10, :o4, 436293000
-          tz.transition 1984, 3, :o3, 447179400
-          tz.transition 1984, 10, :o4, 467742600
-          tz.transition 1985, 3, :o3, 478629000
-          tz.transition 1985, 10, :o4, 499192200
-          tz.transition 1986, 3, :o3, 511288200
-          tz.transition 1986, 10, :o4, 530037000
-          tz.transition 1987, 3, :o3, 542737800
-          tz.transition 1987, 10, :o4, 562091400
-          tz.transition 1988, 3, :o3, 574792200
-          tz.transition 1988, 10, :o4, 594145800
-          tz.transition 1989, 3, :o3, 606241800
-          tz.transition 1989, 10, :o4, 625595400
-          tz.transition 1990, 3, :o3, 636481800
-          tz.transition 1990, 10, :o4, 657045000
-          tz.transition 1991, 3, :o3, 667931400
-          tz.transition 1991, 10, :o4, 688494600
-          tz.transition 1992, 2, :o3, 699381000
-          tz.transition 1992, 10, :o4, 719944200
-          tz.transition 1993, 3, :o3, 731435400
-          tz.transition 1993, 10, :o4, 751998600
-          tz.transition 1994, 3, :o3, 762885000
-          tz.transition 1994, 10, :o4, 783448200
-          tz.transition 1995, 3, :o3, 794334600
-          tz.transition 1995, 10, :o4, 814897800
-          tz.transition 1996, 3, :o3, 828203400
-          tz.transition 1996, 10, :o4, 846347400
-          tz.transition 1997, 3, :o3, 859653000
-          tz.transition 1997, 10, :o4, 877797000
-          tz.transition 1998, 3, :o3, 891102600
-          tz.transition 1998, 10, :o4, 909246600
-          tz.transition 1999, 3, :o3, 922552200
-          tz.transition 1999, 10, :o4, 941301000
-          tz.transition 2000, 3, :o3, 954001800
-          tz.transition 2000, 10, :o4, 972750600
-          tz.transition 2001, 3, :o3, 985451400
-          tz.transition 2001, 10, :o4, 1004200200
-          tz.transition 2002, 3, :o3, 1017505800
-          tz.transition 2002, 10, :o4, 1035649800
-          tz.transition 2003, 3, :o3, 1048955400
-          tz.transition 2003, 10, :o4, 1067099400
-          tz.transition 2004, 3, :o3, 1080405000
-          tz.transition 2004, 10, :o4, 1099153800
-          tz.transition 2005, 3, :o3, 1111854600
-          tz.transition 2005, 10, :o4, 1130603400
-          tz.transition 2006, 4, :o3, 1143909000
-          tz.transition 2006, 10, :o4, 1162053000
-          tz.transition 2007, 3, :o3, 1174753800
-          tz.transition 2007, 10, :o4, 1193502600
-          tz.transition 2008, 3, :o3, 1206808200
-          tz.transition 2008, 10, :o4, 1224952200
-          tz.transition 2009, 3, :o3, 1238257800
-          tz.transition 2009, 10, :o4, 1256401800
-          tz.transition 2010, 3, :o3, 1269707400
-          tz.transition 2010, 10, :o4, 1288456200
-          tz.transition 2011, 3, :o3, 1301157000
-          tz.transition 2011, 10, :o4, 1319905800
-          tz.transition 2012, 3, :o3, 1332606600
-          tz.transition 2012, 10, :o4, 1351355400
-          tz.transition 2013, 3, :o3, 1364661000
-          tz.transition 2013, 10, :o4, 1382805000
-          tz.transition 2014, 3, :o3, 1396110600
-          tz.transition 2014, 10, :o4, 1414254600
-          tz.transition 2015, 3, :o3, 1427560200
-          tz.transition 2015, 10, :o4, 1445704200
-          tz.transition 2016, 3, :o3, 1459009800
-          tz.transition 2016, 10, :o4, 1477758600
-          tz.transition 2017, 3, :o3, 1490459400
-          tz.transition 2017, 10, :o4, 1509208200
-          tz.transition 2018, 3, :o3, 1521909000
-          tz.transition 2018, 10, :o4, 1540657800
-          tz.transition 2019, 3, :o3, 1553963400
-          tz.transition 2019, 10, :o4, 1572107400
-          tz.transition 2020, 3, :o3, 1585413000
-          tz.transition 2020, 10, :o4, 1603557000
-          tz.transition 2021, 3, :o3, 1616862600
-          tz.transition 2021, 10, :o4, 1635611400
-          tz.transition 2022, 3, :o3, 1648312200
-          tz.transition 2022, 10, :o4, 1667061000
-          tz.transition 2023, 3, :o3, 1679761800
-          tz.transition 2023, 10, :o4, 1698510600
-          tz.transition 2024, 3, :o3, 1711816200
-          tz.transition 2024, 10, :o4, 1729960200
-          tz.transition 2025, 3, :o3, 1743265800
-          tz.transition 2025, 10, :o4, 1761409800
-          tz.transition 2026, 3, :o3, 1774715400
-          tz.transition 2026, 10, :o4, 1792859400
-          tz.transition 2027, 3, :o3, 1806165000
-          tz.transition 2027, 10, :o4, 1824913800
-          tz.transition 2028, 3, :o3, 1837614600
-          tz.transition 2028, 10, :o4, 1856363400
-          tz.transition 2029, 3, :o3, 1869064200
-          tz.transition 2029, 10, :o4, 1887813000
-          tz.transition 2030, 3, :o3, 1901118600
-          tz.transition 2030, 10, :o4, 1919262600
-          tz.transition 2031, 3, :o3, 1932568200
-          tz.transition 2031, 10, :o4, 1950712200
-          tz.transition 2032, 3, :o3, 1964017800
-          tz.transition 2032, 10, :o4, 1982766600
-          tz.transition 2033, 3, :o3, 1995467400
-          tz.transition 2033, 10, :o4, 2014216200
-          tz.transition 2034, 3, :o3, 2026917000
-          tz.transition 2034, 10, :o4, 2045665800
-          tz.transition 2035, 3, :o3, 2058366600
-          tz.transition 2035, 10, :o4, 2077115400
-          tz.transition 2036, 3, :o3, 2090421000
-          tz.transition 2036, 10, :o4, 2108565000
-          tz.transition 2037, 3, :o3, 2121870600
-          tz.transition 2037, 10, :o4, 2140014600
-          tz.transition 2038, 3, :o3, 39448163, 16
-          tz.transition 2038, 10, :o4, 39451635, 16
-          tz.transition 2039, 3, :o3, 39453987, 16
-          tz.transition 2039, 10, :o4, 39457459, 16
-          tz.transition 2040, 3, :o3, 39459811, 16
-          tz.transition 2040, 10, :o4, 39463283, 16
-          tz.transition 2041, 3, :o3, 39465747, 16
-          tz.transition 2041, 10, :o4, 39469107, 16
-          tz.transition 2042, 3, :o3, 39471571, 16
-          tz.transition 2042, 10, :o4, 39474931, 16
-          tz.transition 2043, 3, :o3, 39477395, 16
-          tz.transition 2043, 10, :o4, 39480755, 16
-          tz.transition 2044, 3, :o3, 39483219, 16
-          tz.transition 2044, 10, :o4, 39486691, 16
-          tz.transition 2045, 3, :o3, 39489043, 16
-          tz.transition 2045, 10, :o4, 39492515, 16
-          tz.transition 2046, 3, :o3, 39494867, 16
-          tz.transition 2046, 10, :o4, 39498339, 16
-          tz.transition 2047, 3, :o3, 39500803, 16
-          tz.transition 2047, 10, :o4, 39504163, 16
-          tz.transition 2048, 3, :o3, 39506627, 16
-          tz.transition 2048, 10, :o4, 39509987, 16
-          tz.transition 2049, 3, :o3, 39512451, 16
-          tz.transition 2049, 10, :o4, 39515923, 16
-          tz.transition 2050, 3, :o3, 39518275, 16
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Canberra.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Canberra.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Canberra.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Canberra.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Canberra
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/Canberra', 'Australia/Sydney'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Currie.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Currie.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Currie.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Currie.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Currie
-        include TimezoneDefinition
-        
-        timezone 'Australia/Currie' do |tz|
-          tz.offset :o0, 34528, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1895, 8, :o1, 6516280171, 2700
-          tz.transition 1916, 9, :o2, 14526823, 6
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1972, 10, :o2, 89136000
-          tz.transition 1973, 3, :o1, 100022400
-          tz.transition 1973, 10, :o2, 120585600
-          tz.transition 1974, 3, :o1, 131472000
-          tz.transition 1974, 10, :o2, 152035200
-          tz.transition 1975, 3, :o1, 162921600
-          tz.transition 1975, 10, :o2, 183484800
-          tz.transition 1976, 3, :o1, 194976000
-          tz.transition 1976, 10, :o2, 215539200
-          tz.transition 1977, 3, :o1, 226425600
-          tz.transition 1977, 10, :o2, 246988800
-          tz.transition 1978, 3, :o1, 257875200
-          tz.transition 1978, 10, :o2, 278438400
-          tz.transition 1979, 3, :o1, 289324800
-          tz.transition 1979, 10, :o2, 309888000
-          tz.transition 1980, 3, :o1, 320774400
-          tz.transition 1980, 10, :o2, 341337600
-          tz.transition 1981, 2, :o1, 352224000
-          tz.transition 1981, 10, :o2, 372787200
-          tz.transition 1982, 3, :o1, 386092800
-          tz.transition 1982, 10, :o2, 404841600
-          tz.transition 1983, 3, :o1, 417542400
-          tz.transition 1983, 10, :o2, 436291200
-          tz.transition 1984, 3, :o1, 447177600
-          tz.transition 1984, 10, :o2, 467740800
-          tz.transition 1985, 3, :o1, 478627200
-          tz.transition 1985, 10, :o2, 499190400
-          tz.transition 1986, 3, :o1, 510076800
-          tz.transition 1986, 10, :o2, 530035200
-          tz.transition 1987, 3, :o1, 542736000
-          tz.transition 1987, 10, :o2, 562089600
-          tz.transition 1988, 3, :o1, 574790400
-          tz.transition 1988, 10, :o2, 594144000
-          tz.transition 1989, 3, :o1, 606240000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 637689600
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 670348800
-          tz.transition 1991, 10, :o2, 686678400
-          tz.transition 1992, 3, :o1, 701798400
-          tz.transition 1992, 10, :o2, 718128000
-          tz.transition 1993, 3, :o1, 733248000
-          tz.transition 1993, 10, :o2, 749577600
-          tz.transition 1994, 3, :o1, 764697600
-          tz.transition 1994, 10, :o2, 781027200
-          tz.transition 1995, 3, :o1, 796147200
-          tz.transition 1995, 9, :o2, 812476800
-          tz.transition 1996, 3, :o1, 828201600
-          tz.transition 1996, 10, :o2, 844531200
-          tz.transition 1997, 3, :o1, 859651200
-          tz.transition 1997, 10, :o2, 875980800
-          tz.transition 1998, 3, :o1, 891100800
-          tz.transition 1998, 10, :o2, 907430400
-          tz.transition 1999, 3, :o1, 922550400
-          tz.transition 1999, 10, :o2, 938880000
-          tz.transition 2000, 3, :o1, 954000000
-          tz.transition 2000, 8, :o2, 967305600
-          tz.transition 2001, 3, :o1, 985449600
-          tz.transition 2001, 10, :o2, 1002384000
-          tz.transition 2002, 3, :o1, 1017504000
-          tz.transition 2002, 10, :o2, 1033833600
-          tz.transition 2003, 3, :o1, 1048953600
-          tz.transition 2003, 10, :o2, 1065283200
-          tz.transition 2004, 3, :o1, 1080403200
-          tz.transition 2004, 10, :o2, 1096732800
-          tz.transition 2005, 3, :o1, 1111852800
-          tz.transition 2005, 10, :o2, 1128182400
-          tz.transition 2006, 4, :o1, 1143907200
-          tz.transition 2006, 9, :o2, 1159632000
-          tz.transition 2007, 3, :o1, 1174752000
-          tz.transition 2007, 10, :o2, 1191686400
-          tz.transition 2008, 3, :o1, 1206806400
-          tz.transition 2008, 10, :o2, 1223136000
-          tz.transition 2009, 3, :o1, 1238256000
-          tz.transition 2009, 10, :o2, 1254585600
-          tz.transition 2010, 3, :o1, 1269705600
-          tz.transition 2010, 10, :o2, 1286035200
-          tz.transition 2011, 3, :o1, 1301155200
-          tz.transition 2011, 10, :o2, 1317484800
-          tz.transition 2012, 3, :o1, 1332604800
-          tz.transition 2012, 10, :o2, 1349539200
-          tz.transition 2013, 3, :o1, 1364659200
-          tz.transition 2013, 10, :o2, 1380988800
-          tz.transition 2014, 3, :o1, 1396108800
-          tz.transition 2014, 10, :o2, 1412438400
-          tz.transition 2015, 3, :o1, 1427558400
-          tz.transition 2015, 10, :o2, 1443888000
-          tz.transition 2016, 3, :o1, 1459008000
-          tz.transition 2016, 10, :o2, 1475337600
-          tz.transition 2017, 3, :o1, 1490457600
-          tz.transition 2017, 9, :o2, 1506787200
-          tz.transition 2018, 3, :o1, 1521907200
-          tz.transition 2018, 10, :o2, 1538841600
-          tz.transition 2019, 3, :o1, 1553961600
-          tz.transition 2019, 10, :o2, 1570291200
-          tz.transition 2020, 3, :o1, 1585411200
-          tz.transition 2020, 10, :o2, 1601740800
-          tz.transition 2021, 3, :o1, 1616860800
-          tz.transition 2021, 10, :o2, 1633190400
-          tz.transition 2022, 3, :o1, 1648310400
-          tz.transition 2022, 10, :o2, 1664640000
-          tz.transition 2023, 3, :o1, 1679760000
-          tz.transition 2023, 9, :o2, 1696089600
-          tz.transition 2024, 3, :o1, 1711814400
-          tz.transition 2024, 10, :o2, 1728144000
-          tz.transition 2025, 3, :o1, 1743264000
-          tz.transition 2025, 10, :o2, 1759593600
-          tz.transition 2026, 3, :o1, 1774713600
-          tz.transition 2026, 10, :o2, 1791043200
-          tz.transition 2027, 3, :o1, 1806163200
-          tz.transition 2027, 10, :o2, 1822492800
-          tz.transition 2028, 3, :o1, 1837612800
-          tz.transition 2028, 9, :o2, 1853942400
-          tz.transition 2029, 3, :o1, 1869062400
-          tz.transition 2029, 10, :o2, 1885996800
-          tz.transition 2030, 3, :o1, 1901116800
-          tz.transition 2030, 10, :o2, 1917446400
-          tz.transition 2031, 3, :o1, 1932566400
-          tz.transition 2031, 10, :o2, 1948896000
-          tz.transition 2032, 3, :o1, 1964016000
-          tz.transition 2032, 10, :o2, 1980345600
-          tz.transition 2033, 3, :o1, 1995465600
-          tz.transition 2033, 10, :o2, 2011795200
-          tz.transition 2034, 3, :o1, 2026915200
-          tz.transition 2034, 9, :o2, 2043244800
-          tz.transition 2035, 3, :o1, 2058364800
-          tz.transition 2035, 10, :o2, 2075299200
-          tz.transition 2036, 3, :o1, 2090419200
-          tz.transition 2036, 10, :o2, 2106748800
-          tz.transition 2037, 3, :o1, 2121868800
-          tz.transition 2037, 10, :o2, 2138198400
-          tz.transition 2038, 3, :o1, 14793061, 6
-          tz.transition 2038, 10, :o2, 14794195, 6
-          tz.transition 2039, 3, :o1, 14795245, 6
-          tz.transition 2039, 10, :o2, 14796379, 6
-          tz.transition 2040, 3, :o1, 14797429, 6
-          tz.transition 2040, 10, :o2, 14798605, 6
-          tz.transition 2041, 3, :o1, 14799655, 6
-          tz.transition 2041, 10, :o2, 14800789, 6
-          tz.transition 2042, 3, :o1, 14801839, 6
-          tz.transition 2042, 10, :o2, 14802973, 6
-          tz.transition 2043, 3, :o1, 14804023, 6
-          tz.transition 2043, 10, :o2, 14805157, 6
-          tz.transition 2044, 3, :o1, 14806207, 6
-          tz.transition 2044, 10, :o2, 14807341, 6
-          tz.transition 2045, 3, :o1, 14808391, 6
-          tz.transition 2045, 9, :o2, 14809525, 6
-          tz.transition 2046, 3, :o1, 14810575, 6
-          tz.transition 2046, 10, :o2, 14811751, 6
-          tz.transition 2047, 3, :o1, 14812801, 6
-          tz.transition 2047, 10, :o2, 14813935, 6
-          tz.transition 2048, 3, :o1, 14814985, 6
-          tz.transition 2048, 10, :o2, 14816119, 6
-          tz.transition 2049, 3, :o1, 14817169, 6
-          tz.transition 2049, 10, :o2, 14818303, 6
-          tz.transition 2050, 3, :o1, 14819353, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Darwin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Darwin.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Darwin.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Darwin.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,29 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Darwin
-        include TimezoneDefinition
-        
-        timezone 'Australia/Darwin' do |tz|
-          tz.offset :o0, 31400, 0, :LMT
-          tz.offset :o1, 32400, 0, :CST
-          tz.offset :o2, 34200, 0, :CST
-          tz.offset :o3, 34200, 3600, :CST
-          
-          tz.transition 1895, 1, :o1, 1042513259, 432
-          tz.transition 1899, 4, :o2, 19318201, 8
-          tz.transition 1916, 12, :o3, 3486569911, 1440
-          tz.transition 1917, 3, :o2, 116222983, 48
-          tz.transition 1941, 12, :o3, 38885763, 16
-          tz.transition 1942, 3, :o2, 116661463, 48
-          tz.transition 1942, 9, :o3, 38890067, 16
-          tz.transition 1943, 3, :o2, 116678935, 48
-          tz.transition 1943, 10, :o3, 38896003, 16
-          tz.transition 1944, 3, :o2, 116696407, 48
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Hobart.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Hobart.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Hobart.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Hobart.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,193 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Hobart
-        include TimezoneDefinition
-        
-        timezone 'Australia/Hobart' do |tz|
-          tz.offset :o0, 35356, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1895, 8, :o1, 52130241161, 21600
-          tz.transition 1916, 9, :o2, 14526823, 6
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1967, 9, :o2, 14638585, 6
-          tz.transition 1968, 3, :o1, 14639677, 6
-          tz.transition 1968, 10, :o2, 14640937, 6
-          tz.transition 1969, 3, :o1, 14641735, 6
-          tz.transition 1969, 10, :o2, 14643121, 6
-          tz.transition 1970, 3, :o1, 5673600
-          tz.transition 1970, 10, :o2, 25632000
-          tz.transition 1971, 3, :o1, 37728000
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1972, 10, :o2, 89136000
-          tz.transition 1973, 3, :o1, 100022400
-          tz.transition 1973, 10, :o2, 120585600
-          tz.transition 1974, 3, :o1, 131472000
-          tz.transition 1974, 10, :o2, 152035200
-          tz.transition 1975, 3, :o1, 162921600
-          tz.transition 1975, 10, :o2, 183484800
-          tz.transition 1976, 3, :o1, 194976000
-          tz.transition 1976, 10, :o2, 215539200
-          tz.transition 1977, 3, :o1, 226425600
-          tz.transition 1977, 10, :o2, 246988800
-          tz.transition 1978, 3, :o1, 257875200
-          tz.transition 1978, 10, :o2, 278438400
-          tz.transition 1979, 3, :o1, 289324800
-          tz.transition 1979, 10, :o2, 309888000
-          tz.transition 1980, 3, :o1, 320774400
-          tz.transition 1980, 10, :o2, 341337600
-          tz.transition 1981, 2, :o1, 352224000
-          tz.transition 1981, 10, :o2, 372787200
-          tz.transition 1982, 3, :o1, 386092800
-          tz.transition 1982, 10, :o2, 404841600
-          tz.transition 1983, 3, :o1, 417542400
-          tz.transition 1983, 10, :o2, 436291200
-          tz.transition 1984, 3, :o1, 447177600
-          tz.transition 1984, 10, :o2, 467740800
-          tz.transition 1985, 3, :o1, 478627200
-          tz.transition 1985, 10, :o2, 499190400
-          tz.transition 1986, 3, :o1, 510076800
-          tz.transition 1986, 10, :o2, 530035200
-          tz.transition 1987, 3, :o1, 542736000
-          tz.transition 1987, 10, :o2, 562089600
-          tz.transition 1988, 3, :o1, 574790400
-          tz.transition 1988, 10, :o2, 594144000
-          tz.transition 1989, 3, :o1, 606240000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 637689600
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 670348800
-          tz.transition 1991, 10, :o2, 686678400
-          tz.transition 1992, 3, :o1, 701798400
-          tz.transition 1992, 10, :o2, 718128000
-          tz.transition 1993, 3, :o1, 733248000
-          tz.transition 1993, 10, :o2, 749577600
-          tz.transition 1994, 3, :o1, 764697600
-          tz.transition 1994, 10, :o2, 781027200
-          tz.transition 1995, 3, :o1, 796147200
-          tz.transition 1995, 9, :o2, 812476800
-          tz.transition 1996, 3, :o1, 828201600
-          tz.transition 1996, 10, :o2, 844531200
-          tz.transition 1997, 3, :o1, 859651200
-          tz.transition 1997, 10, :o2, 875980800
-          tz.transition 1998, 3, :o1, 891100800
-          tz.transition 1998, 10, :o2, 907430400
-          tz.transition 1999, 3, :o1, 922550400
-          tz.transition 1999, 10, :o2, 938880000
-          tz.transition 2000, 3, :o1, 954000000
-          tz.transition 2000, 8, :o2, 967305600
-          tz.transition 2001, 3, :o1, 985449600
-          tz.transition 2001, 10, :o2, 1002384000
-          tz.transition 2002, 3, :o1, 1017504000
-          tz.transition 2002, 10, :o2, 1033833600
-          tz.transition 2003, 3, :o1, 1048953600
-          tz.transition 2003, 10, :o2, 1065283200
-          tz.transition 2004, 3, :o1, 1080403200
-          tz.transition 2004, 10, :o2, 1096732800
-          tz.transition 2005, 3, :o1, 1111852800
-          tz.transition 2005, 10, :o2, 1128182400
-          tz.transition 2006, 4, :o1, 1143907200
-          tz.transition 2006, 9, :o2, 1159632000
-          tz.transition 2007, 3, :o1, 1174752000
-          tz.transition 2007, 10, :o2, 1191686400
-          tz.transition 2008, 3, :o1, 1206806400
-          tz.transition 2008, 10, :o2, 1223136000
-          tz.transition 2009, 3, :o1, 1238256000
-          tz.transition 2009, 10, :o2, 1254585600
-          tz.transition 2010, 3, :o1, 1269705600
-          tz.transition 2010, 10, :o2, 1286035200
-          tz.transition 2011, 3, :o1, 1301155200
-          tz.transition 2011, 10, :o2, 1317484800
-          tz.transition 2012, 3, :o1, 1332604800
-          tz.transition 2012, 10, :o2, 1349539200
-          tz.transition 2013, 3, :o1, 1364659200
-          tz.transition 2013, 10, :o2, 1380988800
-          tz.transition 2014, 3, :o1, 1396108800
-          tz.transition 2014, 10, :o2, 1412438400
-          tz.transition 2015, 3, :o1, 1427558400
-          tz.transition 2015, 10, :o2, 1443888000
-          tz.transition 2016, 3, :o1, 1459008000
-          tz.transition 2016, 10, :o2, 1475337600
-          tz.transition 2017, 3, :o1, 1490457600
-          tz.transition 2017, 9, :o2, 1506787200
-          tz.transition 2018, 3, :o1, 1521907200
-          tz.transition 2018, 10, :o2, 1538841600
-          tz.transition 2019, 3, :o1, 1553961600
-          tz.transition 2019, 10, :o2, 1570291200
-          tz.transition 2020, 3, :o1, 1585411200
-          tz.transition 2020, 10, :o2, 1601740800
-          tz.transition 2021, 3, :o1, 1616860800
-          tz.transition 2021, 10, :o2, 1633190400
-          tz.transition 2022, 3, :o1, 1648310400
-          tz.transition 2022, 10, :o2, 1664640000
-          tz.transition 2023, 3, :o1, 1679760000
-          tz.transition 2023, 9, :o2, 1696089600
-          tz.transition 2024, 3, :o1, 1711814400
-          tz.transition 2024, 10, :o2, 1728144000
-          tz.transition 2025, 3, :o1, 1743264000
-          tz.transition 2025, 10, :o2, 1759593600
-          tz.transition 2026, 3, :o1, 1774713600
-          tz.transition 2026, 10, :o2, 1791043200
-          tz.transition 2027, 3, :o1, 1806163200
-          tz.transition 2027, 10, :o2, 1822492800
-          tz.transition 2028, 3, :o1, 1837612800
-          tz.transition 2028, 9, :o2, 1853942400
-          tz.transition 2029, 3, :o1, 1869062400
-          tz.transition 2029, 10, :o2, 1885996800
-          tz.transition 2030, 3, :o1, 1901116800
-          tz.transition 2030, 10, :o2, 1917446400
-          tz.transition 2031, 3, :o1, 1932566400
-          tz.transition 2031, 10, :o2, 1948896000
-          tz.transition 2032, 3, :o1, 1964016000
-          tz.transition 2032, 10, :o2, 1980345600
-          tz.transition 2033, 3, :o1, 1995465600
-          tz.transition 2033, 10, :o2, 2011795200
-          tz.transition 2034, 3, :o1, 2026915200
-          tz.transition 2034, 9, :o2, 2043244800
-          tz.transition 2035, 3, :o1, 2058364800
-          tz.transition 2035, 10, :o2, 2075299200
-          tz.transition 2036, 3, :o1, 2090419200
-          tz.transition 2036, 10, :o2, 2106748800
-          tz.transition 2037, 3, :o1, 2121868800
-          tz.transition 2037, 10, :o2, 2138198400
-          tz.transition 2038, 3, :o1, 14793061, 6
-          tz.transition 2038, 10, :o2, 14794195, 6
-          tz.transition 2039, 3, :o1, 14795245, 6
-          tz.transition 2039, 10, :o2, 14796379, 6
-          tz.transition 2040, 3, :o1, 14797429, 6
-          tz.transition 2040, 10, :o2, 14798605, 6
-          tz.transition 2041, 3, :o1, 14799655, 6
-          tz.transition 2041, 10, :o2, 14800789, 6
-          tz.transition 2042, 3, :o1, 14801839, 6
-          tz.transition 2042, 10, :o2, 14802973, 6
-          tz.transition 2043, 3, :o1, 14804023, 6
-          tz.transition 2043, 10, :o2, 14805157, 6
-          tz.transition 2044, 3, :o1, 14806207, 6
-          tz.transition 2044, 10, :o2, 14807341, 6
-          tz.transition 2045, 3, :o1, 14808391, 6
-          tz.transition 2045, 9, :o2, 14809525, 6
-          tz.transition 2046, 3, :o1, 14810575, 6
-          tz.transition 2046, 10, :o2, 14811751, 6
-          tz.transition 2047, 3, :o1, 14812801, 6
-          tz.transition 2047, 10, :o2, 14813935, 6
-          tz.transition 2048, 3, :o1, 14814985, 6
-          tz.transition 2048, 10, :o2, 14816119, 6
-          tz.transition 2049, 3, :o1, 14817169, 6
-          tz.transition 2049, 10, :o2, 14818303, 6
-          tz.transition 2050, 3, :o1, 14819353, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/LHI.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/LHI.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/LHI.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/LHI.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module LHI
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/LHI', 'Australia/Lord_Howe'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lindeman.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lindeman.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lindeman.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lindeman.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,39 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Lindeman
-        include TimezoneDefinition
-        
-        timezone 'Australia/Lindeman' do |tz|
-          tz.offset :o0, 35756, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1894, 12, :o1, 52124992261, 21600
-          tz.transition 1916, 12, :o2, 3486569881, 1440
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 636480000
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 667929600
-          tz.transition 1991, 10, :o2, 688492800
-          tz.transition 1992, 2, :o1, 699379200
-          tz.transition 1992, 10, :o2, 719942400
-          tz.transition 1993, 3, :o1, 731433600
-          tz.transition 1993, 10, :o2, 751996800
-          tz.transition 1994, 3, :o1, 762883200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lord_Howe.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lord_Howe.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lord_Howe.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Lord_Howe.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,160 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Lord_Howe
-        include TimezoneDefinition
-        
-        timezone 'Australia/Lord_Howe' do |tz|
-          tz.offset :o0, 38180, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 37800, 0, :LHST
-          tz.offset :o3, 37800, 3600, :LHST
-          tz.offset :o4, 37800, 1800, :LHST
-          
-          tz.transition 1895, 1, :o1, 10425132251, 4320
-          tz.transition 1981, 2, :o2, 352216800
-          tz.transition 1981, 10, :o3, 372785400
-          tz.transition 1982, 3, :o2, 384273000
-          tz.transition 1982, 10, :o3, 404839800
-          tz.transition 1983, 3, :o2, 415722600
-          tz.transition 1983, 10, :o3, 436289400
-          tz.transition 1984, 3, :o2, 447172200
-          tz.transition 1984, 10, :o3, 467739000
-          tz.transition 1985, 3, :o2, 478621800
-          tz.transition 1985, 10, :o4, 499188600
-          tz.transition 1986, 3, :o2, 511282800
-          tz.transition 1986, 10, :o4, 530033400
-          tz.transition 1987, 3, :o2, 542732400
-          tz.transition 1987, 10, :o4, 562087800
-          tz.transition 1988, 3, :o2, 574786800
-          tz.transition 1988, 10, :o4, 594142200
-          tz.transition 1989, 3, :o2, 606236400
-          tz.transition 1989, 10, :o4, 625591800
-          tz.transition 1990, 3, :o2, 636476400
-          tz.transition 1990, 10, :o4, 657041400
-          tz.transition 1991, 3, :o2, 667926000
-          tz.transition 1991, 10, :o4, 688491000
-          tz.transition 1992, 2, :o2, 699375600
-          tz.transition 1992, 10, :o4, 719940600
-          tz.transition 1993, 3, :o2, 731430000
-          tz.transition 1993, 10, :o4, 751995000
-          tz.transition 1994, 3, :o2, 762879600
-          tz.transition 1994, 10, :o4, 783444600
-          tz.transition 1995, 3, :o2, 794329200
-          tz.transition 1995, 10, :o4, 814894200
-          tz.transition 1996, 3, :o2, 828198000
-          tz.transition 1996, 10, :o4, 846343800
-          tz.transition 1997, 3, :o2, 859647600
-          tz.transition 1997, 10, :o4, 877793400
-          tz.transition 1998, 3, :o2, 891097200
-          tz.transition 1998, 10, :o4, 909243000
-          tz.transition 1999, 3, :o2, 922546800
-          tz.transition 1999, 10, :o4, 941297400
-          tz.transition 2000, 3, :o2, 953996400
-          tz.transition 2000, 8, :o4, 967303800
-          tz.transition 2001, 3, :o2, 985446000
-          tz.transition 2001, 10, :o4, 1004196600
-          tz.transition 2002, 3, :o2, 1017500400
-          tz.transition 2002, 10, :o4, 1035646200
-          tz.transition 2003, 3, :o2, 1048950000
-          tz.transition 2003, 10, :o4, 1067095800
-          tz.transition 2004, 3, :o2, 1080399600
-          tz.transition 2004, 10, :o4, 1099150200
-          tz.transition 2005, 3, :o2, 1111849200
-          tz.transition 2005, 10, :o4, 1130599800
-          tz.transition 2006, 4, :o2, 1143903600
-          tz.transition 2006, 10, :o4, 1162049400
-          tz.transition 2007, 3, :o2, 1174748400
-          tz.transition 2007, 10, :o4, 1193499000
-          tz.transition 2008, 3, :o2, 1206802800
-          tz.transition 2008, 10, :o4, 1224948600
-          tz.transition 2009, 3, :o2, 1238252400
-          tz.transition 2009, 10, :o4, 1256398200
-          tz.transition 2010, 3, :o2, 1269702000
-          tz.transition 2010, 10, :o4, 1288452600
-          tz.transition 2011, 3, :o2, 1301151600
-          tz.transition 2011, 10, :o4, 1319902200
-          tz.transition 2012, 3, :o2, 1332601200
-          tz.transition 2012, 10, :o4, 1351351800
-          tz.transition 2013, 3, :o2, 1364655600
-          tz.transition 2013, 10, :o4, 1382801400
-          tz.transition 2014, 3, :o2, 1396105200
-          tz.transition 2014, 10, :o4, 1414251000
-          tz.transition 2015, 3, :o2, 1427554800
-          tz.transition 2015, 10, :o4, 1445700600
-          tz.transition 2016, 3, :o2, 1459004400
-          tz.transition 2016, 10, :o4, 1477755000
-          tz.transition 2017, 3, :o2, 1490454000
-          tz.transition 2017, 10, :o4, 1509204600
-          tz.transition 2018, 3, :o2, 1521903600
-          tz.transition 2018, 10, :o4, 1540654200
-          tz.transition 2019, 3, :o2, 1553958000
-          tz.transition 2019, 10, :o4, 1572103800
-          tz.transition 2020, 3, :o2, 1585407600
-          tz.transition 2020, 10, :o4, 1603553400
-          tz.transition 2021, 3, :o2, 1616857200
-          tz.transition 2021, 10, :o4, 1635607800
-          tz.transition 2022, 3, :o2, 1648306800
-          tz.transition 2022, 10, :o4, 1667057400
-          tz.transition 2023, 3, :o2, 1679756400
-          tz.transition 2023, 10, :o4, 1698507000
-          tz.transition 2024, 3, :o2, 1711810800
-          tz.transition 2024, 10, :o4, 1729956600
-          tz.transition 2025, 3, :o2, 1743260400
-          tz.transition 2025, 10, :o4, 1761406200
-          tz.transition 2026, 3, :o2, 1774710000
-          tz.transition 2026, 10, :o4, 1792855800
-          tz.transition 2027, 3, :o2, 1806159600
-          tz.transition 2027, 10, :o4, 1824910200
-          tz.transition 2028, 3, :o2, 1837609200
-          tz.transition 2028, 10, :o4, 1856359800
-          tz.transition 2029, 3, :o2, 1869058800
-          tz.transition 2029, 10, :o4, 1887809400
-          tz.transition 2030, 3, :o2, 1901113200
-          tz.transition 2030, 10, :o4, 1919259000
-          tz.transition 2031, 3, :o2, 1932562800
-          tz.transition 2031, 10, :o4, 1950708600
-          tz.transition 2032, 3, :o2, 1964012400
-          tz.transition 2032, 10, :o4, 1982763000
-          tz.transition 2033, 3, :o2, 1995462000
-          tz.transition 2033, 10, :o4, 2014212600
-          tz.transition 2034, 3, :o2, 2026911600
-          tz.transition 2034, 10, :o4, 2045662200
-          tz.transition 2035, 3, :o2, 2058361200
-          tz.transition 2035, 10, :o4, 2077111800
-          tz.transition 2036, 3, :o2, 2090415600
-          tz.transition 2036, 10, :o4, 2108561400
-          tz.transition 2037, 3, :o2, 2121865200
-          tz.transition 2037, 10, :o4, 2140011000
-          tz.transition 2038, 3, :o2, 19724081, 8
-          tz.transition 2038, 10, :o4, 118354903, 48
-          tz.transition 2039, 3, :o2, 19726993, 8
-          tz.transition 2039, 10, :o4, 118372375, 48
-          tz.transition 2040, 3, :o2, 19729905, 8
-          tz.transition 2040, 10, :o4, 118389847, 48
-          tz.transition 2041, 3, :o2, 19732873, 8
-          tz.transition 2041, 10, :o4, 118407319, 48
-          tz.transition 2042, 3, :o2, 19735785, 8
-          tz.transition 2042, 10, :o4, 118424791, 48
-          tz.transition 2043, 3, :o2, 19738697, 8
-          tz.transition 2043, 10, :o4, 118442263, 48
-          tz.transition 2044, 3, :o2, 19741609, 8
-          tz.transition 2044, 10, :o4, 118460071, 48
-          tz.transition 2045, 3, :o2, 19744521, 8
-          tz.transition 2045, 10, :o4, 118477543, 48
-          tz.transition 2046, 3, :o2, 19747433, 8
-          tz.transition 2046, 10, :o4, 118495015, 48
-          tz.transition 2047, 3, :o2, 19750401, 8
-          tz.transition 2047, 10, :o4, 118512487, 48
-          tz.transition 2048, 3, :o2, 19753313, 8
-          tz.transition 2048, 10, :o4, 118529959, 48
-          tz.transition 2049, 3, :o2, 19756225, 8
-          tz.transition 2049, 10, :o4, 118547767, 48
-          tz.transition 2050, 3, :o2, 19759137, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Melbourne.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Melbourne.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Melbourne.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Melbourne.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Melbourne
-        include TimezoneDefinition
-        
-        timezone 'Australia/Melbourne' do |tz|
-          tz.offset :o0, 34792, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1895, 1, :o1, 26062831051, 10800
-          tz.transition 1916, 12, :o2, 3486569881, 1440
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1972, 10, :o2, 89136000
-          tz.transition 1973, 3, :o1, 100022400
-          tz.transition 1973, 10, :o2, 120585600
-          tz.transition 1974, 3, :o1, 131472000
-          tz.transition 1974, 10, :o2, 152035200
-          tz.transition 1975, 3, :o1, 162921600
-          tz.transition 1975, 10, :o2, 183484800
-          tz.transition 1976, 3, :o1, 194976000
-          tz.transition 1976, 10, :o2, 215539200
-          tz.transition 1977, 3, :o1, 226425600
-          tz.transition 1977, 10, :o2, 246988800
-          tz.transition 1978, 3, :o1, 257875200
-          tz.transition 1978, 10, :o2, 278438400
-          tz.transition 1979, 3, :o1, 289324800
-          tz.transition 1979, 10, :o2, 309888000
-          tz.transition 1980, 3, :o1, 320774400
-          tz.transition 1980, 10, :o2, 341337600
-          tz.transition 1981, 2, :o1, 352224000
-          tz.transition 1981, 10, :o2, 372787200
-          tz.transition 1982, 3, :o1, 384278400
-          tz.transition 1982, 10, :o2, 404841600
-          tz.transition 1983, 3, :o1, 415728000
-          tz.transition 1983, 10, :o2, 436291200
-          tz.transition 1984, 3, :o1, 447177600
-          tz.transition 1984, 10, :o2, 467740800
-          tz.transition 1985, 3, :o1, 478627200
-          tz.transition 1985, 10, :o2, 499190400
-          tz.transition 1986, 3, :o1, 511286400
-          tz.transition 1986, 10, :o2, 530035200
-          tz.transition 1987, 3, :o1, 542736000
-          tz.transition 1987, 10, :o2, 561484800
-          tz.transition 1988, 3, :o1, 574790400
-          tz.transition 1988, 10, :o2, 594144000
-          tz.transition 1989, 3, :o1, 606240000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 637689600
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 667929600
-          tz.transition 1991, 10, :o2, 688492800
-          tz.transition 1992, 2, :o1, 699379200
-          tz.transition 1992, 10, :o2, 719942400
-          tz.transition 1993, 3, :o1, 731433600
-          tz.transition 1993, 10, :o2, 751996800
-          tz.transition 1994, 3, :o1, 762883200
-          tz.transition 1994, 10, :o2, 783446400
-          tz.transition 1995, 3, :o1, 796147200
-          tz.transition 1995, 10, :o2, 814896000
-          tz.transition 1996, 3, :o1, 828201600
-          tz.transition 1996, 10, :o2, 846345600
-          tz.transition 1997, 3, :o1, 859651200
-          tz.transition 1997, 10, :o2, 877795200
-          tz.transition 1998, 3, :o1, 891100800
-          tz.transition 1998, 10, :o2, 909244800
-          tz.transition 1999, 3, :o1, 922550400
-          tz.transition 1999, 10, :o2, 941299200
-          tz.transition 2000, 3, :o1, 954000000
-          tz.transition 2000, 8, :o2, 967305600
-          tz.transition 2001, 3, :o1, 985449600
-          tz.transition 2001, 10, :o2, 1004198400
-          tz.transition 2002, 3, :o1, 1017504000
-          tz.transition 2002, 10, :o2, 1035648000
-          tz.transition 2003, 3, :o1, 1048953600
-          tz.transition 2003, 10, :o2, 1067097600
-          tz.transition 2004, 3, :o1, 1080403200
-          tz.transition 2004, 10, :o2, 1099152000
-          tz.transition 2005, 3, :o1, 1111852800
-          tz.transition 2005, 10, :o2, 1130601600
-          tz.transition 2006, 4, :o1, 1143907200
-          tz.transition 2006, 10, :o2, 1162051200
-          tz.transition 2007, 3, :o1, 1174752000
-          tz.transition 2007, 10, :o2, 1193500800
-          tz.transition 2008, 3, :o1, 1206806400
-          tz.transition 2008, 10, :o2, 1224950400
-          tz.transition 2009, 3, :o1, 1238256000
-          tz.transition 2009, 10, :o2, 1256400000
-          tz.transition 2010, 3, :o1, 1269705600
-          tz.transition 2010, 10, :o2, 1288454400
-          tz.transition 2011, 3, :o1, 1301155200
-          tz.transition 2011, 10, :o2, 1319904000
-          tz.transition 2012, 3, :o1, 1332604800
-          tz.transition 2012, 10, :o2, 1351353600
-          tz.transition 2013, 3, :o1, 1364659200
-          tz.transition 2013, 10, :o2, 1382803200
-          tz.transition 2014, 3, :o1, 1396108800
-          tz.transition 2014, 10, :o2, 1414252800
-          tz.transition 2015, 3, :o1, 1427558400
-          tz.transition 2015, 10, :o2, 1445702400
-          tz.transition 2016, 3, :o1, 1459008000
-          tz.transition 2016, 10, :o2, 1477756800
-          tz.transition 2017, 3, :o1, 1490457600
-          tz.transition 2017, 10, :o2, 1509206400
-          tz.transition 2018, 3, :o1, 1521907200
-          tz.transition 2018, 10, :o2, 1540656000
-          tz.transition 2019, 3, :o1, 1553961600
-          tz.transition 2019, 10, :o2, 1572105600
-          tz.transition 2020, 3, :o1, 1585411200
-          tz.transition 2020, 10, :o2, 1603555200
-          tz.transition 2021, 3, :o1, 1616860800
-          tz.transition 2021, 10, :o2, 1635609600
-          tz.transition 2022, 3, :o1, 1648310400
-          tz.transition 2022, 10, :o2, 1667059200
-          tz.transition 2023, 3, :o1, 1679760000
-          tz.transition 2023, 10, :o2, 1698508800
-          tz.transition 2024, 3, :o1, 1711814400
-          tz.transition 2024, 10, :o2, 1729958400
-          tz.transition 2025, 3, :o1, 1743264000
-          tz.transition 2025, 10, :o2, 1761408000
-          tz.transition 2026, 3, :o1, 1774713600
-          tz.transition 2026, 10, :o2, 1792857600
-          tz.transition 2027, 3, :o1, 1806163200
-          tz.transition 2027, 10, :o2, 1824912000
-          tz.transition 2028, 3, :o1, 1837612800
-          tz.transition 2028, 10, :o2, 1856361600
-          tz.transition 2029, 3, :o1, 1869062400
-          tz.transition 2029, 10, :o2, 1887811200
-          tz.transition 2030, 3, :o1, 1901116800
-          tz.transition 2030, 10, :o2, 1919260800
-          tz.transition 2031, 3, :o1, 1932566400
-          tz.transition 2031, 10, :o2, 1950710400
-          tz.transition 2032, 3, :o1, 1964016000
-          tz.transition 2032, 10, :o2, 1982764800
-          tz.transition 2033, 3, :o1, 1995465600
-          tz.transition 2033, 10, :o2, 2014214400
-          tz.transition 2034, 3, :o1, 2026915200
-          tz.transition 2034, 10, :o2, 2045664000
-          tz.transition 2035, 3, :o1, 2058364800
-          tz.transition 2035, 10, :o2, 2077113600
-          tz.transition 2036, 3, :o1, 2090419200
-          tz.transition 2036, 10, :o2, 2108563200
-          tz.transition 2037, 3, :o1, 2121868800
-          tz.transition 2037, 10, :o2, 2140012800
-          tz.transition 2038, 3, :o1, 14793061, 6
-          tz.transition 2038, 10, :o2, 14794363, 6
-          tz.transition 2039, 3, :o1, 14795245, 6
-          tz.transition 2039, 10, :o2, 14796547, 6
-          tz.transition 2040, 3, :o1, 14797429, 6
-          tz.transition 2040, 10, :o2, 14798731, 6
-          tz.transition 2041, 3, :o1, 14799655, 6
-          tz.transition 2041, 10, :o2, 14800915, 6
-          tz.transition 2042, 3, :o1, 14801839, 6
-          tz.transition 2042, 10, :o2, 14803099, 6
-          tz.transition 2043, 3, :o1, 14804023, 6
-          tz.transition 2043, 10, :o2, 14805283, 6
-          tz.transition 2044, 3, :o1, 14806207, 6
-          tz.transition 2044, 10, :o2, 14807509, 6
-          tz.transition 2045, 3, :o1, 14808391, 6
-          tz.transition 2045, 10, :o2, 14809693, 6
-          tz.transition 2046, 3, :o1, 14810575, 6
-          tz.transition 2046, 10, :o2, 14811877, 6
-          tz.transition 2047, 3, :o1, 14812801, 6
-          tz.transition 2047, 10, :o2, 14814061, 6
-          tz.transition 2048, 3, :o1, 14814985, 6
-          tz.transition 2048, 10, :o2, 14816245, 6
-          tz.transition 2049, 3, :o1, 14817169, 6
-          tz.transition 2049, 10, :o2, 14818471, 6
-          tz.transition 2050, 3, :o1, 14819353, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/NSW.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/NSW.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/NSW.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/NSW.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module NSW
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/NSW', 'Australia/Sydney'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/North.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/North.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/North.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/North.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module North
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/North', 'Australia/Darwin'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Perth.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Perth.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Perth.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Perth.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,31 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Perth
-        include TimezoneDefinition
-        
-        timezone 'Australia/Perth' do |tz|
-          tz.offset :o0, 27804, 0, :LMT
-          tz.offset :o1, 28800, 0, :WST
-          tz.offset :o2, 28800, 3600, :WST
-          
-          tz.transition 1895, 11, :o1, 17377402883, 7200
-          tz.transition 1916, 12, :o2, 3486570001, 1440
-          tz.transition 1917, 3, :o1, 58111493, 24
-          tz.transition 1941, 12, :o2, 9721441, 4
-          tz.transition 1942, 3, :o1, 58330733, 24
-          tz.transition 1942, 9, :o2, 9722517, 4
-          tz.transition 1943, 3, :o1, 58339469, 24
-          tz.transition 1974, 10, :o2, 152042400
-          tz.transition 1975, 3, :o1, 162928800
-          tz.transition 1983, 10, :o2, 436298400
-          tz.transition 1984, 3, :o1, 447184800
-          tz.transition 1991, 11, :o2, 690314400
-          tz.transition 1992, 2, :o1, 699386400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Queensland.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Queensland.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Queensland.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Queensland.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Queensland
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/Queensland', 'Australia/Brisbane'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/South.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/South.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/South.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/South.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module South
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/South', 'Australia/Adelaide'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Sydney.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Sydney.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Sydney.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Sydney.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Sydney
-        include TimezoneDefinition
-        
-        timezone 'Australia/Sydney' do |tz|
-          tz.offset :o0, 36292, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1895, 1, :o1, 52125661727, 21600
-          tz.transition 1916, 12, :o2, 3486569881, 1440
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1972, 10, :o2, 89136000
-          tz.transition 1973, 3, :o1, 100022400
-          tz.transition 1973, 10, :o2, 120585600
-          tz.transition 1974, 3, :o1, 131472000
-          tz.transition 1974, 10, :o2, 152035200
-          tz.transition 1975, 3, :o1, 162921600
-          tz.transition 1975, 10, :o2, 183484800
-          tz.transition 1976, 3, :o1, 194976000
-          tz.transition 1976, 10, :o2, 215539200
-          tz.transition 1977, 3, :o1, 226425600
-          tz.transition 1977, 10, :o2, 246988800
-          tz.transition 1978, 3, :o1, 257875200
-          tz.transition 1978, 10, :o2, 278438400
-          tz.transition 1979, 3, :o1, 289324800
-          tz.transition 1979, 10, :o2, 309888000
-          tz.transition 1980, 3, :o1, 320774400
-          tz.transition 1980, 10, :o2, 341337600
-          tz.transition 1981, 2, :o1, 352224000
-          tz.transition 1981, 10, :o2, 372787200
-          tz.transition 1982, 4, :o1, 386697600
-          tz.transition 1982, 10, :o2, 404841600
-          tz.transition 1983, 3, :o1, 415728000
-          tz.transition 1983, 10, :o2, 436291200
-          tz.transition 1984, 3, :o1, 447177600
-          tz.transition 1984, 10, :o2, 467740800
-          tz.transition 1985, 3, :o1, 478627200
-          tz.transition 1985, 10, :o2, 499190400
-          tz.transition 1986, 3, :o1, 511286400
-          tz.transition 1986, 10, :o2, 530035200
-          tz.transition 1987, 3, :o1, 542736000
-          tz.transition 1987, 10, :o2, 562089600
-          tz.transition 1988, 3, :o1, 574790400
-          tz.transition 1988, 10, :o2, 594144000
-          tz.transition 1989, 3, :o1, 606240000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 636480000
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 667929600
-          tz.transition 1991, 10, :o2, 688492800
-          tz.transition 1992, 2, :o1, 699379200
-          tz.transition 1992, 10, :o2, 719942400
-          tz.transition 1993, 3, :o1, 731433600
-          tz.transition 1993, 10, :o2, 751996800
-          tz.transition 1994, 3, :o1, 762883200
-          tz.transition 1994, 10, :o2, 783446400
-          tz.transition 1995, 3, :o1, 794332800
-          tz.transition 1995, 10, :o2, 814896000
-          tz.transition 1996, 3, :o1, 828201600
-          tz.transition 1996, 10, :o2, 846345600
-          tz.transition 1997, 3, :o1, 859651200
-          tz.transition 1997, 10, :o2, 877795200
-          tz.transition 1998, 3, :o1, 891100800
-          tz.transition 1998, 10, :o2, 909244800
-          tz.transition 1999, 3, :o1, 922550400
-          tz.transition 1999, 10, :o2, 941299200
-          tz.transition 2000, 3, :o1, 954000000
-          tz.transition 2000, 8, :o2, 967305600
-          tz.transition 2001, 3, :o1, 985449600
-          tz.transition 2001, 10, :o2, 1004198400
-          tz.transition 2002, 3, :o1, 1017504000
-          tz.transition 2002, 10, :o2, 1035648000
-          tz.transition 2003, 3, :o1, 1048953600
-          tz.transition 2003, 10, :o2, 1067097600
-          tz.transition 2004, 3, :o1, 1080403200
-          tz.transition 2004, 10, :o2, 1099152000
-          tz.transition 2005, 3, :o1, 1111852800
-          tz.transition 2005, 10, :o2, 1130601600
-          tz.transition 2006, 4, :o1, 1143907200
-          tz.transition 2006, 10, :o2, 1162051200
-          tz.transition 2007, 3, :o1, 1174752000
-          tz.transition 2007, 10, :o2, 1193500800
-          tz.transition 2008, 3, :o1, 1206806400
-          tz.transition 2008, 10, :o2, 1224950400
-          tz.transition 2009, 3, :o1, 1238256000
-          tz.transition 2009, 10, :o2, 1256400000
-          tz.transition 2010, 3, :o1, 1269705600
-          tz.transition 2010, 10, :o2, 1288454400
-          tz.transition 2011, 3, :o1, 1301155200
-          tz.transition 2011, 10, :o2, 1319904000
-          tz.transition 2012, 3, :o1, 1332604800
-          tz.transition 2012, 10, :o2, 1351353600
-          tz.transition 2013, 3, :o1, 1364659200
-          tz.transition 2013, 10, :o2, 1382803200
-          tz.transition 2014, 3, :o1, 1396108800
-          tz.transition 2014, 10, :o2, 1414252800
-          tz.transition 2015, 3, :o1, 1427558400
-          tz.transition 2015, 10, :o2, 1445702400
-          tz.transition 2016, 3, :o1, 1459008000
-          tz.transition 2016, 10, :o2, 1477756800
-          tz.transition 2017, 3, :o1, 1490457600
-          tz.transition 2017, 10, :o2, 1509206400
-          tz.transition 2018, 3, :o1, 1521907200
-          tz.transition 2018, 10, :o2, 1540656000
-          tz.transition 2019, 3, :o1, 1553961600
-          tz.transition 2019, 10, :o2, 1572105600
-          tz.transition 2020, 3, :o1, 1585411200
-          tz.transition 2020, 10, :o2, 1603555200
-          tz.transition 2021, 3, :o1, 1616860800
-          tz.transition 2021, 10, :o2, 1635609600
-          tz.transition 2022, 3, :o1, 1648310400
-          tz.transition 2022, 10, :o2, 1667059200
-          tz.transition 2023, 3, :o1, 1679760000
-          tz.transition 2023, 10, :o2, 1698508800
-          tz.transition 2024, 3, :o1, 1711814400
-          tz.transition 2024, 10, :o2, 1729958400
-          tz.transition 2025, 3, :o1, 1743264000
-          tz.transition 2025, 10, :o2, 1761408000
-          tz.transition 2026, 3, :o1, 1774713600
-          tz.transition 2026, 10, :o2, 1792857600
-          tz.transition 2027, 3, :o1, 1806163200
-          tz.transition 2027, 10, :o2, 1824912000
-          tz.transition 2028, 3, :o1, 1837612800
-          tz.transition 2028, 10, :o2, 1856361600
-          tz.transition 2029, 3, :o1, 1869062400
-          tz.transition 2029, 10, :o2, 1887811200
-          tz.transition 2030, 3, :o1, 1901116800
-          tz.transition 2030, 10, :o2, 1919260800
-          tz.transition 2031, 3, :o1, 1932566400
-          tz.transition 2031, 10, :o2, 1950710400
-          tz.transition 2032, 3, :o1, 1964016000
-          tz.transition 2032, 10, :o2, 1982764800
-          tz.transition 2033, 3, :o1, 1995465600
-          tz.transition 2033, 10, :o2, 2014214400
-          tz.transition 2034, 3, :o1, 2026915200
-          tz.transition 2034, 10, :o2, 2045664000
-          tz.transition 2035, 3, :o1, 2058364800
-          tz.transition 2035, 10, :o2, 2077113600
-          tz.transition 2036, 3, :o1, 2090419200
-          tz.transition 2036, 10, :o2, 2108563200
-          tz.transition 2037, 3, :o1, 2121868800
-          tz.transition 2037, 10, :o2, 2140012800
-          tz.transition 2038, 3, :o1, 14793061, 6
-          tz.transition 2038, 10, :o2, 14794363, 6
-          tz.transition 2039, 3, :o1, 14795245, 6
-          tz.transition 2039, 10, :o2, 14796547, 6
-          tz.transition 2040, 3, :o1, 14797429, 6
-          tz.transition 2040, 10, :o2, 14798731, 6
-          tz.transition 2041, 3, :o1, 14799655, 6
-          tz.transition 2041, 10, :o2, 14800915, 6
-          tz.transition 2042, 3, :o1, 14801839, 6
-          tz.transition 2042, 10, :o2, 14803099, 6
-          tz.transition 2043, 3, :o1, 14804023, 6
-          tz.transition 2043, 10, :o2, 14805283, 6
-          tz.transition 2044, 3, :o1, 14806207, 6
-          tz.transition 2044, 10, :o2, 14807509, 6
-          tz.transition 2045, 3, :o1, 14808391, 6
-          tz.transition 2045, 10, :o2, 14809693, 6
-          tz.transition 2046, 3, :o1, 14810575, 6
-          tz.transition 2046, 10, :o2, 14811877, 6
-          tz.transition 2047, 3, :o1, 14812801, 6
-          tz.transition 2047, 10, :o2, 14814061, 6
-          tz.transition 2048, 3, :o1, 14814985, 6
-          tz.transition 2048, 10, :o2, 14816245, 6
-          tz.transition 2049, 3, :o1, 14817169, 6
-          tz.transition 2049, 10, :o2, 14818471, 6
-          tz.transition 2050, 3, :o1, 14819353, 6
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Tasmania.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Tasmania.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Tasmania.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Tasmania.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Tasmania
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/Tasmania', 'Australia/Hobart'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Victoria.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Victoria.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Victoria.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Victoria.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Victoria
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/Victoria', 'Australia/Melbourne'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/West.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/West.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/West.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/West.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module West
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/West', 'Australia/Perth'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Yancowinna.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Yancowinna.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Yancowinna.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Australia/Yancowinna.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Yancowinna
-        include TimezoneDefinition
-        
-        linked_timezone 'Australia/Yancowinna', 'Australia/Broken_Hill'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/Acre.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/Acre.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/Acre.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/Acre.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Brazil
-      module Acre
-        include TimezoneDefinition
-        
-        linked_timezone 'Brazil/Acre', 'America/Rio_Branco'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/DeNoronha.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/DeNoronha.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/DeNoronha.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/DeNoronha.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Brazil
-      module DeNoronha
-        include TimezoneDefinition
-        
-        linked_timezone 'Brazil/DeNoronha', 'America/Noronha'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/East.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/East.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/East.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/East.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Brazil
-      module East
-        include TimezoneDefinition
-        
-        linked_timezone 'Brazil/East', 'America/Sao_Paulo'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/West.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/West.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/West.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Brazil/West.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Brazil
-      module West
-        include TimezoneDefinition
-        
-        linked_timezone 'Brazil/West', 'America/Manaus'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CET.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CET.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CET.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CET.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,175 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module CET
-      include TimezoneDefinition
-      
-      timezone 'CET' do |tz|
-        tz.offset :o0, 3600, 0, :CET
-        tz.offset :o1, 3600, 3600, :CEST
-        
-        tz.transition 1916, 4, :o1, 29051813, 12
-        tz.transition 1916, 9, :o0, 58107299, 24
-        tz.transition 1917, 4, :o1, 58112029, 24
-        tz.transition 1917, 9, :o0, 58115725, 24
-        tz.transition 1918, 4, :o1, 58120765, 24
-        tz.transition 1918, 9, :o0, 58124461, 24
-        tz.transition 1940, 4, :o1, 58313293, 24
-        tz.transition 1942, 11, :o0, 58335973, 24
-        tz.transition 1943, 3, :o1, 58339501, 24
-        tz.transition 1943, 10, :o0, 58344037, 24
-        tz.transition 1944, 4, :o1, 58348405, 24
-        tz.transition 1944, 10, :o0, 58352773, 24
-        tz.transition 1977, 4, :o1, 228877200
-        tz.transition 1977, 9, :o0, 243997200
-        tz.transition 1978, 4, :o1, 260326800
-        tz.transition 1978, 10, :o0, 276051600
-        tz.transition 1979, 4, :o1, 291776400
-        tz.transition 1979, 9, :o0, 307501200
-        tz.transition 1980, 4, :o1, 323830800
-        tz.transition 1980, 9, :o0, 338950800
-        tz.transition 1981, 3, :o1, 354675600
-        tz.transition 1981, 9, :o0, 370400400
-        tz.transition 1982, 3, :o1, 386125200
-        tz.transition 1982, 9, :o0, 401850000
-        tz.transition 1983, 3, :o1, 417574800
-        tz.transition 1983, 9, :o0, 433299600
-        tz.transition 1984, 3, :o1, 449024400
-        tz.transition 1984, 9, :o0, 465354000
-        tz.transition 1985, 3, :o1, 481078800
-        tz.transition 1985, 9, :o0, 496803600
-        tz.transition 1986, 3, :o1, 512528400
-        tz.transition 1986, 9, :o0, 528253200
-        tz.transition 1987, 3, :o1, 543978000
-        tz.transition 1987, 9, :o0, 559702800
-        tz.transition 1988, 3, :o1, 575427600
-        tz.transition 1988, 9, :o0, 591152400
-        tz.transition 1989, 3, :o1, 606877200
-        tz.transition 1989, 9, :o0, 622602000
-        tz.transition 1990, 3, :o1, 638326800
-        tz.transition 1990, 9, :o0, 654656400
-        tz.transition 1991, 3, :o1, 670381200
-        tz.transition 1991, 9, :o0, 686106000
-        tz.transition 1992, 3, :o1, 701830800
-        tz.transition 1992, 9, :o0, 717555600
-        tz.transition 1993, 3, :o1, 733280400
-        tz.transition 1993, 9, :o0, 749005200
-        tz.transition 1994, 3, :o1, 764730000
-        tz.transition 1994, 9, :o0, 780454800
-        tz.transition 1995, 3, :o1, 796179600
-        tz.transition 1995, 9, :o0, 811904400
-        tz.transition 1996, 3, :o1, 828234000
-        tz.transition 1996, 10, :o0, 846378000
-        tz.transition 1997, 3, :o1, 859683600
-        tz.transition 1997, 10, :o0, 877827600
-        tz.transition 1998, 3, :o1, 891133200
-        tz.transition 1998, 10, :o0, 909277200
-        tz.transition 1999, 3, :o1, 922582800
-        tz.transition 1999, 10, :o0, 941331600
-        tz.transition 2000, 3, :o1, 954032400
-        tz.transition 2000, 10, :o0, 972781200
-        tz.transition 2001, 3, :o1, 985482000
-        tz.transition 2001, 10, :o0, 1004230800
-        tz.transition 2002, 3, :o1, 1017536400
-        tz.transition 2002, 10, :o0, 1035680400
-        tz.transition 2003, 3, :o1, 1048986000
-        tz.transition 2003, 10, :o0, 1067130000
-        tz.transition 2004, 3, :o1, 1080435600
-        tz.transition 2004, 10, :o0, 1099184400
-        tz.transition 2005, 3, :o1, 1111885200
-        tz.transition 2005, 10, :o0, 1130634000
-        tz.transition 2006, 3, :o1, 1143334800
-        tz.transition 2006, 10, :o0, 1162083600
-        tz.transition 2007, 3, :o1, 1174784400
-        tz.transition 2007, 10, :o0, 1193533200
-        tz.transition 2008, 3, :o1, 1206838800
-        tz.transition 2008, 10, :o0, 1224982800
-        tz.transition 2009, 3, :o1, 1238288400
-        tz.transition 2009, 10, :o0, 1256432400
-        tz.transition 2010, 3, :o1, 1269738000
-        tz.transition 2010, 10, :o0, 1288486800
-        tz.transition 2011, 3, :o1, 1301187600
-        tz.transition 2011, 10, :o0, 1319936400
-        tz.transition 2012, 3, :o1, 1332637200
-        tz.transition 2012, 10, :o0, 1351386000
-        tz.transition 2013, 3, :o1, 1364691600
-        tz.transition 2013, 10, :o0, 1382835600
-        tz.transition 2014, 3, :o1, 1396141200
-        tz.transition 2014, 10, :o0, 1414285200
-        tz.transition 2015, 3, :o1, 1427590800
-        tz.transition 2015, 10, :o0, 1445734800
-        tz.transition 2016, 3, :o1, 1459040400
-        tz.transition 2016, 10, :o0, 1477789200
-        tz.transition 2017, 3, :o1, 1490490000
-        tz.transition 2017, 10, :o0, 1509238800
-        tz.transition 2018, 3, :o1, 1521939600
-        tz.transition 2018, 10, :o0, 1540688400
-        tz.transition 2019, 3, :o1, 1553994000
-        tz.transition 2019, 10, :o0, 1572138000
-        tz.transition 2020, 3, :o1, 1585443600
-        tz.transition 2020, 10, :o0, 1603587600
-        tz.transition 2021, 3, :o1, 1616893200
-        tz.transition 2021, 10, :o0, 1635642000
-        tz.transition 2022, 3, :o1, 1648342800
-        tz.transition 2022, 10, :o0, 1667091600
-        tz.transition 2023, 3, :o1, 1679792400
-        tz.transition 2023, 10, :o0, 1698541200
-        tz.transition 2024, 3, :o1, 1711846800
-        tz.transition 2024, 10, :o0, 1729990800
-        tz.transition 2025, 3, :o1, 1743296400
-        tz.transition 2025, 10, :o0, 1761440400
-        tz.transition 2026, 3, :o1, 1774746000
-        tz.transition 2026, 10, :o0, 1792890000
-        tz.transition 2027, 3, :o1, 1806195600
-        tz.transition 2027, 10, :o0, 1824944400
-        tz.transition 2028, 3, :o1, 1837645200
-        tz.transition 2028, 10, :o0, 1856394000
-        tz.transition 2029, 3, :o1, 1869094800
-        tz.transition 2029, 10, :o0, 1887843600
-        tz.transition 2030, 3, :o1, 1901149200
-        tz.transition 2030, 10, :o0, 1919293200
-        tz.transition 2031, 3, :o1, 1932598800
-        tz.transition 2031, 10, :o0, 1950742800
-        tz.transition 2032, 3, :o1, 1964048400
-        tz.transition 2032, 10, :o0, 1982797200
-        tz.transition 2033, 3, :o1, 1995498000
-        tz.transition 2033, 10, :o0, 2014246800
-        tz.transition 2034, 3, :o1, 2026947600
-        tz.transition 2034, 10, :o0, 2045696400
-        tz.transition 2035, 3, :o1, 2058397200
-        tz.transition 2035, 10, :o0, 2077146000
-        tz.transition 2036, 3, :o1, 2090451600
-        tz.transition 2036, 10, :o0, 2108595600
-        tz.transition 2037, 3, :o1, 2121901200
-        tz.transition 2037, 10, :o0, 2140045200
-        tz.transition 2038, 3, :o1, 59172253, 24
-        tz.transition 2038, 10, :o0, 59177461, 24
-        tz.transition 2039, 3, :o1, 59180989, 24
-        tz.transition 2039, 10, :o0, 59186197, 24
-        tz.transition 2040, 3, :o1, 59189725, 24
-        tz.transition 2040, 10, :o0, 59194933, 24
-        tz.transition 2041, 3, :o1, 59198629, 24
-        tz.transition 2041, 10, :o0, 59203669, 24
-        tz.transition 2042, 3, :o1, 59207365, 24
-        tz.transition 2042, 10, :o0, 59212405, 24
-        tz.transition 2043, 3, :o1, 59216101, 24
-        tz.transition 2043, 10, :o0, 59221141, 24
-        tz.transition 2044, 3, :o1, 59224837, 24
-        tz.transition 2044, 10, :o0, 59230045, 24
-        tz.transition 2045, 3, :o1, 59233573, 24
-        tz.transition 2045, 10, :o0, 59238781, 24
-        tz.transition 2046, 3, :o1, 59242309, 24
-        tz.transition 2046, 10, :o0, 59247517, 24
-        tz.transition 2047, 3, :o1, 59251213, 24
-        tz.transition 2047, 10, :o0, 59256253, 24
-        tz.transition 2048, 3, :o1, 59259949, 24
-        tz.transition 2048, 10, :o0, 59264989, 24
-        tz.transition 2049, 3, :o1, 59268685, 24
-        tz.transition 2049, 10, :o0, 59273893, 24
-        tz.transition 2050, 3, :o1, 59277421, 24
-        tz.transition 2050, 10, :o0, 59282629, 24
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CST6CDT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CST6CDT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CST6CDT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/CST6CDT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,192 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module CST6CDT
-      include TimezoneDefinition
-      
-      timezone 'CST6CDT' do |tz|
-        tz.offset :o0, -21600, 0, :CST
-        tz.offset :o1, -21600, 3600, :CDT
-        tz.offset :o2, -21600, 3600, :CWT
-        tz.offset :o3, -21600, 3600, :CPT
-        
-        tz.transition 1918, 3, :o1, 14530103, 6
-        tz.transition 1918, 10, :o0, 58125451, 24
-        tz.transition 1919, 3, :o1, 14532287, 6
-        tz.transition 1919, 10, :o0, 58134187, 24
-        tz.transition 1942, 2, :o2, 14582399, 6
-        tz.transition 1945, 8, :o3, 58360379, 24
-        tz.transition 1945, 9, :o0, 58361491, 24
-        tz.transition 1967, 4, :o1, 14637665, 6
-        tz.transition 1967, 10, :o0, 58555027, 24
-        tz.transition 1968, 4, :o1, 14639849, 6
-        tz.transition 1968, 10, :o0, 58563763, 24
-        tz.transition 1969, 4, :o1, 14642033, 6
-        tz.transition 1969, 10, :o0, 58572499, 24
-        tz.transition 1970, 4, :o1, 9964800
-        tz.transition 1970, 10, :o0, 25686000
-        tz.transition 1971, 4, :o1, 41414400
-        tz.transition 1971, 10, :o0, 57740400
-        tz.transition 1972, 4, :o1, 73468800
-        tz.transition 1972, 10, :o0, 89190000
-        tz.transition 1973, 4, :o1, 104918400
-        tz.transition 1973, 10, :o0, 120639600
-        tz.transition 1974, 1, :o1, 126691200
-        tz.transition 1974, 10, :o0, 152089200
-        tz.transition 1975, 2, :o1, 162374400
-        tz.transition 1975, 10, :o0, 183538800
-        tz.transition 1976, 4, :o1, 199267200
-        tz.transition 1976, 10, :o0, 215593200
-        tz.transition 1977, 4, :o1, 230716800
-        tz.transition 1977, 10, :o0, 247042800
-        tz.transition 1978, 4, :o1, 262771200
-        tz.transition 1978, 10, :o0, 278492400
-        tz.transition 1979, 4, :o1, 294220800
-        tz.transition 1979, 10, :o0, 309942000
-        tz.transition 1980, 4, :o1, 325670400
-        tz.transition 1980, 10, :o0, 341391600
-        tz.transition 1981, 4, :o1, 357120000
-        tz.transition 1981, 10, :o0, 372841200
-        tz.transition 1982, 4, :o1, 388569600
-        tz.transition 1982, 10, :o0, 404895600
-        tz.transition 1983, 4, :o1, 420019200
-        tz.transition 1983, 10, :o0, 436345200
-        tz.transition 1984, 4, :o1, 452073600
-        tz.transition 1984, 10, :o0, 467794800
-        tz.transition 1985, 4, :o1, 483523200
-        tz.transition 1985, 10, :o0, 499244400
-        tz.transition 1986, 4, :o1, 514972800
-        tz.transition 1986, 10, :o0, 530694000
-        tz.transition 1987, 4, :o1, 544608000
-        tz.transition 1987, 10, :o0, 562143600
-        tz.transition 1988, 4, :o1, 576057600
-        tz.transition 1988, 10, :o0, 594198000
-        tz.transition 1989, 4, :o1, 607507200
-        tz.transition 1989, 10, :o0, 625647600
-        tz.transition 1990, 4, :o1, 638956800
-        tz.transition 1990, 10, :o0, 657097200
-        tz.transition 1991, 4, :o1, 671011200
-        tz.transition 1991, 10, :o0, 688546800
-        tz.transition 1992, 4, :o1, 702460800
-        tz.transition 1992, 10, :o0, 719996400
-        tz.transition 1993, 4, :o1, 733910400
-        tz.transition 1993, 10, :o0, 752050800
-        tz.transition 1994, 4, :o1, 765360000
-        tz.transition 1994, 10, :o0, 783500400
-        tz.transition 1995, 4, :o1, 796809600
-        tz.transition 1995, 10, :o0, 814950000
-        tz.transition 1996, 4, :o1, 828864000
-        tz.transition 1996, 10, :o0, 846399600
-        tz.transition 1997, 4, :o1, 860313600
-        tz.transition 1997, 10, :o0, 877849200
-        tz.transition 1998, 4, :o1, 891763200
-        tz.transition 1998, 10, :o0, 909298800
-        tz.transition 1999, 4, :o1, 923212800
-        tz.transition 1999, 10, :o0, 941353200
-        tz.transition 2000, 4, :o1, 954662400
-        tz.transition 2000, 10, :o0, 972802800
-        tz.transition 2001, 4, :o1, 986112000
-        tz.transition 2001, 10, :o0, 1004252400
-        tz.transition 2002, 4, :o1, 1018166400
-        tz.transition 2002, 10, :o0, 1035702000
-        tz.transition 2003, 4, :o1, 1049616000
-        tz.transition 2003, 10, :o0, 1067151600
-        tz.transition 2004, 4, :o1, 1081065600
-        tz.transition 2004, 10, :o0, 1099206000
-        tz.transition 2005, 4, :o1, 1112515200
-        tz.transition 2005, 10, :o0, 1130655600
-        tz.transition 2006, 4, :o1, 1143964800
-        tz.transition 2006, 10, :o0, 1162105200
-        tz.transition 2007, 3, :o1, 1173600000
-        tz.transition 2007, 11, :o0, 1194159600
-        tz.transition 2008, 3, :o1, 1205049600
-        tz.transition 2008, 11, :o0, 1225609200
-        tz.transition 2009, 3, :o1, 1236499200
-        tz.transition 2009, 11, :o0, 1257058800
-        tz.transition 2010, 3, :o1, 1268553600
-        tz.transition 2010, 11, :o0, 1289113200
-        tz.transition 2011, 3, :o1, 1300003200
-        tz.transition 2011, 11, :o0, 1320562800
-        tz.transition 2012, 3, :o1, 1331452800
-        tz.transition 2012, 11, :o0, 1352012400
-        tz.transition 2013, 3, :o1, 1362902400
-        tz.transition 2013, 11, :o0, 1383462000
-        tz.transition 2014, 3, :o1, 1394352000
-        tz.transition 2014, 11, :o0, 1414911600
-        tz.transition 2015, 3, :o1, 1425801600
-        tz.transition 2015, 11, :o0, 1446361200
-        tz.transition 2016, 3, :o1, 1457856000
-        tz.transition 2016, 11, :o0, 1478415600
-        tz.transition 2017, 3, :o1, 1489305600
-        tz.transition 2017, 11, :o0, 1509865200
-        tz.transition 2018, 3, :o1, 1520755200
-        tz.transition 2018, 11, :o0, 1541314800
-        tz.transition 2019, 3, :o1, 1552204800
-        tz.transition 2019, 11, :o0, 1572764400
-        tz.transition 2020, 3, :o1, 1583654400
-        tz.transition 2020, 11, :o0, 1604214000
-        tz.transition 2021, 3, :o1, 1615708800
-        tz.transition 2021, 11, :o0, 1636268400
-        tz.transition 2022, 3, :o1, 1647158400
-        tz.transition 2022, 11, :o0, 1667718000
-        tz.transition 2023, 3, :o1, 1678608000
-        tz.transition 2023, 11, :o0, 1699167600
-        tz.transition 2024, 3, :o1, 1710057600
-        tz.transition 2024, 11, :o0, 1730617200
-        tz.transition 2025, 3, :o1, 1741507200
-        tz.transition 2025, 11, :o0, 1762066800
-        tz.transition 2026, 3, :o1, 1772956800
-        tz.transition 2026, 11, :o0, 1793516400
-        tz.transition 2027, 3, :o1, 1805011200
-        tz.transition 2027, 11, :o0, 1825570800
-        tz.transition 2028, 3, :o1, 1836460800
-        tz.transition 2028, 11, :o0, 1857020400
-        tz.transition 2029, 3, :o1, 1867910400
-        tz.transition 2029, 11, :o0, 1888470000
-        tz.transition 2030, 3, :o1, 1899360000
-        tz.transition 2030, 11, :o0, 1919919600
-        tz.transition 2031, 3, :o1, 1930809600
-        tz.transition 2031, 11, :o0, 1951369200
-        tz.transition 2032, 3, :o1, 1962864000
-        tz.transition 2032, 11, :o0, 1983423600
-        tz.transition 2033, 3, :o1, 1994313600
-        tz.transition 2033, 11, :o0, 2014873200
-        tz.transition 2034, 3, :o1, 2025763200
-        tz.transition 2034, 11, :o0, 2046322800
-        tz.transition 2035, 3, :o1, 2057212800
-        tz.transition 2035, 11, :o0, 2077772400
-        tz.transition 2036, 3, :o1, 2088662400
-        tz.transition 2036, 11, :o0, 2109222000
-        tz.transition 2037, 3, :o1, 2120112000
-        tz.transition 2037, 11, :o0, 2140671600
-        tz.transition 2038, 3, :o1, 14792981, 6
-        tz.transition 2038, 11, :o0, 59177635, 24
-        tz.transition 2039, 3, :o1, 14795165, 6
-        tz.transition 2039, 11, :o0, 59186371, 24
-        tz.transition 2040, 3, :o1, 14797349, 6
-        tz.transition 2040, 11, :o0, 59195107, 24
-        tz.transition 2041, 3, :o1, 14799533, 6
-        tz.transition 2041, 11, :o0, 59203843, 24
-        tz.transition 2042, 3, :o1, 14801717, 6
-        tz.transition 2042, 11, :o0, 59212579, 24
-        tz.transition 2043, 3, :o1, 14803901, 6
-        tz.transition 2043, 11, :o0, 59221315, 24
-        tz.transition 2044, 3, :o1, 14806127, 6
-        tz.transition 2044, 11, :o0, 59230219, 24
-        tz.transition 2045, 3, :o1, 14808311, 6
-        tz.transition 2045, 11, :o0, 59238955, 24
-        tz.transition 2046, 3, :o1, 14810495, 6
-        tz.transition 2046, 11, :o0, 59247691, 24
-        tz.transition 2047, 3, :o1, 14812679, 6
-        tz.transition 2047, 11, :o0, 59256427, 24
-        tz.transition 2048, 3, :o1, 14814863, 6
-        tz.transition 2048, 11, :o0, 59265163, 24
-        tz.transition 2049, 3, :o1, 14817089, 6
-        tz.transition 2049, 11, :o0, 59274067, 24
-        tz.transition 2050, 3, :o1, 14819273, 6
-        tz.transition 2050, 11, :o0, 59282803, 24
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Atlantic.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Atlantic.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Atlantic.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Atlantic.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Atlantic
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Atlantic', 'America/Halifax'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Central.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Central.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Central.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Central.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Central
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Central', 'America/Winnipeg'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/East__m__Saskatchewan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/East__m__Saskatchewan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/East__m__Saskatchewan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/East__m__Saskatchewan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module East__m__Saskatchewan
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/East-Saskatchewan', 'America/Regina'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Eastern.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Eastern.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Eastern.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Eastern.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Eastern
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Eastern', 'America/Toronto'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Mountain.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Mountain.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Mountain.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Mountain.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Mountain
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Mountain', 'America/Edmonton'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Newfoundland.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Newfoundland.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Newfoundland.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Newfoundland.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Newfoundland
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Newfoundland', 'America/St_Johns'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Pacific.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Pacific.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Pacific.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Pacific.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Pacific
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Pacific', 'America/Vancouver'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Saskatchewan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Saskatchewan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Saskatchewan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Saskatchewan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Saskatchewan
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Saskatchewan', 'America/Regina'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Yukon.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Yukon.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Yukon.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Canada/Yukon.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Canada
-      module Yukon
-        include TimezoneDefinition
-        
-        linked_timezone 'Canada/Yukon', 'America/Whitehorse'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/Continental.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/Continental.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/Continental.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/Continental.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Chile
-      module Continental
-        include TimezoneDefinition
-        
-        linked_timezone 'Chile/Continental', 'America/Santiago'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/EasterIsland.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/EasterIsland.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/EasterIsland.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Chile/EasterIsland.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Chile
-      module EasterIsland
-        include TimezoneDefinition
-        
-        linked_timezone 'Chile/EasterIsland', 'Pacific/Easter'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Cuba.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Cuba.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Cuba.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Cuba.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Cuba
-      include TimezoneDefinition
-      
-      linked_timezone 'Cuba', 'America/Havana'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EET.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EET.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EET.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EET.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module EET
-      include TimezoneDefinition
-      
-      timezone 'EET' do |tz|
-        tz.offset :o0, 7200, 0, :EET
-        tz.offset :o1, 7200, 3600, :EEST
-        
-        tz.transition 1977, 4, :o1, 228877200
-        tz.transition 1977, 9, :o0, 243997200
-        tz.transition 1978, 4, :o1, 260326800
-        tz.transition 1978, 10, :o0, 276051600
-        tz.transition 1979, 4, :o1, 291776400
-        tz.transition 1979, 9, :o0, 307501200
-        tz.transition 1980, 4, :o1, 323830800
-        tz.transition 1980, 9, :o0, 338950800
-        tz.transition 1981, 3, :o1, 354675600
-        tz.transition 1981, 9, :o0, 370400400
-        tz.transition 1982, 3, :o1, 386125200
-        tz.transition 1982, 9, :o0, 401850000
-        tz.transition 1983, 3, :o1, 417574800
-        tz.transition 1983, 9, :o0, 433299600
-        tz.transition 1984, 3, :o1, 449024400
-        tz.transition 1984, 9, :o0, 465354000
-        tz.transition 1985, 3, :o1, 481078800
-        tz.transition 1985, 9, :o0, 496803600
-        tz.transition 1986, 3, :o1, 512528400
-        tz.transition 1986, 9, :o0, 528253200
-        tz.transition 1987, 3, :o1, 543978000
-        tz.transition 1987, 9, :o0, 559702800
-        tz.transition 1988, 3, :o1, 575427600
-        tz.transition 1988, 9, :o0, 591152400
-        tz.transition 1989, 3, :o1, 606877200
-        tz.transition 1989, 9, :o0, 622602000
-        tz.transition 1990, 3, :o1, 638326800
-        tz.transition 1990, 9, :o0, 654656400
-        tz.transition 1991, 3, :o1, 670381200
-        tz.transition 1991, 9, :o0, 686106000
-        tz.transition 1992, 3, :o1, 701830800
-        tz.transition 1992, 9, :o0, 717555600
-        tz.transition 1993, 3, :o1, 733280400
-        tz.transition 1993, 9, :o0, 749005200
-        tz.transition 1994, 3, :o1, 764730000
-        tz.transition 1994, 9, :o0, 780454800
-        tz.transition 1995, 3, :o1, 796179600
-        tz.transition 1995, 9, :o0, 811904400
-        tz.transition 1996, 3, :o1, 828234000
-        tz.transition 1996, 10, :o0, 846378000
-        tz.transition 1997, 3, :o1, 859683600
-        tz.transition 1997, 10, :o0, 877827600
-        tz.transition 1998, 3, :o1, 891133200
-        tz.transition 1998, 10, :o0, 909277200
-        tz.transition 1999, 3, :o1, 922582800
-        tz.transition 1999, 10, :o0, 941331600
-        tz.transition 2000, 3, :o1, 954032400
-        tz.transition 2000, 10, :o0, 972781200
-        tz.transition 2001, 3, :o1, 985482000
-        tz.transition 2001, 10, :o0, 1004230800
-        tz.transition 2002, 3, :o1, 1017536400
-        tz.transition 2002, 10, :o0, 1035680400
-        tz.transition 2003, 3, :o1, 1048986000
-        tz.transition 2003, 10, :o0, 1067130000
-        tz.transition 2004, 3, :o1, 1080435600
-        tz.transition 2004, 10, :o0, 1099184400
-        tz.transition 2005, 3, :o1, 1111885200
-        tz.transition 2005, 10, :o0, 1130634000
-        tz.transition 2006, 3, :o1, 1143334800
-        tz.transition 2006, 10, :o0, 1162083600
-        tz.transition 2007, 3, :o1, 1174784400
-        tz.transition 2007, 10, :o0, 1193533200
-        tz.transition 2008, 3, :o1, 1206838800
-        tz.transition 2008, 10, :o0, 1224982800
-        tz.transition 2009, 3, :o1, 1238288400
-        tz.transition 2009, 10, :o0, 1256432400
-        tz.transition 2010, 3, :o1, 1269738000
-        tz.transition 2010, 10, :o0, 1288486800
-        tz.transition 2011, 3, :o1, 1301187600
-        tz.transition 2011, 10, :o0, 1319936400
-        tz.transition 2012, 3, :o1, 1332637200
-        tz.transition 2012, 10, :o0, 1351386000
-        tz.transition 2013, 3, :o1, 1364691600
-        tz.transition 2013, 10, :o0, 1382835600
-        tz.transition 2014, 3, :o1, 1396141200
-        tz.transition 2014, 10, :o0, 1414285200
-        tz.transition 2015, 3, :o1, 1427590800
-        tz.transition 2015, 10, :o0, 1445734800
-        tz.transition 2016, 3, :o1, 1459040400
-        tz.transition 2016, 10, :o0, 1477789200
-        tz.transition 2017, 3, :o1, 1490490000
-        tz.transition 2017, 10, :o0, 1509238800
-        tz.transition 2018, 3, :o1, 1521939600
-        tz.transition 2018, 10, :o0, 1540688400
-        tz.transition 2019, 3, :o1, 1553994000
-        tz.transition 2019, 10, :o0, 1572138000
-        tz.transition 2020, 3, :o1, 1585443600
-        tz.transition 2020, 10, :o0, 1603587600
-        tz.transition 2021, 3, :o1, 1616893200
-        tz.transition 2021, 10, :o0, 1635642000
-        tz.transition 2022, 3, :o1, 1648342800
-        tz.transition 2022, 10, :o0, 1667091600
-        tz.transition 2023, 3, :o1, 1679792400
-        tz.transition 2023, 10, :o0, 1698541200
-        tz.transition 2024, 3, :o1, 1711846800
-        tz.transition 2024, 10, :o0, 1729990800
-        tz.transition 2025, 3, :o1, 1743296400
-        tz.transition 2025, 10, :o0, 1761440400
-        tz.transition 2026, 3, :o1, 1774746000
-        tz.transition 2026, 10, :o0, 1792890000
-        tz.transition 2027, 3, :o1, 1806195600
-        tz.transition 2027, 10, :o0, 1824944400
-        tz.transition 2028, 3, :o1, 1837645200
-        tz.transition 2028, 10, :o0, 1856394000
-        tz.transition 2029, 3, :o1, 1869094800
-        tz.transition 2029, 10, :o0, 1887843600
-        tz.transition 2030, 3, :o1, 1901149200
-        tz.transition 2030, 10, :o0, 1919293200
-        tz.transition 2031, 3, :o1, 1932598800
-        tz.transition 2031, 10, :o0, 1950742800
-        tz.transition 2032, 3, :o1, 1964048400
-        tz.transition 2032, 10, :o0, 1982797200
-        tz.transition 2033, 3, :o1, 1995498000
-        tz.transition 2033, 10, :o0, 2014246800
-        tz.transition 2034, 3, :o1, 2026947600
-        tz.transition 2034, 10, :o0, 2045696400
-        tz.transition 2035, 3, :o1, 2058397200
-        tz.transition 2035, 10, :o0, 2077146000
-        tz.transition 2036, 3, :o1, 2090451600
-        tz.transition 2036, 10, :o0, 2108595600
-        tz.transition 2037, 3, :o1, 2121901200
-        tz.transition 2037, 10, :o0, 2140045200
-        tz.transition 2038, 3, :o1, 59172253, 24
-        tz.transition 2038, 10, :o0, 59177461, 24
-        tz.transition 2039, 3, :o1, 59180989, 24
-        tz.transition 2039, 10, :o0, 59186197, 24
-        tz.transition 2040, 3, :o1, 59189725, 24
-        tz.transition 2040, 10, :o0, 59194933, 24
-        tz.transition 2041, 3, :o1, 59198629, 24
-        tz.transition 2041, 10, :o0, 59203669, 24
-        tz.transition 2042, 3, :o1, 59207365, 24
-        tz.transition 2042, 10, :o0, 59212405, 24
-        tz.transition 2043, 3, :o1, 59216101, 24
-        tz.transition 2043, 10, :o0, 59221141, 24
-        tz.transition 2044, 3, :o1, 59224837, 24
-        tz.transition 2044, 10, :o0, 59230045, 24
-        tz.transition 2045, 3, :o1, 59233573, 24
-        tz.transition 2045, 10, :o0, 59238781, 24
-        tz.transition 2046, 3, :o1, 59242309, 24
-        tz.transition 2046, 10, :o0, 59247517, 24
-        tz.transition 2047, 3, :o1, 59251213, 24
-        tz.transition 2047, 10, :o0, 59256253, 24
-        tz.transition 2048, 3, :o1, 59259949, 24
-        tz.transition 2048, 10, :o0, 59264989, 24
-        tz.transition 2049, 3, :o1, 59268685, 24
-        tz.transition 2049, 10, :o0, 59273893, 24
-        tz.transition 2050, 3, :o1, 59277421, 24
-        tz.transition 2050, 10, :o0, 59282629, 24
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,14 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module EST
-      include TimezoneDefinition
-      
-      timezone 'EST' do |tz|
-        tz.offset :o0, -18000, 0, :EST
-        
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST5EDT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST5EDT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST5EDT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/EST5EDT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,192 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module EST5EDT
-      include TimezoneDefinition
-      
-      timezone 'EST5EDT' do |tz|
-        tz.offset :o0, -18000, 0, :EST
-        tz.offset :o1, -18000, 3600, :EDT
-        tz.offset :o2, -18000, 3600, :EWT
-        tz.offset :o3, -18000, 3600, :EPT
-        
-        tz.transition 1918, 3, :o1, 58120411, 24
-        tz.transition 1918, 10, :o0, 9687575, 4
-        tz.transition 1919, 3, :o1, 58129147, 24
-        tz.transition 1919, 10, :o0, 9689031, 4
-        tz.transition 1942, 2, :o2, 58329595, 24
-        tz.transition 1945, 8, :o3, 58360379, 24
-        tz.transition 1945, 9, :o0, 9726915, 4
-        tz.transition 1967, 4, :o1, 58550659, 24
-        tz.transition 1967, 10, :o0, 9759171, 4
-        tz.transition 1968, 4, :o1, 58559395, 24
-        tz.transition 1968, 10, :o0, 9760627, 4
-        tz.transition 1969, 4, :o1, 58568131, 24
-        tz.transition 1969, 10, :o0, 9762083, 4
-        tz.transition 1970, 4, :o1, 9961200
-        tz.transition 1970, 10, :o0, 25682400
-        tz.transition 1971, 4, :o1, 41410800
-        tz.transition 1971, 10, :o0, 57736800
-        tz.transition 1972, 4, :o1, 73465200
-        tz.transition 1972, 10, :o0, 89186400
-        tz.transition 1973, 4, :o1, 104914800
-        tz.transition 1973, 10, :o0, 120636000
-        tz.transition 1974, 1, :o1, 126687600
-        tz.transition 1974, 10, :o0, 152085600
-        tz.transition 1975, 2, :o1, 162370800
-        tz.transition 1975, 10, :o0, 183535200
-        tz.transition 1976, 4, :o1, 199263600
-        tz.transition 1976, 10, :o0, 215589600
-        tz.transition 1977, 4, :o1, 230713200
-        tz.transition 1977, 10, :o0, 247039200
-        tz.transition 1978, 4, :o1, 262767600
-        tz.transition 1978, 10, :o0, 278488800
-        tz.transition 1979, 4, :o1, 294217200
-        tz.transition 1979, 10, :o0, 309938400
-        tz.transition 1980, 4, :o1, 325666800
-        tz.transition 1980, 10, :o0, 341388000
-        tz.transition 1981, 4, :o1, 357116400
-        tz.transition 1981, 10, :o0, 372837600
-        tz.transition 1982, 4, :o1, 388566000
-        tz.transition 1982, 10, :o0, 404892000
-        tz.transition 1983, 4, :o1, 420015600
-        tz.transition 1983, 10, :o0, 436341600
-        tz.transition 1984, 4, :o1, 452070000
-        tz.transition 1984, 10, :o0, 467791200
-        tz.transition 1985, 4, :o1, 483519600
-        tz.transition 1985, 10, :o0, 499240800
-        tz.transition 1986, 4, :o1, 514969200
-        tz.transition 1986, 10, :o0, 530690400
-        tz.transition 1987, 4, :o1, 544604400
-        tz.transition 1987, 10, :o0, 562140000
-        tz.transition 1988, 4, :o1, 576054000
-        tz.transition 1988, 10, :o0, 594194400
-        tz.transition 1989, 4, :o1, 607503600
-        tz.transition 1989, 10, :o0, 625644000
-        tz.transition 1990, 4, :o1, 638953200
-        tz.transition 1990, 10, :o0, 657093600
-        tz.transition 1991, 4, :o1, 671007600
-        tz.transition 1991, 10, :o0, 688543200
-        tz.transition 1992, 4, :o1, 702457200
-        tz.transition 1992, 10, :o0, 719992800
-        tz.transition 1993, 4, :o1, 733906800
-        tz.transition 1993, 10, :o0, 752047200
-        tz.transition 1994, 4, :o1, 765356400
-        tz.transition 1994, 10, :o0, 783496800
-        tz.transition 1995, 4, :o1, 796806000
-        tz.transition 1995, 10, :o0, 814946400
-        tz.transition 1996, 4, :o1, 828860400
-        tz.transition 1996, 10, :o0, 846396000
-        tz.transition 1997, 4, :o1, 860310000
-        tz.transition 1997, 10, :o0, 877845600
-        tz.transition 1998, 4, :o1, 891759600
-        tz.transition 1998, 10, :o0, 909295200
-        tz.transition 1999, 4, :o1, 923209200
-        tz.transition 1999, 10, :o0, 941349600
-        tz.transition 2000, 4, :o1, 954658800
-        tz.transition 2000, 10, :o0, 972799200
-        tz.transition 2001, 4, :o1, 986108400
-        tz.transition 2001, 10, :o0, 1004248800
-        tz.transition 2002, 4, :o1, 1018162800
-        tz.transition 2002, 10, :o0, 1035698400
-        tz.transition 2003, 4, :o1, 1049612400
-        tz.transition 2003, 10, :o0, 1067148000
-        tz.transition 2004, 4, :o1, 1081062000
-        tz.transition 2004, 10, :o0, 1099202400
-        tz.transition 2005, 4, :o1, 1112511600
-        tz.transition 2005, 10, :o0, 1130652000
-        tz.transition 2006, 4, :o1, 1143961200
-        tz.transition 2006, 10, :o0, 1162101600
-        tz.transition 2007, 3, :o1, 1173596400
-        tz.transition 2007, 11, :o0, 1194156000
-        tz.transition 2008, 3, :o1, 1205046000
-        tz.transition 2008, 11, :o0, 1225605600
-        tz.transition 2009, 3, :o1, 1236495600
-        tz.transition 2009, 11, :o0, 1257055200
-        tz.transition 2010, 3, :o1, 1268550000
-        tz.transition 2010, 11, :o0, 1289109600
-        tz.transition 2011, 3, :o1, 1299999600
-        tz.transition 2011, 11, :o0, 1320559200
-        tz.transition 2012, 3, :o1, 1331449200
-        tz.transition 2012, 11, :o0, 1352008800
-        tz.transition 2013, 3, :o1, 1362898800
-        tz.transition 2013, 11, :o0, 1383458400
-        tz.transition 2014, 3, :o1, 1394348400
-        tz.transition 2014, 11, :o0, 1414908000
-        tz.transition 2015, 3, :o1, 1425798000
-        tz.transition 2015, 11, :o0, 1446357600
-        tz.transition 2016, 3, :o1, 1457852400
-        tz.transition 2016, 11, :o0, 1478412000
-        tz.transition 2017, 3, :o1, 1489302000
-        tz.transition 2017, 11, :o0, 1509861600
-        tz.transition 2018, 3, :o1, 1520751600
-        tz.transition 2018, 11, :o0, 1541311200
-        tz.transition 2019, 3, :o1, 1552201200
-        tz.transition 2019, 11, :o0, 1572760800
-        tz.transition 2020, 3, :o1, 1583650800
-        tz.transition 2020, 11, :o0, 1604210400
-        tz.transition 2021, 3, :o1, 1615705200
-        tz.transition 2021, 11, :o0, 1636264800
-        tz.transition 2022, 3, :o1, 1647154800
-        tz.transition 2022, 11, :o0, 1667714400
-        tz.transition 2023, 3, :o1, 1678604400
-        tz.transition 2023, 11, :o0, 1699164000
-        tz.transition 2024, 3, :o1, 1710054000
-        tz.transition 2024, 11, :o0, 1730613600
-        tz.transition 2025, 3, :o1, 1741503600
-        tz.transition 2025, 11, :o0, 1762063200
-        tz.transition 2026, 3, :o1, 1772953200
-        tz.transition 2026, 11, :o0, 1793512800
-        tz.transition 2027, 3, :o1, 1805007600
-        tz.transition 2027, 11, :o0, 1825567200
-        tz.transition 2028, 3, :o1, 1836457200
-        tz.transition 2028, 11, :o0, 1857016800
-        tz.transition 2029, 3, :o1, 1867906800
-        tz.transition 2029, 11, :o0, 1888466400
-        tz.transition 2030, 3, :o1, 1899356400
-        tz.transition 2030, 11, :o0, 1919916000
-        tz.transition 2031, 3, :o1, 1930806000
-        tz.transition 2031, 11, :o0, 1951365600
-        tz.transition 2032, 3, :o1, 1962860400
-        tz.transition 2032, 11, :o0, 1983420000
-        tz.transition 2033, 3, :o1, 1994310000
-        tz.transition 2033, 11, :o0, 2014869600
-        tz.transition 2034, 3, :o1, 2025759600
-        tz.transition 2034, 11, :o0, 2046319200
-        tz.transition 2035, 3, :o1, 2057209200
-        tz.transition 2035, 11, :o0, 2077768800
-        tz.transition 2036, 3, :o1, 2088658800
-        tz.transition 2036, 11, :o0, 2109218400
-        tz.transition 2037, 3, :o1, 2120108400
-        tz.transition 2037, 11, :o0, 2140668000
-        tz.transition 2038, 3, :o1, 59171923, 24
-        tz.transition 2038, 11, :o0, 9862939, 4
-        tz.transition 2039, 3, :o1, 59180659, 24
-        tz.transition 2039, 11, :o0, 9864395, 4
-        tz.transition 2040, 3, :o1, 59189395, 24
-        tz.transition 2040, 11, :o0, 9865851, 4
-        tz.transition 2041, 3, :o1, 59198131, 24
-        tz.transition 2041, 11, :o0, 9867307, 4
-        tz.transition 2042, 3, :o1, 59206867, 24
-        tz.transition 2042, 11, :o0, 9868763, 4
-        tz.transition 2043, 3, :o1, 59215603, 24
-        tz.transition 2043, 11, :o0, 9870219, 4
-        tz.transition 2044, 3, :o1, 59224507, 24
-        tz.transition 2044, 11, :o0, 9871703, 4
-        tz.transition 2045, 3, :o1, 59233243, 24
-        tz.transition 2045, 11, :o0, 9873159, 4
-        tz.transition 2046, 3, :o1, 59241979, 24
-        tz.transition 2046, 11, :o0, 9874615, 4
-        tz.transition 2047, 3, :o1, 59250715, 24
-        tz.transition 2047, 11, :o0, 9876071, 4
-        tz.transition 2048, 3, :o1, 59259451, 24
-        tz.transition 2048, 11, :o0, 9877527, 4
-        tz.transition 2049, 3, :o1, 59268355, 24
-        tz.transition 2049, 11, :o0, 9879011, 4
-        tz.transition 2050, 3, :o1, 59277091, 24
-        tz.transition 2050, 11, :o0, 9880467, 4
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Egypt.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Egypt.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Egypt.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Egypt.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Egypt
-      include TimezoneDefinition
-      
-      linked_timezone 'Egypt', 'Africa/Cairo'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Eire.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Eire.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Eire.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Eire.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Eire
-      include TimezoneDefinition
-      
-      linked_timezone 'Eire', 'Europe/Dublin'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT' do |tz|
-          tz.offset :o0, 0, 0, :GMT
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT0.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT0.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT0.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT0.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT0
-        include TimezoneDefinition
-        
-        linked_timezone 'Etc/GMT0', 'Etc/GMT'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__0.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__0.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__0.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__0.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__0
-        include TimezoneDefinition
-        
-        linked_timezone 'Etc/GMT-0', 'Etc/GMT'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__1.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__1.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__1.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__1.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__1
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-1' do |tz|
-          tz.offset :o0, 3600, 0, :'GMT-1'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__10.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__10.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__10.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__10.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__10
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-10' do |tz|
-          tz.offset :o0, 36000, 0, :'GMT-10'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__11.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__11.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__11.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__11.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__11
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-11' do |tz|
-          tz.offset :o0, 39600, 0, :'GMT-11'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__12.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__12.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__12.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__12.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__12
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-12' do |tz|
-          tz.offset :o0, 43200, 0, :'GMT-12'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__13.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__13.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__13.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__13.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__13
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-13' do |tz|
-          tz.offset :o0, 46800, 0, :'GMT-13'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__14.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__14.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__14.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__14.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__14
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-14' do |tz|
-          tz.offset :o0, 50400, 0, :'GMT-14'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__2.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__2.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__2.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__2.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__2
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-2' do |tz|
-          tz.offset :o0, 7200, 0, :'GMT-2'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__3.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__3.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__3.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__3.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__3
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-3' do |tz|
-          tz.offset :o0, 10800, 0, :'GMT-3'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__4.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__4.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__4.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__4.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__4
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-4' do |tz|
-          tz.offset :o0, 14400, 0, :'GMT-4'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__5.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__5.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__5.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__5.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__5
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-5' do |tz|
-          tz.offset :o0, 18000, 0, :'GMT-5'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__6.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__6.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__6.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__6.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__6
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-6' do |tz|
-          tz.offset :o0, 21600, 0, :'GMT-6'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__7.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__7.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__7.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__7.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__7
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-7' do |tz|
-          tz.offset :o0, 25200, 0, :'GMT-7'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__8.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__8.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__8.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__8.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__8
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-8' do |tz|
-          tz.offset :o0, 28800, 0, :'GMT-8'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__9.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__9.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__9.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__m__9.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__m__9
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT-9' do |tz|
-          tz.offset :o0, 32400, 0, :'GMT-9'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__0.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__0.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__0.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__0.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__0
-        include TimezoneDefinition
-        
-        linked_timezone 'Etc/GMT+0', 'Etc/GMT'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__1.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__1.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__1.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__1.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__1
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+1' do |tz|
-          tz.offset :o0, -3600, 0, :'GMT+1'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__10.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__10.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__10.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__10.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__10
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+10' do |tz|
-          tz.offset :o0, -36000, 0, :'GMT+10'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__11.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__11.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__11.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__11.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__11
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+11' do |tz|
-          tz.offset :o0, -39600, 0, :'GMT+11'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__12.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__12.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__12.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__12.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__12
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+12' do |tz|
-          tz.offset :o0, -43200, 0, :'GMT+12'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__2.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__2.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__2.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__2.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__2
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+2' do |tz|
-          tz.offset :o0, -7200, 0, :'GMT+2'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__3.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__3.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__3.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__3.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__3
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+3' do |tz|
-          tz.offset :o0, -10800, 0, :'GMT+3'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__4.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__4.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__4.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__4.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__4
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+4' do |tz|
-          tz.offset :o0, -14400, 0, :'GMT+4'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__5.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__5.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__5.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__5.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__5
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+5' do |tz|
-          tz.offset :o0, -18000, 0, :'GMT+5'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__6.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__6.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__6.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__6.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__6
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+6' do |tz|
-          tz.offset :o0, -21600, 0, :'GMT+6'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__7.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__7.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__7.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__7.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__7
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+7' do |tz|
-          tz.offset :o0, -25200, 0, :'GMT+7'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__8.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__8.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__8.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__8.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__8
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+8' do |tz|
-          tz.offset :o0, -28800, 0, :'GMT+8'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__9.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__9.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__9.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/GMT__p__9.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module GMT__p__9
-        include TimezoneDefinition
-        
-        timezone 'Etc/GMT+9' do |tz|
-          tz.offset :o0, -32400, 0, :'GMT+9'
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Greenwich.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Greenwich.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Greenwich.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Greenwich.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module Greenwich
-        include TimezoneDefinition
-        
-        linked_timezone 'Etc/Greenwich', 'Etc/GMT'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UCT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UCT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UCT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UCT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module UCT
-        include TimezoneDefinition
-        
-        timezone 'Etc/UCT' do |tz|
-          tz.offset :o0, 0, 0, :UCT
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UTC.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UTC.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UTC.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/UTC.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module UTC
-        include TimezoneDefinition
-        
-        timezone 'Etc/UTC' do |tz|
-          tz.offset :o0, 0, 0, :UTC
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Universal.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Universal.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Universal.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Universal.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module Universal
-        include TimezoneDefinition
-        
-        linked_timezone 'Etc/Universal', 'Etc/UTC'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Zulu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Zulu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Zulu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Etc/Zulu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module Zulu
-        include TimezoneDefinition
-        
-        linked_timezone 'Etc/Zulu', 'Etc/UTC'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Amsterdam.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Amsterdam.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Amsterdam.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Amsterdam.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,228 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Amsterdam
-        include TimezoneDefinition
-        
-        timezone 'Europe/Amsterdam' do |tz|
-          tz.offset :o0, 1172, 0, :LMT
-          tz.offset :o1, 1172, 0, :AMT
-          tz.offset :o2, 1172, 3600, :NST
-          tz.offset :o3, 1200, 3600, :NEST
-          tz.offset :o4, 1200, 0, :NET
-          tz.offset :o5, 3600, 3600, :CEST
-          tz.offset :o6, 3600, 0, :CET
-          
-          tz.transition 1834, 12, :o1, 51651636907, 21600
-          tz.transition 1916, 4, :o2, 52293264907, 21600
-          tz.transition 1916, 9, :o1, 52296568807, 21600
-          tz.transition 1917, 4, :o2, 52300826707, 21600
-          tz.transition 1917, 9, :o1, 52304153107, 21600
-          tz.transition 1918, 4, :o2, 52308386707, 21600
-          tz.transition 1918, 9, :o1, 52312317907, 21600
-          tz.transition 1919, 4, :o2, 52316400307, 21600
-          tz.transition 1919, 9, :o1, 52320180307, 21600
-          tz.transition 1920, 4, :o2, 52324262707, 21600
-          tz.transition 1920, 9, :o1, 52328042707, 21600
-          tz.transition 1921, 4, :o2, 52332125107, 21600
-          tz.transition 1921, 9, :o1, 52335905107, 21600
-          tz.transition 1922, 3, :o2, 52339814707, 21600
-          tz.transition 1922, 10, :o1, 52344048307, 21600
-          tz.transition 1923, 6, :o2, 52349145907, 21600
-          tz.transition 1923, 10, :o1, 52351910707, 21600
-          tz.transition 1924, 3, :o2, 52355690707, 21600
-          tz.transition 1924, 10, :o1, 52359773107, 21600
-          tz.transition 1925, 6, :o2, 52365021907, 21600
-          tz.transition 1925, 10, :o1, 52367635507, 21600
-          tz.transition 1926, 5, :o2, 52372452307, 21600
-          tz.transition 1926, 10, :o1, 52375497907, 21600
-          tz.transition 1927, 5, :o2, 52380336307, 21600
-          tz.transition 1927, 10, :o1, 52383360307, 21600
-          tz.transition 1928, 5, :o2, 52388241907, 21600
-          tz.transition 1928, 10, :o1, 52391373907, 21600
-          tz.transition 1929, 5, :o2, 52396125907, 21600
-          tz.transition 1929, 10, :o1, 52399236307, 21600
-          tz.transition 1930, 5, :o2, 52404009907, 21600
-          tz.transition 1930, 10, :o1, 52407098707, 21600
-          tz.transition 1931, 5, :o2, 52411893907, 21600
-          tz.transition 1931, 10, :o1, 52414961107, 21600
-          tz.transition 1932, 5, :o2, 52419950707, 21600
-          tz.transition 1932, 10, :o1, 52422823507, 21600
-          tz.transition 1933, 5, :o2, 52427683507, 21600
-          tz.transition 1933, 10, :o1, 52430837107, 21600
-          tz.transition 1934, 5, :o2, 52435567507, 21600
-          tz.transition 1934, 10, :o1, 52438699507, 21600
-          tz.transition 1935, 5, :o2, 52443451507, 21600
-          tz.transition 1935, 10, :o1, 52446561907, 21600
-          tz.transition 1936, 5, :o2, 52451357107, 21600
-          tz.transition 1936, 10, :o1, 52454424307, 21600
-          tz.transition 1937, 5, :o2, 52459392307, 21600
-          tz.transition 1937, 6, :o3, 52460253607, 21600
-          tz.transition 1937, 10, :o4, 174874289, 72
-          tz.transition 1938, 5, :o3, 174890417, 72
-          tz.transition 1938, 10, :o4, 174900497, 72
-          tz.transition 1939, 5, :o3, 174916697, 72
-          tz.transition 1939, 10, :o4, 174927209, 72
-          tz.transition 1940, 5, :o5, 174943115, 72
-          tz.transition 1942, 11, :o6, 58335973, 24
-          tz.transition 1943, 3, :o5, 58339501, 24
-          tz.transition 1943, 10, :o6, 58344037, 24
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 10, :o6, 58352773, 24
-          tz.transition 1945, 4, :o5, 58357141, 24
-          tz.transition 1945, 9, :o6, 58361149, 24
-          tz.transition 1977, 4, :o5, 228877200
-          tz.transition 1977, 9, :o6, 243997200
-          tz.transition 1978, 4, :o5, 260326800
-          tz.transition 1978, 10, :o6, 276051600
-          tz.transition 1979, 4, :o5, 291776400
-          tz.transition 1979, 9, :o6, 307501200
-          tz.transition 1980, 4, :o5, 323830800
-          tz.transition 1980, 9, :o6, 338950800
-          tz.transition 1981, 3, :o5, 354675600
-          tz.transition 1981, 9, :o6, 370400400
-          tz.transition 1982, 3, :o5, 386125200
-          tz.transition 1982, 9, :o6, 401850000
-          tz.transition 1983, 3, :o5, 417574800
-          tz.transition 1983, 9, :o6, 433299600
-          tz.transition 1984, 3, :o5, 449024400
-          tz.transition 1984, 9, :o6, 465354000
-          tz.transition 1985, 3, :o5, 481078800
-          tz.transition 1985, 9, :o6, 496803600
-          tz.transition 1986, 3, :o5, 512528400
-          tz.transition 1986, 9, :o6, 528253200
-          tz.transition 1987, 3, :o5, 543978000
-          tz.transition 1987, 9, :o6, 559702800
-          tz.transition 1988, 3, :o5, 575427600
-          tz.transition 1988, 9, :o6, 591152400
-          tz.transition 1989, 3, :o5, 606877200
-          tz.transition 1989, 9, :o6, 622602000
-          tz.transition 1990, 3, :o5, 638326800
-          tz.transition 1990, 9, :o6, 654656400
-          tz.transition 1991, 3, :o5, 670381200
-          tz.transition 1991, 9, :o6, 686106000
-          tz.transition 1992, 3, :o5, 701830800
-          tz.transition 1992, 9, :o6, 717555600
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 9, :o6, 749005200
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 9, :o6, 780454800
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 9, :o6, 811904400
-          tz.transition 1996, 3, :o5, 828234000
-          tz.transition 1996, 10, :o6, 846378000
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o6, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o6, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o6, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o6, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o6, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o6, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o6, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o6, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o6, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o6, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o6, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o6, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o6, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o6, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o6, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o6, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o6, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o6, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o6, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o6, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o6, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o6, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o6, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o6, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o6, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o6, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o6, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o6, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o6, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o6, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o6, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o6, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o6, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o6, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o6, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o6, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o6, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o6, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o6, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o6, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o6, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o6, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o6, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o6, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o6, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o6, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o6, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o6, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o6, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o6, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o6, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o6, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o6, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o6, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Andorra.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Andorra.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Andorra.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Andorra.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,153 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Andorra
-        include TimezoneDefinition
-        
-        timezone 'Europe/Andorra' do |tz|
-          tz.offset :o0, 364, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1900, 12, :o1, 52172326709, 21600
-          tz.transition 1946, 9, :o2, 4864187, 2
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Athens.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Athens.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Athens.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Athens.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Athens
-        include TimezoneDefinition
-        
-        timezone 'Europe/Athens' do |tz|
-          tz.offset :o0, 5692, 0, :LMT
-          tz.offset :o1, 5692, 0, :AMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          
-          tz.transition 1895, 9, :o1, 52130529377, 21600
-          tz.transition 1916, 7, :o2, 3268447787, 1350
-          tz.transition 1932, 7, :o3, 29122745, 12
-          tz.transition 1932, 8, :o2, 19415611, 8
-          tz.transition 1941, 4, :o3, 29161097, 12
-          tz.transition 1941, 4, :o4, 19440915, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339523, 24
-          tz.transition 1943, 10, :o5, 29172017, 12
-          tz.transition 1944, 4, :o2, 58348427, 24
-          tz.transition 1952, 6, :o3, 29210333, 12
-          tz.transition 1952, 11, :o2, 19474547, 8
-          tz.transition 1975, 4, :o3, 166485600
-          tz.transition 1975, 11, :o2, 186184800
-          tz.transition 1976, 4, :o3, 198028800
-          tz.transition 1976, 10, :o2, 213753600
-          tz.transition 1977, 4, :o3, 228873600
-          tz.transition 1977, 9, :o2, 244080000
-          tz.transition 1978, 4, :o3, 260323200
-          tz.transition 1978, 9, :o2, 275446800
-          tz.transition 1979, 4, :o3, 291798000
-          tz.transition 1979, 9, :o2, 307407600
-          tz.transition 1980, 3, :o3, 323388000
-          tz.transition 1980, 9, :o2, 338936400
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belfast.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belfast.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belfast.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belfast.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Belfast
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Belfast', 'Europe/London'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belgrade.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belgrade.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belgrade.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Belgrade.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Belgrade
-        include TimezoneDefinition
-        
-        timezone 'Europe/Belgrade' do |tz|
-          tz.offset :o0, 4920, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1883, 12, :o1, 1734607039, 720
-          tz.transition 1941, 4, :o2, 29161241, 12
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 5, :o2, 58358005, 24
-          tz.transition 1945, 9, :o1, 58361149, 24
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Berlin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Berlin.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Berlin.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Berlin.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,188 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Berlin
-        include TimezoneDefinition
-        
-        timezone 'Europe/Berlin' do |tz|
-          tz.offset :o0, 3208, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          tz.offset :o3, 3600, 7200, :CEMT
-          
-          tz.transition 1893, 3, :o1, 26055588199, 10800
-          tz.transition 1916, 4, :o2, 29051813, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 58112029, 24
-          tz.transition 1917, 9, :o1, 58115725, 24
-          tz.transition 1918, 4, :o2, 58120765, 24
-          tz.transition 1918, 9, :o1, 58124461, 24
-          tz.transition 1940, 4, :o2, 58313293, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 4, :o2, 58357141, 24
-          tz.transition 1945, 5, :o3, 4863199, 2
-          tz.transition 1945, 9, :o2, 4863445, 2
-          tz.transition 1945, 11, :o1, 58362661, 24
-          tz.transition 1946, 4, :o2, 58366189, 24
-          tz.transition 1946, 10, :o1, 58370413, 24
-          tz.transition 1947, 4, :o2, 58374757, 24
-          tz.transition 1947, 5, :o3, 58375597, 24
-          tz.transition 1947, 6, :o2, 4864731, 2
-          tz.transition 1947, 10, :o1, 58379125, 24
-          tz.transition 1948, 4, :o2, 58383829, 24
-          tz.transition 1948, 10, :o1, 58387861, 24
-          tz.transition 1949, 4, :o2, 58392397, 24
-          tz.transition 1949, 10, :o1, 58396597, 24
-          tz.transition 1980, 4, :o2, 323830800
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bratislava.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bratislava.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bratislava.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bratislava.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Bratislava
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Bratislava', 'Europe/Prague'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Brussels.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Brussels.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Brussels.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Brussels.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,232 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Brussels
-        include TimezoneDefinition
-        
-        timezone 'Europe/Brussels' do |tz|
-          tz.offset :o0, 1050, 0, :LMT
-          tz.offset :o1, 1050, 0, :BMT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 3600, 0, :CET
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 0, 3600, :WEST
-          
-          tz.transition 1879, 12, :o1, 1386844121, 576
-          tz.transition 1892, 5, :o2, 1389438713, 576
-          tz.transition 1914, 11, :o3, 4840889, 2
-          tz.transition 1916, 4, :o4, 58103627, 24
-          tz.transition 1916, 9, :o3, 58107299, 24
-          tz.transition 1917, 4, :o4, 58112029, 24
-          tz.transition 1917, 9, :o3, 58115725, 24
-          tz.transition 1918, 4, :o4, 58120765, 24
-          tz.transition 1918, 9, :o3, 58124461, 24
-          tz.transition 1918, 11, :o2, 58125815, 24
-          tz.transition 1919, 3, :o5, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133675, 24
-          tz.transition 1920, 2, :o5, 58136867, 24
-          tz.transition 1920, 10, :o2, 58142915, 24
-          tz.transition 1921, 3, :o5, 58146323, 24
-          tz.transition 1921, 10, :o2, 58151723, 24
-          tz.transition 1922, 3, :o5, 58155347, 24
-          tz.transition 1922, 10, :o2, 58160051, 24
-          tz.transition 1923, 4, :o5, 58164755, 24
-          tz.transition 1923, 10, :o2, 58168787, 24
-          tz.transition 1924, 3, :o5, 58172987, 24
-          tz.transition 1924, 10, :o2, 58177523, 24
-          tz.transition 1925, 4, :o5, 58181891, 24
-          tz.transition 1925, 10, :o2, 58186259, 24
-          tz.transition 1926, 4, :o5, 58190963, 24
-          tz.transition 1926, 10, :o2, 58194995, 24
-          tz.transition 1927, 4, :o5, 58199531, 24
-          tz.transition 1927, 10, :o2, 58203731, 24
-          tz.transition 1928, 4, :o5, 58208435, 24
-          tz.transition 1928, 10, :o2, 29106319, 12
-          tz.transition 1929, 4, :o5, 29108671, 12
-          tz.transition 1929, 10, :o2, 29110687, 12
-          tz.transition 1930, 4, :o5, 29112955, 12
-          tz.transition 1930, 10, :o2, 29115055, 12
-          tz.transition 1931, 4, :o5, 29117407, 12
-          tz.transition 1931, 10, :o2, 29119423, 12
-          tz.transition 1932, 4, :o5, 29121607, 12
-          tz.transition 1932, 10, :o2, 29123791, 12
-          tz.transition 1933, 3, :o5, 29125891, 12
-          tz.transition 1933, 10, :o2, 29128243, 12
-          tz.transition 1934, 4, :o5, 29130427, 12
-          tz.transition 1934, 10, :o2, 29132611, 12
-          tz.transition 1935, 3, :o5, 29134711, 12
-          tz.transition 1935, 10, :o2, 29136979, 12
-          tz.transition 1936, 4, :o5, 29139331, 12
-          tz.transition 1936, 10, :o2, 29141347, 12
-          tz.transition 1937, 4, :o5, 29143531, 12
-          tz.transition 1937, 10, :o2, 29145715, 12
-          tz.transition 1938, 3, :o5, 29147815, 12
-          tz.transition 1938, 10, :o2, 29150083, 12
-          tz.transition 1939, 4, :o5, 29152435, 12
-          tz.transition 1939, 11, :o2, 29155039, 12
-          tz.transition 1940, 2, :o5, 29156215, 12
-          tz.transition 1940, 5, :o4, 29157235, 12
-          tz.transition 1942, 11, :o3, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o3, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 9, :o3, 58352413, 24
-          tz.transition 1945, 4, :o4, 58357141, 24
-          tz.transition 1945, 9, :o3, 58361149, 24
-          tz.transition 1946, 5, :o4, 58367029, 24
-          tz.transition 1946, 10, :o3, 58370413, 24
-          tz.transition 1977, 4, :o4, 228877200
-          tz.transition 1977, 9, :o3, 243997200
-          tz.transition 1978, 4, :o4, 260326800
-          tz.transition 1978, 10, :o3, 276051600
-          tz.transition 1979, 4, :o4, 291776400
-          tz.transition 1979, 9, :o3, 307501200
-          tz.transition 1980, 4, :o4, 323830800
-          tz.transition 1980, 9, :o3, 338950800
-          tz.transition 1981, 3, :o4, 354675600
-          tz.transition 1981, 9, :o3, 370400400
-          tz.transition 1982, 3, :o4, 386125200
-          tz.transition 1982, 9, :o3, 401850000
-          tz.transition 1983, 3, :o4, 417574800
-          tz.transition 1983, 9, :o3, 433299600
-          tz.transition 1984, 3, :o4, 449024400
-          tz.transition 1984, 9, :o3, 465354000
-          tz.transition 1985, 3, :o4, 481078800
-          tz.transition 1985, 9, :o3, 496803600
-          tz.transition 1986, 3, :o4, 512528400
-          tz.transition 1986, 9, :o3, 528253200
-          tz.transition 1987, 3, :o4, 543978000
-          tz.transition 1987, 9, :o3, 559702800
-          tz.transition 1988, 3, :o4, 575427600
-          tz.transition 1988, 9, :o3, 591152400
-          tz.transition 1989, 3, :o4, 606877200
-          tz.transition 1989, 9, :o3, 622602000
-          tz.transition 1990, 3, :o4, 638326800
-          tz.transition 1990, 9, :o3, 654656400
-          tz.transition 1991, 3, :o4, 670381200
-          tz.transition 1991, 9, :o3, 686106000
-          tz.transition 1992, 3, :o4, 701830800
-          tz.transition 1992, 9, :o3, 717555600
-          tz.transition 1993, 3, :o4, 733280400
-          tz.transition 1993, 9, :o3, 749005200
-          tz.transition 1994, 3, :o4, 764730000
-          tz.transition 1994, 9, :o3, 780454800
-          tz.transition 1995, 3, :o4, 796179600
-          tz.transition 1995, 9, :o3, 811904400
-          tz.transition 1996, 3, :o4, 828234000
-          tz.transition 1996, 10, :o3, 846378000
-          tz.transition 1997, 3, :o4, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o4, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o4, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2000, 3, :o4, 954032400
-          tz.transition 2000, 10, :o3, 972781200
-          tz.transition 2001, 3, :o4, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o4, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o4, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o4, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o4, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o4, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o4, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o4, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o4, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o4, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o4, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o4, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o4, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o4, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o4, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o4, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o4, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o4, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o4, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o4, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o4, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o4, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o4, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o4, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o4, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o4, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o4, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o4, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o4, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o4, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o4, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o4, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o4, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o4, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o4, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o4, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o4, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o4, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o4, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o4, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o4, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o4, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o4, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o4, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o4, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o4, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o4, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o4, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o4, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o4, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bucharest.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bucharest.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bucharest.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Bucharest.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,181 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Bucharest
-        include TimezoneDefinition
-        
-        timezone 'Europe/Bucharest' do |tz|
-          tz.offset :o0, 6264, 0, :LMT
-          tz.offset :o1, 6264, 0, :BMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          
-          tz.transition 1891, 9, :o1, 964802571, 400
-          tz.transition 1931, 7, :o2, 970618571, 400
-          tz.transition 1932, 5, :o3, 29122181, 12
-          tz.transition 1932, 10, :o2, 29123789, 12
-          tz.transition 1933, 4, :o3, 29125973, 12
-          tz.transition 1933, 9, :o2, 29128157, 12
-          tz.transition 1934, 4, :o3, 29130425, 12
-          tz.transition 1934, 10, :o2, 29132609, 12
-          tz.transition 1935, 4, :o3, 29134793, 12
-          tz.transition 1935, 10, :o2, 29136977, 12
-          tz.transition 1936, 4, :o3, 29139161, 12
-          tz.transition 1936, 10, :o2, 29141345, 12
-          tz.transition 1937, 4, :o3, 29143529, 12
-          tz.transition 1937, 10, :o2, 29145713, 12
-          tz.transition 1938, 4, :o3, 29147897, 12
-          tz.transition 1938, 10, :o2, 29150081, 12
-          tz.transition 1939, 4, :o3, 29152265, 12
-          tz.transition 1939, 9, :o2, 29154449, 12
-          tz.transition 1979, 5, :o3, 296604000
-          tz.transition 1979, 9, :o2, 307486800
-          tz.transition 1980, 4, :o3, 323816400
-          tz.transition 1980, 9, :o2, 338940000
-          tz.transition 1981, 3, :o3, 354672000
-          tz.transition 1981, 9, :o2, 370396800
-          tz.transition 1982, 3, :o3, 386121600
-          tz.transition 1982, 9, :o2, 401846400
-          tz.transition 1983, 3, :o3, 417571200
-          tz.transition 1983, 9, :o2, 433296000
-          tz.transition 1984, 3, :o3, 449020800
-          tz.transition 1984, 9, :o2, 465350400
-          tz.transition 1985, 3, :o3, 481075200
-          tz.transition 1985, 9, :o2, 496800000
-          tz.transition 1986, 3, :o3, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o3, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o3, 575424000
-          tz.transition 1988, 9, :o2, 591148800
-          tz.transition 1989, 3, :o3, 606873600
-          tz.transition 1989, 9, :o2, 622598400
-          tz.transition 1990, 3, :o3, 638323200
-          tz.transition 1990, 9, :o2, 654652800
-          tz.transition 1991, 3, :o3, 670370400
-          tz.transition 1991, 9, :o2, 686095200
-          tz.transition 1992, 3, :o3, 701820000
-          tz.transition 1992, 9, :o2, 717544800
-          tz.transition 1993, 3, :o3, 733269600
-          tz.transition 1993, 9, :o2, 748994400
-          tz.transition 1994, 3, :o3, 764719200
-          tz.transition 1994, 9, :o2, 780440400
-          tz.transition 1995, 3, :o3, 796168800
-          tz.transition 1995, 9, :o2, 811890000
-          tz.transition 1996, 3, :o3, 828223200
-          tz.transition 1996, 10, :o2, 846363600
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Budapest.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Budapest.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Budapest.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Budapest.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,197 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Budapest
-        include TimezoneDefinition
-        
-        timezone 'Europe/Budapest' do |tz|
-          tz.offset :o0, 4580, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1890, 9, :o1, 10418291051, 4320
-          tz.transition 1916, 4, :o2, 29051813, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 58112029, 24
-          tz.transition 1917, 9, :o1, 58115725, 24
-          tz.transition 1918, 4, :o2, 29060215, 12
-          tz.transition 1918, 9, :o1, 58124773, 24
-          tz.transition 1919, 4, :o2, 29064763, 12
-          tz.transition 1919, 9, :o1, 58133197, 24
-          tz.transition 1920, 4, :o2, 29069035, 12
-          tz.transition 1920, 9, :o1, 58142341, 24
-          tz.transition 1941, 4, :o2, 58322173, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 5, :o2, 29178929, 12
-          tz.transition 1945, 11, :o1, 29181149, 12
-          tz.transition 1946, 3, :o2, 58365853, 24
-          tz.transition 1946, 10, :o1, 58370389, 24
-          tz.transition 1947, 4, :o2, 58374757, 24
-          tz.transition 1947, 10, :o1, 58379125, 24
-          tz.transition 1948, 4, :o2, 58383493, 24
-          tz.transition 1948, 10, :o1, 58387861, 24
-          tz.transition 1949, 4, :o2, 58392397, 24
-          tz.transition 1949, 10, :o1, 58396597, 24
-          tz.transition 1950, 4, :o2, 58401325, 24
-          tz.transition 1950, 10, :o1, 58405861, 24
-          tz.transition 1954, 5, :o2, 58437251, 24
-          tz.transition 1954, 10, :o1, 29220221, 12
-          tz.transition 1955, 5, :o2, 58446011, 24
-          tz.transition 1955, 10, :o1, 29224601, 12
-          tz.transition 1956, 6, :o2, 58455059, 24
-          tz.transition 1956, 9, :o1, 29228957, 12
-          tz.transition 1957, 6, :o2, 4871983, 2
-          tz.transition 1957, 9, :o1, 58466653, 24
-          tz.transition 1980, 4, :o2, 323827200
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Chisinau.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Chisinau.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Chisinau.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Chisinau.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,189 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Chisinau
-        include TimezoneDefinition
-        
-        timezone 'Europe/Chisinau' do |tz|
-          tz.offset :o0, 6920, 0, :LMT
-          tz.offset :o1, 6900, 0, :CMT
-          tz.offset :o2, 6264, 0, :BMT
-          tz.offset :o3, 7200, 0, :EET
-          tz.offset :o4, 7200, 3600, :EEST
-          tz.offset :o5, 3600, 3600, :CEST
-          tz.offset :o6, 3600, 0, :CET
-          tz.offset :o7, 10800, 0, :MSK
-          tz.offset :o8, 10800, 3600, :MSD
-          
-          tz.transition 1879, 12, :o1, 5200665307, 2160
-          tz.transition 1918, 2, :o2, 697432153, 288
-          tz.transition 1931, 7, :o3, 970618571, 400
-          tz.transition 1932, 5, :o4, 29122181, 12
-          tz.transition 1932, 10, :o3, 29123789, 12
-          tz.transition 1933, 4, :o4, 29125973, 12
-          tz.transition 1933, 9, :o3, 29128157, 12
-          tz.transition 1934, 4, :o4, 29130425, 12
-          tz.transition 1934, 10, :o3, 29132609, 12
-          tz.transition 1935, 4, :o4, 29134793, 12
-          tz.transition 1935, 10, :o3, 29136977, 12
-          tz.transition 1936, 4, :o4, 29139161, 12
-          tz.transition 1936, 10, :o3, 29141345, 12
-          tz.transition 1937, 4, :o4, 29143529, 12
-          tz.transition 1937, 10, :o3, 29145713, 12
-          tz.transition 1938, 4, :o4, 29147897, 12
-          tz.transition 1938, 10, :o3, 29150081, 12
-          tz.transition 1939, 4, :o4, 29152265, 12
-          tz.transition 1939, 9, :o3, 29154449, 12
-          tz.transition 1940, 8, :o4, 29158277, 12
-          tz.transition 1941, 7, :o5, 19441539, 8
-          tz.transition 1942, 11, :o6, 58335973, 24
-          tz.transition 1943, 3, :o5, 58339501, 24
-          tz.transition 1943, 10, :o6, 58344037, 24
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 8, :o7, 29175917, 12
-          tz.transition 1981, 3, :o8, 354920400
-          tz.transition 1981, 9, :o7, 370728000
-          tz.transition 1982, 3, :o8, 386456400
-          tz.transition 1982, 9, :o7, 402264000
-          tz.transition 1983, 3, :o8, 417992400
-          tz.transition 1983, 9, :o7, 433800000
-          tz.transition 1984, 3, :o8, 449614800
-          tz.transition 1984, 9, :o7, 465346800
-          tz.transition 1985, 3, :o8, 481071600
-          tz.transition 1985, 9, :o7, 496796400
-          tz.transition 1986, 3, :o8, 512521200
-          tz.transition 1986, 9, :o7, 528246000
-          tz.transition 1987, 3, :o8, 543970800
-          tz.transition 1987, 9, :o7, 559695600
-          tz.transition 1988, 3, :o8, 575420400
-          tz.transition 1988, 9, :o7, 591145200
-          tz.transition 1989, 3, :o8, 606870000
-          tz.transition 1989, 9, :o7, 622594800
-          tz.transition 1990, 5, :o3, 641941200
-          tz.transition 1991, 3, :o4, 670377600
-          tz.transition 1991, 9, :o3, 686102400
-          tz.transition 1992, 3, :o4, 701820000
-          tz.transition 1992, 9, :o3, 717541200
-          tz.transition 1993, 3, :o4, 733269600
-          tz.transition 1993, 9, :o3, 748990800
-          tz.transition 1994, 3, :o4, 764719200
-          tz.transition 1994, 9, :o3, 780440400
-          tz.transition 1995, 3, :o4, 796168800
-          tz.transition 1995, 9, :o3, 811890000
-          tz.transition 1996, 3, :o4, 828223200
-          tz.transition 1996, 10, :o3, 846363600
-          tz.transition 1997, 3, :o4, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o4, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o4, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2000, 3, :o4, 954032400
-          tz.transition 2000, 10, :o3, 972781200
-          tz.transition 2001, 3, :o4, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o4, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o4, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o4, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o4, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o4, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o4, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o4, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o4, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o4, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o4, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o4, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o4, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o4, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o4, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o4, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o4, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o4, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o4, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o4, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o4, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o4, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o4, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o4, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o4, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o4, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o4, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o4, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o4, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o4, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o4, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o4, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o4, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o4, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o4, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o4, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o4, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o4, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o4, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o4, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o4, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o4, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o4, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o4, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o4, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o4, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o4, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o4, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o4, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o4, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Copenhagen.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Copenhagen.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Copenhagen.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Copenhagen.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,179 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Copenhagen
-        include TimezoneDefinition
-        
-        timezone 'Europe/Copenhagen' do |tz|
-          tz.offset :o0, 3020, 0, :LMT
-          tz.offset :o1, 3020, 0, :CMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1889, 12, :o1, 10417111769, 4320
-          tz.transition 1893, 12, :o2, 10423423289, 4320
-          tz.transition 1916, 5, :o3, 29051981, 12
-          tz.transition 1916, 9, :o2, 19369099, 8
-          tz.transition 1940, 5, :o3, 58314347, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 10, :o2, 58352773, 24
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 8, :o2, 58360381, 24
-          tz.transition 1946, 5, :o3, 58366597, 24
-          tz.transition 1946, 9, :o2, 58369549, 24
-          tz.transition 1947, 5, :o3, 58375429, 24
-          tz.transition 1947, 8, :o2, 58377781, 24
-          tz.transition 1948, 5, :o3, 58384333, 24
-          tz.transition 1948, 8, :o2, 58386517, 24
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Dublin.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Dublin.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Dublin.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Dublin.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,276 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Dublin
-        include TimezoneDefinition
-        
-        timezone 'Europe/Dublin' do |tz|
-          tz.offset :o0, -1500, 0, :LMT
-          tz.offset :o1, -1521, 0, :DMT
-          tz.offset :o2, -1521, 3600, :IST
-          tz.offset :o3, 0, 0, :GMT
-          tz.offset :o4, 0, 3600, :BST
-          tz.offset :o5, 0, 3600, :IST
-          tz.offset :o6, 3600, 0, :IST
-          
-          tz.transition 1880, 8, :o1, 693483701, 288
-          tz.transition 1916, 5, :o2, 7747214723, 3200
-          tz.transition 1916, 10, :o3, 7747640323, 3200
-          tz.transition 1917, 4, :o4, 29055919, 12
-          tz.transition 1917, 9, :o3, 29057863, 12
-          tz.transition 1918, 3, :o4, 29060119, 12
-          tz.transition 1918, 9, :o3, 29062399, 12
-          tz.transition 1919, 3, :o4, 29064571, 12
-          tz.transition 1919, 9, :o3, 29066767, 12
-          tz.transition 1920, 3, :o4, 29068939, 12
-          tz.transition 1920, 10, :o3, 29071471, 12
-          tz.transition 1921, 4, :o4, 29073391, 12
-          tz.transition 1921, 10, :o3, 29075587, 12
-          tz.transition 1922, 3, :o5, 29077675, 12
-          tz.transition 1922, 10, :o3, 29080027, 12
-          tz.transition 1923, 4, :o5, 29082379, 12
-          tz.transition 1923, 9, :o3, 29084143, 12
-          tz.transition 1924, 4, :o5, 29086663, 12
-          tz.transition 1924, 9, :o3, 29088595, 12
-          tz.transition 1925, 4, :o5, 29091115, 12
-          tz.transition 1925, 10, :o3, 29093131, 12
-          tz.transition 1926, 4, :o5, 29095483, 12
-          tz.transition 1926, 10, :o3, 29097499, 12
-          tz.transition 1927, 4, :o5, 29099767, 12
-          tz.transition 1927, 10, :o3, 29101867, 12
-          tz.transition 1928, 4, :o5, 29104303, 12
-          tz.transition 1928, 10, :o3, 29106319, 12
-          tz.transition 1929, 4, :o5, 29108671, 12
-          tz.transition 1929, 10, :o3, 29110687, 12
-          tz.transition 1930, 4, :o5, 29112955, 12
-          tz.transition 1930, 10, :o3, 29115055, 12
-          tz.transition 1931, 4, :o5, 29117407, 12
-          tz.transition 1931, 10, :o3, 29119423, 12
-          tz.transition 1932, 4, :o5, 29121775, 12
-          tz.transition 1932, 10, :o3, 29123791, 12
-          tz.transition 1933, 4, :o5, 29126059, 12
-          tz.transition 1933, 10, :o3, 29128243, 12
-          tz.transition 1934, 4, :o5, 29130595, 12
-          tz.transition 1934, 10, :o3, 29132611, 12
-          tz.transition 1935, 4, :o5, 29134879, 12
-          tz.transition 1935, 10, :o3, 29136979, 12
-          tz.transition 1936, 4, :o5, 29139331, 12
-          tz.transition 1936, 10, :o3, 29141347, 12
-          tz.transition 1937, 4, :o5, 29143699, 12
-          tz.transition 1937, 10, :o3, 29145715, 12
-          tz.transition 1938, 4, :o5, 29147983, 12
-          tz.transition 1938, 10, :o3, 29150083, 12
-          tz.transition 1939, 4, :o5, 29152435, 12
-          tz.transition 1939, 11, :o3, 29155039, 12
-          tz.transition 1940, 2, :o5, 29156215, 12
-          tz.transition 1946, 10, :o3, 58370389, 24
-          tz.transition 1947, 3, :o5, 29187127, 12
-          tz.transition 1947, 11, :o3, 58379797, 24
-          tz.transition 1948, 4, :o5, 29191915, 12
-          tz.transition 1948, 10, :o3, 29194267, 12
-          tz.transition 1949, 4, :o5, 29196115, 12
-          tz.transition 1949, 10, :o3, 29198635, 12
-          tz.transition 1950, 4, :o5, 29200651, 12
-          tz.transition 1950, 10, :o3, 29202919, 12
-          tz.transition 1951, 4, :o5, 29205019, 12
-          tz.transition 1951, 10, :o3, 29207287, 12
-          tz.transition 1952, 4, :o5, 29209471, 12
-          tz.transition 1952, 10, :o3, 29211739, 12
-          tz.transition 1953, 4, :o5, 29213839, 12
-          tz.transition 1953, 10, :o3, 29215855, 12
-          tz.transition 1954, 4, :o5, 29218123, 12
-          tz.transition 1954, 10, :o3, 29220223, 12
-          tz.transition 1955, 4, :o5, 29222575, 12
-          tz.transition 1955, 10, :o3, 29224591, 12
-          tz.transition 1956, 4, :o5, 29227027, 12
-          tz.transition 1956, 10, :o3, 29229043, 12
-          tz.transition 1957, 4, :o5, 29231311, 12
-          tz.transition 1957, 10, :o3, 29233411, 12
-          tz.transition 1958, 4, :o5, 29235763, 12
-          tz.transition 1958, 10, :o3, 29237779, 12
-          tz.transition 1959, 4, :o5, 29240131, 12
-          tz.transition 1959, 10, :o3, 29242147, 12
-          tz.transition 1960, 4, :o5, 29244415, 12
-          tz.transition 1960, 10, :o3, 29246515, 12
-          tz.transition 1961, 3, :o5, 29248615, 12
-          tz.transition 1961, 10, :o3, 29251219, 12
-          tz.transition 1962, 3, :o5, 29252983, 12
-          tz.transition 1962, 10, :o3, 29255587, 12
-          tz.transition 1963, 3, :o5, 29257435, 12
-          tz.transition 1963, 10, :o3, 29259955, 12
-          tz.transition 1964, 3, :o5, 29261719, 12
-          tz.transition 1964, 10, :o3, 29264323, 12
-          tz.transition 1965, 3, :o5, 29266087, 12
-          tz.transition 1965, 10, :o3, 29268691, 12
-          tz.transition 1966, 3, :o5, 29270455, 12
-          tz.transition 1966, 10, :o3, 29273059, 12
-          tz.transition 1967, 3, :o5, 29274823, 12
-          tz.transition 1967, 10, :o3, 29277511, 12
-          tz.transition 1968, 2, :o5, 29278855, 12
-          tz.transition 1968, 10, :o6, 58563755, 24
-          tz.transition 1971, 10, :o3, 57722400
-          tz.transition 1972, 3, :o5, 69818400
-          tz.transition 1972, 10, :o3, 89172000
-          tz.transition 1973, 3, :o5, 101268000
-          tz.transition 1973, 10, :o3, 120621600
-          tz.transition 1974, 3, :o5, 132717600
-          tz.transition 1974, 10, :o3, 152071200
-          tz.transition 1975, 3, :o5, 164167200
-          tz.transition 1975, 10, :o3, 183520800
-          tz.transition 1976, 3, :o5, 196221600
-          tz.transition 1976, 10, :o3, 214970400
-          tz.transition 1977, 3, :o5, 227671200
-          tz.transition 1977, 10, :o3, 246420000
-          tz.transition 1978, 3, :o5, 259120800
-          tz.transition 1978, 10, :o3, 278474400
-          tz.transition 1979, 3, :o5, 290570400
-          tz.transition 1979, 10, :o3, 309924000
-          tz.transition 1980, 3, :o5, 322020000
-          tz.transition 1980, 10, :o3, 341373600
-          tz.transition 1981, 3, :o5, 354675600
-          tz.transition 1981, 10, :o3, 372819600
-          tz.transition 1982, 3, :o5, 386125200
-          tz.transition 1982, 10, :o3, 404269200
-          tz.transition 1983, 3, :o5, 417574800
-          tz.transition 1983, 10, :o3, 435718800
-          tz.transition 1984, 3, :o5, 449024400
-          tz.transition 1984, 10, :o3, 467773200
-          tz.transition 1985, 3, :o5, 481078800
-          tz.transition 1985, 10, :o3, 499222800
-          tz.transition 1986, 3, :o5, 512528400
-          tz.transition 1986, 10, :o3, 530672400
-          tz.transition 1987, 3, :o5, 543978000
-          tz.transition 1987, 10, :o3, 562122000
-          tz.transition 1988, 3, :o5, 575427600
-          tz.transition 1988, 10, :o3, 593571600
-          tz.transition 1989, 3, :o5, 606877200
-          tz.transition 1989, 10, :o3, 625626000
-          tz.transition 1990, 3, :o5, 638326800
-          tz.transition 1990, 10, :o3, 657075600
-          tz.transition 1991, 3, :o5, 670381200
-          tz.transition 1991, 10, :o3, 688525200
-          tz.transition 1992, 3, :o5, 701830800
-          tz.transition 1992, 10, :o3, 719974800
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 10, :o3, 751424400
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 10, :o3, 782874000
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 10, :o3, 814323600
-          tz.transition 1996, 3, :o5, 828234000
-          tz.transition 1996, 10, :o3, 846378000
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o3, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Gibraltar.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Gibraltar.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Gibraltar.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Gibraltar.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,245 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Gibraltar
-        include TimezoneDefinition
-        
-        timezone 'Europe/Gibraltar' do |tz|
-          tz.offset :o0, -1284, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, 0, 3600, :BST
-          tz.offset :o3, 0, 7200, :BDST
-          tz.offset :o4, 3600, 0, :CET
-          tz.offset :o5, 3600, 3600, :CEST
-          
-          tz.transition 1880, 8, :o1, 17337092507, 7200
-          tz.transition 1916, 5, :o2, 29052055, 12
-          tz.transition 1916, 10, :o1, 29053651, 12
-          tz.transition 1917, 4, :o2, 29055919, 12
-          tz.transition 1917, 9, :o1, 29057863, 12
-          tz.transition 1918, 3, :o2, 29060119, 12
-          tz.transition 1918, 9, :o1, 29062399, 12
-          tz.transition 1919, 3, :o2, 29064571, 12
-          tz.transition 1919, 9, :o1, 29066767, 12
-          tz.transition 1920, 3, :o2, 29068939, 12
-          tz.transition 1920, 10, :o1, 29071471, 12
-          tz.transition 1921, 4, :o2, 29073391, 12
-          tz.transition 1921, 10, :o1, 29075587, 12
-          tz.transition 1922, 3, :o2, 29077675, 12
-          tz.transition 1922, 10, :o1, 29080027, 12
-          tz.transition 1923, 4, :o2, 29082379, 12
-          tz.transition 1923, 9, :o1, 29084143, 12
-          tz.transition 1924, 4, :o2, 29086663, 12
-          tz.transition 1924, 9, :o1, 29088595, 12
-          tz.transition 1925, 4, :o2, 29091115, 12
-          tz.transition 1925, 10, :o1, 29093131, 12
-          tz.transition 1926, 4, :o2, 29095483, 12
-          tz.transition 1926, 10, :o1, 29097499, 12
-          tz.transition 1927, 4, :o2, 29099767, 12
-          tz.transition 1927, 10, :o1, 29101867, 12
-          tz.transition 1928, 4, :o2, 29104303, 12
-          tz.transition 1928, 10, :o1, 29106319, 12
-          tz.transition 1929, 4, :o2, 29108671, 12
-          tz.transition 1929, 10, :o1, 29110687, 12
-          tz.transition 1930, 4, :o2, 29112955, 12
-          tz.transition 1930, 10, :o1, 29115055, 12
-          tz.transition 1931, 4, :o2, 29117407, 12
-          tz.transition 1931, 10, :o1, 29119423, 12
-          tz.transition 1932, 4, :o2, 29121775, 12
-          tz.transition 1932, 10, :o1, 29123791, 12
-          tz.transition 1933, 4, :o2, 29126059, 12
-          tz.transition 1933, 10, :o1, 29128243, 12
-          tz.transition 1934, 4, :o2, 29130595, 12
-          tz.transition 1934, 10, :o1, 29132611, 12
-          tz.transition 1935, 4, :o2, 29134879, 12
-          tz.transition 1935, 10, :o1, 29136979, 12
-          tz.transition 1936, 4, :o2, 29139331, 12
-          tz.transition 1936, 10, :o1, 29141347, 12
-          tz.transition 1937, 4, :o2, 29143699, 12
-          tz.transition 1937, 10, :o1, 29145715, 12
-          tz.transition 1938, 4, :o2, 29147983, 12
-          tz.transition 1938, 10, :o1, 29150083, 12
-          tz.transition 1939, 4, :o2, 29152435, 12
-          tz.transition 1939, 11, :o1, 29155039, 12
-          tz.transition 1940, 2, :o2, 29156215, 12
-          tz.transition 1941, 5, :o3, 58322845, 24
-          tz.transition 1941, 8, :o2, 58325197, 24
-          tz.transition 1942, 4, :o3, 58330909, 24
-          tz.transition 1942, 8, :o2, 58333933, 24
-          tz.transition 1943, 4, :o3, 58339645, 24
-          tz.transition 1943, 8, :o2, 58342837, 24
-          tz.transition 1944, 4, :o3, 58348381, 24
-          tz.transition 1944, 9, :o2, 58352413, 24
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 7, :o2, 58359637, 24
-          tz.transition 1945, 10, :o1, 29180827, 12
-          tz.transition 1946, 4, :o2, 29183095, 12
-          tz.transition 1946, 10, :o1, 29185195, 12
-          tz.transition 1947, 3, :o2, 29187127, 12
-          tz.transition 1947, 4, :o3, 58374925, 24
-          tz.transition 1947, 8, :o2, 58377781, 24
-          tz.transition 1947, 11, :o1, 29189899, 12
-          tz.transition 1948, 3, :o2, 29191495, 12
-          tz.transition 1948, 10, :o1, 29194267, 12
-          tz.transition 1949, 4, :o2, 29196115, 12
-          tz.transition 1949, 10, :o1, 29198635, 12
-          tz.transition 1950, 4, :o2, 29200651, 12
-          tz.transition 1950, 10, :o1, 29202919, 12
-          tz.transition 1951, 4, :o2, 29205019, 12
-          tz.transition 1951, 10, :o1, 29207287, 12
-          tz.transition 1952, 4, :o2, 29209471, 12
-          tz.transition 1952, 10, :o1, 29211739, 12
-          tz.transition 1953, 4, :o2, 29213839, 12
-          tz.transition 1953, 10, :o1, 29215855, 12
-          tz.transition 1954, 4, :o2, 29218123, 12
-          tz.transition 1954, 10, :o1, 29220223, 12
-          tz.transition 1955, 4, :o2, 29222575, 12
-          tz.transition 1955, 10, :o1, 29224591, 12
-          tz.transition 1956, 4, :o2, 29227027, 12
-          tz.transition 1956, 10, :o1, 29229043, 12
-          tz.transition 1957, 4, :o4, 29231311, 12
-          tz.transition 1982, 3, :o5, 386125200
-          tz.transition 1982, 9, :o4, 401850000
-          tz.transition 1983, 3, :o5, 417574800
-          tz.transition 1983, 9, :o4, 433299600
-          tz.transition 1984, 3, :o5, 449024400
-          tz.transition 1984, 9, :o4, 465354000
-          tz.transition 1985, 3, :o5, 481078800
-          tz.transition 1985, 9, :o4, 496803600
-          tz.transition 1986, 3, :o5, 512528400
-          tz.transition 1986, 9, :o4, 528253200
-          tz.transition 1987, 3, :o5, 543978000
-          tz.transition 1987, 9, :o4, 559702800
-          tz.transition 1988, 3, :o5, 575427600
-          tz.transition 1988, 9, :o4, 591152400
-          tz.transition 1989, 3, :o5, 606877200
-          tz.transition 1989, 9, :o4, 622602000
-          tz.transition 1990, 3, :o5, 638326800
-          tz.transition 1990, 9, :o4, 654656400
-          tz.transition 1991, 3, :o5, 670381200
-          tz.transition 1991, 9, :o4, 686106000
-          tz.transition 1992, 3, :o5, 701830800
-          tz.transition 1992, 9, :o4, 717555600
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 9, :o4, 749005200
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 9, :o4, 780454800
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 9, :o4, 811904400
-          tz.transition 1996, 3, :o5, 828234000
-          tz.transition 1996, 10, :o4, 846378000
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o4, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o4, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o4, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o4, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o4, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Guernsey.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Guernsey.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Guernsey.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Guernsey.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Guernsey
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Guernsey', 'Europe/London'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Helsinki.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Helsinki.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Helsinki.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Helsinki.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Helsinki
-        include TimezoneDefinition
-        
-        timezone 'Europe/Helsinki' do |tz|
-          tz.offset :o0, 5992, 0, :LMT
-          tz.offset :o1, 5992, 0, :HMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          
-          tz.transition 1878, 5, :o1, 25997062651, 10800
-          tz.transition 1921, 4, :o2, 26166352651, 10800
-          tz.transition 1942, 4, :o3, 29165429, 12
-          tz.transition 1942, 10, :o2, 19445083, 8
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Isle_of_Man.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Isle_of_Man.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Isle_of_Man.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Isle_of_Man.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Isle_of_Man
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Isle_of_Man', 'Europe/London'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Istanbul.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Istanbul.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Istanbul.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Istanbul.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,218 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Istanbul
-        include TimezoneDefinition
-        
-        timezone 'Europe/Istanbul' do |tz|
-          tz.offset :o0, 6952, 0, :LMT
-          tz.offset :o1, 7016, 0, :IMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          tz.offset :o4, 10800, 3600, :TRST
-          tz.offset :o5, 10800, 0, :TRT
-          
-          tz.transition 1879, 12, :o1, 26003326531, 10800
-          tz.transition 1910, 9, :o2, 26124610523, 10800
-          tz.transition 1916, 4, :o3, 29051813, 12
-          tz.transition 1916, 9, :o2, 19369099, 8
-          tz.transition 1920, 3, :o3, 29068937, 12
-          tz.transition 1920, 10, :o2, 19380979, 8
-          tz.transition 1921, 4, :o3, 29073389, 12
-          tz.transition 1921, 10, :o2, 19383723, 8
-          tz.transition 1922, 3, :o3, 29077673, 12
-          tz.transition 1922, 10, :o2, 19386683, 8
-          tz.transition 1924, 5, :o3, 29087021, 12
-          tz.transition 1924, 9, :o2, 19392475, 8
-          tz.transition 1925, 4, :o3, 29091257, 12
-          tz.transition 1925, 9, :o2, 19395395, 8
-          tz.transition 1940, 6, :o3, 29157725, 12
-          tz.transition 1940, 10, :o2, 19439259, 8
-          tz.transition 1940, 11, :o3, 29159573, 12
-          tz.transition 1941, 9, :o2, 19442067, 8
-          tz.transition 1942, 3, :o3, 29165405, 12
-          tz.transition 1942, 10, :o2, 19445315, 8
-          tz.transition 1945, 4, :o3, 29178569, 12
-          tz.transition 1945, 10, :o2, 19453891, 8
-          tz.transition 1946, 5, :o3, 29183669, 12
-          tz.transition 1946, 9, :o2, 19456755, 8
-          tz.transition 1947, 4, :o3, 29187545, 12
-          tz.transition 1947, 10, :o2, 19459707, 8
-          tz.transition 1948, 4, :o3, 29191913, 12
-          tz.transition 1948, 10, :o2, 19462619, 8
-          tz.transition 1949, 4, :o3, 29196197, 12
-          tz.transition 1949, 10, :o2, 19465531, 8
-          tz.transition 1950, 4, :o3, 29200685, 12
-          tz.transition 1950, 10, :o2, 19468499, 8
-          tz.transition 1951, 4, :o3, 29205101, 12
-          tz.transition 1951, 10, :o2, 19471419, 8
-          tz.transition 1962, 7, :o3, 29254325, 12
-          tz.transition 1962, 10, :o2, 19503563, 8
-          tz.transition 1964, 5, :o3, 29262365, 12
-          tz.transition 1964, 9, :o2, 19509355, 8
-          tz.transition 1970, 5, :o3, 10533600
-          tz.transition 1970, 10, :o2, 23835600
-          tz.transition 1971, 5, :o3, 41983200
-          tz.transition 1971, 10, :o2, 55285200
-          tz.transition 1972, 5, :o3, 74037600
-          tz.transition 1972, 10, :o2, 87339600
-          tz.transition 1973, 6, :o3, 107910000
-          tz.transition 1973, 11, :o2, 121219200
-          tz.transition 1974, 3, :o3, 133920000
-          tz.transition 1974, 11, :o2, 152676000
-          tz.transition 1975, 3, :o3, 165362400
-          tz.transition 1975, 10, :o2, 183502800
-          tz.transition 1976, 5, :o3, 202428000
-          tz.transition 1976, 10, :o2, 215557200
-          tz.transition 1977, 4, :o3, 228866400
-          tz.transition 1977, 10, :o2, 245797200
-          tz.transition 1978, 4, :o3, 260316000
-          tz.transition 1978, 10, :o4, 277246800
-          tz.transition 1979, 10, :o5, 308779200
-          tz.transition 1980, 4, :o4, 323827200
-          tz.transition 1980, 10, :o5, 340228800
-          tz.transition 1981, 3, :o4, 354672000
-          tz.transition 1981, 10, :o5, 371678400
-          tz.transition 1982, 3, :o4, 386121600
-          tz.transition 1982, 10, :o5, 403128000
-          tz.transition 1983, 7, :o4, 428446800
-          tz.transition 1983, 10, :o5, 433886400
-          tz.transition 1985, 4, :o3, 482792400
-          tz.transition 1985, 9, :o2, 496702800
-          tz.transition 1986, 3, :o3, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o3, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o3, 575424000
-          tz.transition 1988, 9, :o2, 591148800
-          tz.transition 1989, 3, :o3, 606873600
-          tz.transition 1989, 9, :o2, 622598400
-          tz.transition 1990, 3, :o3, 638323200
-          tz.transition 1990, 9, :o2, 654652800
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Jersey.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Jersey.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Jersey.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Jersey.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Jersey
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Jersey', 'Europe/London'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kaliningrad.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kaliningrad.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kaliningrad.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kaliningrad.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,181 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Kaliningrad
-        include TimezoneDefinition
-        
-        timezone 'Europe/Kaliningrad' do |tz|
-          tz.offset :o0, 4920, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          tz.offset :o3, 7200, 0, :CET
-          tz.offset :o4, 7200, 3600, :CEST
-          tz.offset :o5, 10800, 0, :MSK
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          tz.offset :o8, 7200, 0, :EET
-          
-          tz.transition 1893, 3, :o1, 1737039199, 720
-          tz.transition 1916, 4, :o2, 29051813, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 58112029, 24
-          tz.transition 1917, 9, :o1, 58115725, 24
-          tz.transition 1918, 4, :o2, 58120765, 24
-          tz.transition 1918, 9, :o1, 58124461, 24
-          tz.transition 1940, 4, :o2, 58313293, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1944, 12, :o3, 58354955, 24
-          tz.transition 1945, 4, :o4, 29178893, 12
-          tz.transition 1945, 10, :o3, 19454083, 8
-          tz.transition 1945, 12, :o5, 29181857, 12
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o5, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o5, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o5, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o5, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o5, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o5, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o5, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o5, 591145200
-          tz.transition 1989, 3, :o6, 606870000
-          tz.transition 1989, 9, :o5, 622594800
-          tz.transition 1990, 3, :o6, 638319600
-          tz.transition 1990, 9, :o5, 654649200
-          tz.transition 1991, 3, :o7, 670374000
-          tz.transition 1991, 9, :o8, 686102400
-          tz.transition 1992, 3, :o7, 701816400
-          tz.transition 1992, 9, :o8, 717537600
-          tz.transition 1993, 3, :o7, 733276800
-          tz.transition 1993, 9, :o8, 749001600
-          tz.transition 1994, 3, :o7, 764726400
-          tz.transition 1994, 9, :o8, 780451200
-          tz.transition 1995, 3, :o7, 796176000
-          tz.transition 1995, 9, :o8, 811900800
-          tz.transition 1996, 3, :o7, 828230400
-          tz.transition 1996, 10, :o8, 846374400
-          tz.transition 1997, 3, :o7, 859680000
-          tz.transition 1997, 10, :o8, 877824000
-          tz.transition 1998, 3, :o7, 891129600
-          tz.transition 1998, 10, :o8, 909273600
-          tz.transition 1999, 3, :o7, 922579200
-          tz.transition 1999, 10, :o8, 941328000
-          tz.transition 2000, 3, :o7, 954028800
-          tz.transition 2000, 10, :o8, 972777600
-          tz.transition 2001, 3, :o7, 985478400
-          tz.transition 2001, 10, :o8, 1004227200
-          tz.transition 2002, 3, :o7, 1017532800
-          tz.transition 2002, 10, :o8, 1035676800
-          tz.transition 2003, 3, :o7, 1048982400
-          tz.transition 2003, 10, :o8, 1067126400
-          tz.transition 2004, 3, :o7, 1080432000
-          tz.transition 2004, 10, :o8, 1099180800
-          tz.transition 2005, 3, :o7, 1111881600
-          tz.transition 2005, 10, :o8, 1130630400
-          tz.transition 2006, 3, :o7, 1143331200
-          tz.transition 2006, 10, :o8, 1162080000
-          tz.transition 2007, 3, :o7, 1174780800
-          tz.transition 2007, 10, :o8, 1193529600
-          tz.transition 2008, 3, :o7, 1206835200
-          tz.transition 2008, 10, :o8, 1224979200
-          tz.transition 2009, 3, :o7, 1238284800
-          tz.transition 2009, 10, :o8, 1256428800
-          tz.transition 2010, 3, :o7, 1269734400
-          tz.transition 2010, 10, :o8, 1288483200
-          tz.transition 2011, 3, :o7, 1301184000
-          tz.transition 2011, 10, :o8, 1319932800
-          tz.transition 2012, 3, :o7, 1332633600
-          tz.transition 2012, 10, :o8, 1351382400
-          tz.transition 2013, 3, :o7, 1364688000
-          tz.transition 2013, 10, :o8, 1382832000
-          tz.transition 2014, 3, :o7, 1396137600
-          tz.transition 2014, 10, :o8, 1414281600
-          tz.transition 2015, 3, :o7, 1427587200
-          tz.transition 2015, 10, :o8, 1445731200
-          tz.transition 2016, 3, :o7, 1459036800
-          tz.transition 2016, 10, :o8, 1477785600
-          tz.transition 2017, 3, :o7, 1490486400
-          tz.transition 2017, 10, :o8, 1509235200
-          tz.transition 2018, 3, :o7, 1521936000
-          tz.transition 2018, 10, :o8, 1540684800
-          tz.transition 2019, 3, :o7, 1553990400
-          tz.transition 2019, 10, :o8, 1572134400
-          tz.transition 2020, 3, :o7, 1585440000
-          tz.transition 2020, 10, :o8, 1603584000
-          tz.transition 2021, 3, :o7, 1616889600
-          tz.transition 2021, 10, :o8, 1635638400
-          tz.transition 2022, 3, :o7, 1648339200
-          tz.transition 2022, 10, :o8, 1667088000
-          tz.transition 2023, 3, :o7, 1679788800
-          tz.transition 2023, 10, :o8, 1698537600
-          tz.transition 2024, 3, :o7, 1711843200
-          tz.transition 2024, 10, :o8, 1729987200
-          tz.transition 2025, 3, :o7, 1743292800
-          tz.transition 2025, 10, :o8, 1761436800
-          tz.transition 2026, 3, :o7, 1774742400
-          tz.transition 2026, 10, :o8, 1792886400
-          tz.transition 2027, 3, :o7, 1806192000
-          tz.transition 2027, 10, :o8, 1824940800
-          tz.transition 2028, 3, :o7, 1837641600
-          tz.transition 2028, 10, :o8, 1856390400
-          tz.transition 2029, 3, :o7, 1869091200
-          tz.transition 2029, 10, :o8, 1887840000
-          tz.transition 2030, 3, :o7, 1901145600
-          tz.transition 2030, 10, :o8, 1919289600
-          tz.transition 2031, 3, :o7, 1932595200
-          tz.transition 2031, 10, :o8, 1950739200
-          tz.transition 2032, 3, :o7, 1964044800
-          tz.transition 2032, 10, :o8, 1982793600
-          tz.transition 2033, 3, :o7, 1995494400
-          tz.transition 2033, 10, :o8, 2014243200
-          tz.transition 2034, 3, :o7, 2026944000
-          tz.transition 2034, 10, :o8, 2045692800
-          tz.transition 2035, 3, :o7, 2058393600
-          tz.transition 2035, 10, :o8, 2077142400
-          tz.transition 2036, 3, :o7, 2090448000
-          tz.transition 2036, 10, :o8, 2108592000
-          tz.transition 2037, 3, :o7, 2121897600
-          tz.transition 2037, 10, :o8, 2140041600
-          tz.transition 2038, 3, :o7, 4931021, 2
-          tz.transition 2038, 10, :o8, 4931455, 2
-          tz.transition 2039, 3, :o7, 4931749, 2
-          tz.transition 2039, 10, :o8, 4932183, 2
-          tz.transition 2040, 3, :o7, 4932477, 2
-          tz.transition 2040, 10, :o8, 4932911, 2
-          tz.transition 2041, 3, :o7, 4933219, 2
-          tz.transition 2041, 10, :o8, 4933639, 2
-          tz.transition 2042, 3, :o7, 4933947, 2
-          tz.transition 2042, 10, :o8, 4934367, 2
-          tz.transition 2043, 3, :o7, 4934675, 2
-          tz.transition 2043, 10, :o8, 4935095, 2
-          tz.transition 2044, 3, :o7, 4935403, 2
-          tz.transition 2044, 10, :o8, 4935837, 2
-          tz.transition 2045, 3, :o7, 4936131, 2
-          tz.transition 2045, 10, :o8, 4936565, 2
-          tz.transition 2046, 3, :o7, 4936859, 2
-          tz.transition 2046, 10, :o8, 4937293, 2
-          tz.transition 2047, 3, :o7, 4937601, 2
-          tz.transition 2047, 10, :o8, 4938021, 2
-          tz.transition 2048, 3, :o7, 4938329, 2
-          tz.transition 2048, 10, :o8, 4938749, 2
-          tz.transition 2049, 3, :o7, 4939057, 2
-          tz.transition 2049, 10, :o8, 4939491, 2
-          tz.transition 2050, 3, :o7, 4939785, 2
-          tz.transition 2050, 10, :o8, 4940219, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kiev.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kiev.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kiev.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Kiev.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,168 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Kiev
-        include TimezoneDefinition
-        
-        timezone 'Europe/Kiev' do |tz|
-          tz.offset :o0, 7324, 0, :LMT
-          tz.offset :o1, 7324, 0, :KMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 10800, 0, :MSK
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 52006652969, 21600
-          tz.transition 1924, 5, :o2, 52356400169, 21600
-          tz.transition 1930, 6, :o3, 29113781, 12
-          tz.transition 1941, 9, :o4, 19442059, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1943, 11, :o3, 58344827, 24
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o3, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o3, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o3, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o3, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o3, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o3, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o3, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o3, 591145200
-          tz.transition 1989, 3, :o6, 606870000
-          tz.transition 1989, 9, :o3, 622594800
-          tz.transition 1990, 6, :o2, 646786800
-          tz.transition 1992, 3, :o7, 701820000
-          tz.transition 1992, 9, :o2, 717541200
-          tz.transition 1993, 3, :o7, 733269600
-          tz.transition 1993, 9, :o2, 748990800
-          tz.transition 1994, 3, :o7, 764719200
-          tz.transition 1994, 9, :o2, 780440400
-          tz.transition 1995, 3, :o7, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o7, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o7, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o7, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o7, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o7, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o7, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o7, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o7, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o7, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o7, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o7, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o7, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o7, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o7, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o7, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o7, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o7, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o7, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o7, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o7, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o7, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o7, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o7, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o7, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o7, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o7, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o7, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o7, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o7, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o7, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o7, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o7, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o7, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o7, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o7, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o7, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o7, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o7, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o7, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o7, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o7, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o7, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o7, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o7, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o7, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o7, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o7, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o7, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o7, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o7, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o7, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o7, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o7, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o7, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o7, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Lisbon.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Lisbon.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Lisbon.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Lisbon.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,268 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Lisbon
-        include TimezoneDefinition
-        
-        timezone 'Europe/Lisbon' do |tz|
-          tz.offset :o0, -2192, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          tz.offset :o3, 0, 7200, :WEMT
-          tz.offset :o4, 3600, 0, :CET
-          tz.offset :o5, 3600, 3600, :CEST
-          
-          tz.transition 1912, 1, :o1, 13064773637, 5400
-          tz.transition 1916, 6, :o2, 58104779, 24
-          tz.transition 1916, 11, :o1, 4842337, 2
-          tz.transition 1917, 2, :o2, 58110923, 24
-          tz.transition 1917, 10, :o1, 58116395, 24
-          tz.transition 1918, 3, :o2, 58119707, 24
-          tz.transition 1918, 10, :o1, 58125155, 24
-          tz.transition 1919, 2, :o2, 58128443, 24
-          tz.transition 1919, 10, :o1, 58133915, 24
-          tz.transition 1920, 2, :o2, 58137227, 24
-          tz.transition 1920, 10, :o1, 58142699, 24
-          tz.transition 1921, 2, :o2, 58145987, 24
-          tz.transition 1921, 10, :o1, 58151459, 24
-          tz.transition 1924, 4, :o2, 58173419, 24
-          tz.transition 1924, 10, :o1, 58177763, 24
-          tz.transition 1926, 4, :o2, 58190963, 24
-          tz.transition 1926, 10, :o1, 58194995, 24
-          tz.transition 1927, 4, :o2, 58199531, 24
-          tz.transition 1927, 10, :o1, 58203731, 24
-          tz.transition 1928, 4, :o2, 58208435, 24
-          tz.transition 1928, 10, :o1, 58212635, 24
-          tz.transition 1929, 4, :o2, 58217339, 24
-          tz.transition 1929, 10, :o1, 58221371, 24
-          tz.transition 1931, 4, :o2, 58234811, 24
-          tz.transition 1931, 10, :o1, 58238843, 24
-          tz.transition 1932, 4, :o2, 58243211, 24
-          tz.transition 1932, 10, :o1, 58247579, 24
-          tz.transition 1934, 4, :o2, 58260851, 24
-          tz.transition 1934, 10, :o1, 58265219, 24
-          tz.transition 1935, 3, :o2, 58269419, 24
-          tz.transition 1935, 10, :o1, 58273955, 24
-          tz.transition 1936, 4, :o2, 58278659, 24
-          tz.transition 1936, 10, :o1, 58282691, 24
-          tz.transition 1937, 4, :o2, 58287059, 24
-          tz.transition 1937, 10, :o1, 58291427, 24
-          tz.transition 1938, 3, :o2, 58295627, 24
-          tz.transition 1938, 10, :o1, 58300163, 24
-          tz.transition 1939, 4, :o2, 58304867, 24
-          tz.transition 1939, 11, :o1, 58310075, 24
-          tz.transition 1940, 2, :o2, 58312427, 24
-          tz.transition 1940, 10, :o1, 58317803, 24
-          tz.transition 1941, 4, :o2, 58322171, 24
-          tz.transition 1941, 10, :o1, 58326563, 24
-          tz.transition 1942, 3, :o2, 58330403, 24
-          tz.transition 1942, 4, :o3, 29165705, 12
-          tz.transition 1942, 8, :o2, 29167049, 12
-          tz.transition 1942, 10, :o1, 58335779, 24
-          tz.transition 1943, 3, :o2, 58339139, 24
-          tz.transition 1943, 4, :o3, 29169989, 12
-          tz.transition 1943, 8, :o2, 29171585, 12
-          tz.transition 1943, 10, :o1, 58344683, 24
-          tz.transition 1944, 3, :o2, 58347875, 24
-          tz.transition 1944, 4, :o3, 29174441, 12
-          tz.transition 1944, 8, :o2, 29175953, 12
-          tz.transition 1944, 10, :o1, 58353419, 24
-          tz.transition 1945, 3, :o2, 58356611, 24
-          tz.transition 1945, 4, :o3, 29178809, 12
-          tz.transition 1945, 8, :o2, 29180321, 12
-          tz.transition 1945, 10, :o1, 58362155, 24
-          tz.transition 1946, 4, :o2, 58366019, 24
-          tz.transition 1946, 10, :o1, 58370387, 24
-          tz.transition 1947, 4, :o2, 29187379, 12
-          tz.transition 1947, 10, :o1, 29189563, 12
-          tz.transition 1948, 4, :o2, 29191747, 12
-          tz.transition 1948, 10, :o1, 29193931, 12
-          tz.transition 1949, 4, :o2, 29196115, 12
-          tz.transition 1949, 10, :o1, 29198299, 12
-          tz.transition 1951, 4, :o2, 29204851, 12
-          tz.transition 1951, 10, :o1, 29207119, 12
-          tz.transition 1952, 4, :o2, 29209303, 12
-          tz.transition 1952, 10, :o1, 29211487, 12
-          tz.transition 1953, 4, :o2, 29213671, 12
-          tz.transition 1953, 10, :o1, 29215855, 12
-          tz.transition 1954, 4, :o2, 29218039, 12
-          tz.transition 1954, 10, :o1, 29220223, 12
-          tz.transition 1955, 4, :o2, 29222407, 12
-          tz.transition 1955, 10, :o1, 29224591, 12
-          tz.transition 1956, 4, :o2, 29226775, 12
-          tz.transition 1956, 10, :o1, 29229043, 12
-          tz.transition 1957, 4, :o2, 29231227, 12
-          tz.transition 1957, 10, :o1, 29233411, 12
-          tz.transition 1958, 4, :o2, 29235595, 12
-          tz.transition 1958, 10, :o1, 29237779, 12
-          tz.transition 1959, 4, :o2, 29239963, 12
-          tz.transition 1959, 10, :o1, 29242147, 12
-          tz.transition 1960, 4, :o2, 29244331, 12
-          tz.transition 1960, 10, :o1, 29246515, 12
-          tz.transition 1961, 4, :o2, 29248699, 12
-          tz.transition 1961, 10, :o1, 29250883, 12
-          tz.transition 1962, 4, :o2, 29253067, 12
-          tz.transition 1962, 10, :o1, 29255335, 12
-          tz.transition 1963, 4, :o2, 29257519, 12
-          tz.transition 1963, 10, :o1, 29259703, 12
-          tz.transition 1964, 4, :o2, 29261887, 12
-          tz.transition 1964, 10, :o1, 29264071, 12
-          tz.transition 1965, 4, :o2, 29266255, 12
-          tz.transition 1965, 10, :o1, 29268439, 12
-          tz.transition 1966, 4, :o4, 29270623, 12
-          tz.transition 1976, 9, :o1, 212544000
-          tz.transition 1977, 3, :o2, 228268800
-          tz.transition 1977, 9, :o1, 243993600
-          tz.transition 1978, 4, :o2, 260323200
-          tz.transition 1978, 10, :o1, 276048000
-          tz.transition 1979, 4, :o2, 291772800
-          tz.transition 1979, 9, :o1, 307501200
-          tz.transition 1980, 3, :o2, 323222400
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417578400
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o4, 717555600
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 9, :o4, 749005200
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 9, :o4, 780454800
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 9, :o4, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Ljubljana.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Ljubljana.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Ljubljana.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Ljubljana.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Ljubljana
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Ljubljana', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/London.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/London.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/London.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/London.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,288 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module London
-        include TimezoneDefinition
-        
-        timezone 'Europe/London' do |tz|
-          tz.offset :o0, -75, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, 0, 3600, :BST
-          tz.offset :o3, 0, 7200, :BDST
-          tz.offset :o4, 3600, 0, :BST
-          
-          tz.transition 1847, 12, :o1, 2760187969, 1152
-          tz.transition 1916, 5, :o2, 29052055, 12
-          tz.transition 1916, 10, :o1, 29053651, 12
-          tz.transition 1917, 4, :o2, 29055919, 12
-          tz.transition 1917, 9, :o1, 29057863, 12
-          tz.transition 1918, 3, :o2, 29060119, 12
-          tz.transition 1918, 9, :o1, 29062399, 12
-          tz.transition 1919, 3, :o2, 29064571, 12
-          tz.transition 1919, 9, :o1, 29066767, 12
-          tz.transition 1920, 3, :o2, 29068939, 12
-          tz.transition 1920, 10, :o1, 29071471, 12
-          tz.transition 1921, 4, :o2, 29073391, 12
-          tz.transition 1921, 10, :o1, 29075587, 12
-          tz.transition 1922, 3, :o2, 29077675, 12
-          tz.transition 1922, 10, :o1, 29080027, 12
-          tz.transition 1923, 4, :o2, 29082379, 12
-          tz.transition 1923, 9, :o1, 29084143, 12
-          tz.transition 1924, 4, :o2, 29086663, 12
-          tz.transition 1924, 9, :o1, 29088595, 12
-          tz.transition 1925, 4, :o2, 29091115, 12
-          tz.transition 1925, 10, :o1, 29093131, 12
-          tz.transition 1926, 4, :o2, 29095483, 12
-          tz.transition 1926, 10, :o1, 29097499, 12
-          tz.transition 1927, 4, :o2, 29099767, 12
-          tz.transition 1927, 10, :o1, 29101867, 12
-          tz.transition 1928, 4, :o2, 29104303, 12
-          tz.transition 1928, 10, :o1, 29106319, 12
-          tz.transition 1929, 4, :o2, 29108671, 12
-          tz.transition 1929, 10, :o1, 29110687, 12
-          tz.transition 1930, 4, :o2, 29112955, 12
-          tz.transition 1930, 10, :o1, 29115055, 12
-          tz.transition 1931, 4, :o2, 29117407, 12
-          tz.transition 1931, 10, :o1, 29119423, 12
-          tz.transition 1932, 4, :o2, 29121775, 12
-          tz.transition 1932, 10, :o1, 29123791, 12
-          tz.transition 1933, 4, :o2, 29126059, 12
-          tz.transition 1933, 10, :o1, 29128243, 12
-          tz.transition 1934, 4, :o2, 29130595, 12
-          tz.transition 1934, 10, :o1, 29132611, 12
-          tz.transition 1935, 4, :o2, 29134879, 12
-          tz.transition 1935, 10, :o1, 29136979, 12
-          tz.transition 1936, 4, :o2, 29139331, 12
-          tz.transition 1936, 10, :o1, 29141347, 12
-          tz.transition 1937, 4, :o2, 29143699, 12
-          tz.transition 1937, 10, :o1, 29145715, 12
-          tz.transition 1938, 4, :o2, 29147983, 12
-          tz.transition 1938, 10, :o1, 29150083, 12
-          tz.transition 1939, 4, :o2, 29152435, 12
-          tz.transition 1939, 11, :o1, 29155039, 12
-          tz.transition 1940, 2, :o2, 29156215, 12
-          tz.transition 1941, 5, :o3, 58322845, 24
-          tz.transition 1941, 8, :o2, 58325197, 24
-          tz.transition 1942, 4, :o3, 58330909, 24
-          tz.transition 1942, 8, :o2, 58333933, 24
-          tz.transition 1943, 4, :o3, 58339645, 24
-          tz.transition 1943, 8, :o2, 58342837, 24
-          tz.transition 1944, 4, :o3, 58348381, 24
-          tz.transition 1944, 9, :o2, 58352413, 24
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 7, :o2, 58359637, 24
-          tz.transition 1945, 10, :o1, 29180827, 12
-          tz.transition 1946, 4, :o2, 29183095, 12
-          tz.transition 1946, 10, :o1, 29185195, 12
-          tz.transition 1947, 3, :o2, 29187127, 12
-          tz.transition 1947, 4, :o3, 58374925, 24
-          tz.transition 1947, 8, :o2, 58377781, 24
-          tz.transition 1947, 11, :o1, 29189899, 12
-          tz.transition 1948, 3, :o2, 29191495, 12
-          tz.transition 1948, 10, :o1, 29194267, 12
-          tz.transition 1949, 4, :o2, 29196115, 12
-          tz.transition 1949, 10, :o1, 29198635, 12
-          tz.transition 1950, 4, :o2, 29200651, 12
-          tz.transition 1950, 10, :o1, 29202919, 12
-          tz.transition 1951, 4, :o2, 29205019, 12
-          tz.transition 1951, 10, :o1, 29207287, 12
-          tz.transition 1952, 4, :o2, 29209471, 12
-          tz.transition 1952, 10, :o1, 29211739, 12
-          tz.transition 1953, 4, :o2, 29213839, 12
-          tz.transition 1953, 10, :o1, 29215855, 12
-          tz.transition 1954, 4, :o2, 29218123, 12
-          tz.transition 1954, 10, :o1, 29220223, 12
-          tz.transition 1955, 4, :o2, 29222575, 12
-          tz.transition 1955, 10, :o1, 29224591, 12
-          tz.transition 1956, 4, :o2, 29227027, 12
-          tz.transition 1956, 10, :o1, 29229043, 12
-          tz.transition 1957, 4, :o2, 29231311, 12
-          tz.transition 1957, 10, :o1, 29233411, 12
-          tz.transition 1958, 4, :o2, 29235763, 12
-          tz.transition 1958, 10, :o1, 29237779, 12
-          tz.transition 1959, 4, :o2, 29240131, 12
-          tz.transition 1959, 10, :o1, 29242147, 12
-          tz.transition 1960, 4, :o2, 29244415, 12
-          tz.transition 1960, 10, :o1, 29246515, 12
-          tz.transition 1961, 3, :o2, 29248615, 12
-          tz.transition 1961, 10, :o1, 29251219, 12
-          tz.transition 1962, 3, :o2, 29252983, 12
-          tz.transition 1962, 10, :o1, 29255587, 12
-          tz.transition 1963, 3, :o2, 29257435, 12
-          tz.transition 1963, 10, :o1, 29259955, 12
-          tz.transition 1964, 3, :o2, 29261719, 12
-          tz.transition 1964, 10, :o1, 29264323, 12
-          tz.transition 1965, 3, :o2, 29266087, 12
-          tz.transition 1965, 10, :o1, 29268691, 12
-          tz.transition 1966, 3, :o2, 29270455, 12
-          tz.transition 1966, 10, :o1, 29273059, 12
-          tz.transition 1967, 3, :o2, 29274823, 12
-          tz.transition 1967, 10, :o1, 29277511, 12
-          tz.transition 1968, 2, :o2, 29278855, 12
-          tz.transition 1968, 10, :o4, 58563755, 24
-          tz.transition 1971, 10, :o1, 57722400
-          tz.transition 1972, 3, :o2, 69818400
-          tz.transition 1972, 10, :o1, 89172000
-          tz.transition 1973, 3, :o2, 101268000
-          tz.transition 1973, 10, :o1, 120621600
-          tz.transition 1974, 3, :o2, 132717600
-          tz.transition 1974, 10, :o1, 152071200
-          tz.transition 1975, 3, :o2, 164167200
-          tz.transition 1975, 10, :o1, 183520800
-          tz.transition 1976, 3, :o2, 196221600
-          tz.transition 1976, 10, :o1, 214970400
-          tz.transition 1977, 3, :o2, 227671200
-          tz.transition 1977, 10, :o1, 246420000
-          tz.transition 1978, 3, :o2, 259120800
-          tz.transition 1978, 10, :o1, 278474400
-          tz.transition 1979, 3, :o2, 290570400
-          tz.transition 1979, 10, :o1, 309924000
-          tz.transition 1980, 3, :o2, 322020000
-          tz.transition 1980, 10, :o1, 341373600
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 10, :o1, 372819600
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 10, :o1, 404269200
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 10, :o1, 435718800
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 10, :o1, 467773200
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 10, :o1, 499222800
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 10, :o1, 530672400
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 10, :o1, 562122000
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 10, :o1, 593571600
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 10, :o1, 625626000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 10, :o1, 657075600
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 10, :o1, 688525200
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 10, :o1, 719974800
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 10, :o1, 751424400
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 10, :o1, 782874000
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 10, :o1, 814323600
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Luxembourg.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Luxembourg.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Luxembourg.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Luxembourg.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,231 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Luxembourg
-        include TimezoneDefinition
-        
-        timezone 'Europe/Luxembourg' do |tz|
-          tz.offset :o0, 1476, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          tz.offset :o3, 0, 0, :WET
-          tz.offset :o4, 0, 3600, :WEST
-          tz.offset :o5, 3600, 3600, :WEST
-          tz.offset :o6, 3600, 0, :WET
-          
-          tz.transition 1904, 5, :o1, 5799917959, 2400
-          tz.transition 1916, 5, :o2, 29051981, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 29056169, 12
-          tz.transition 1917, 9, :o1, 58115723, 24
-          tz.transition 1918, 4, :o2, 58120765, 24
-          tz.transition 1918, 9, :o1, 58124461, 24
-          tz.transition 1918, 11, :o3, 58126139, 24
-          tz.transition 1919, 3, :o4, 58128467, 24
-          tz.transition 1919, 10, :o3, 29066839, 12
-          tz.transition 1920, 2, :o4, 58136867, 24
-          tz.transition 1920, 10, :o3, 58142917, 24
-          tz.transition 1921, 3, :o4, 58146323, 24
-          tz.transition 1921, 10, :o3, 58151725, 24
-          tz.transition 1922, 3, :o4, 58155347, 24
-          tz.transition 1922, 10, :o3, 4846671, 2
-          tz.transition 1923, 4, :o4, 58164755, 24
-          tz.transition 1923, 10, :o3, 58168789, 24
-          tz.transition 1924, 3, :o4, 58172987, 24
-          tz.transition 1924, 10, :o3, 4848127, 2
-          tz.transition 1925, 4, :o4, 58181915, 24
-          tz.transition 1925, 10, :o3, 4848855, 2
-          tz.transition 1926, 4, :o4, 58190963, 24
-          tz.transition 1926, 10, :o3, 4849583, 2
-          tz.transition 1927, 4, :o4, 58199531, 24
-          tz.transition 1927, 10, :o3, 4850311, 2
-          tz.transition 1928, 4, :o4, 58208435, 24
-          tz.transition 1928, 10, :o3, 4851053, 2
-          tz.transition 1929, 4, :o4, 58217339, 24
-          tz.transition 1929, 10, :o3, 29110687, 12
-          tz.transition 1930, 4, :o4, 29112955, 12
-          tz.transition 1930, 10, :o3, 29115055, 12
-          tz.transition 1931, 4, :o4, 29117407, 12
-          tz.transition 1931, 10, :o3, 29119423, 12
-          tz.transition 1932, 4, :o4, 29121607, 12
-          tz.transition 1932, 10, :o3, 29123791, 12
-          tz.transition 1933, 3, :o4, 29125891, 12
-          tz.transition 1933, 10, :o3, 29128243, 12
-          tz.transition 1934, 4, :o4, 29130427, 12
-          tz.transition 1934, 10, :o3, 29132611, 12
-          tz.transition 1935, 3, :o4, 29134711, 12
-          tz.transition 1935, 10, :o3, 29136979, 12
-          tz.transition 1936, 4, :o4, 29139331, 12
-          tz.transition 1936, 10, :o3, 29141347, 12
-          tz.transition 1937, 4, :o4, 29143531, 12
-          tz.transition 1937, 10, :o3, 29145715, 12
-          tz.transition 1938, 3, :o4, 29147815, 12
-          tz.transition 1938, 10, :o3, 29150083, 12
-          tz.transition 1939, 4, :o4, 29152435, 12
-          tz.transition 1939, 11, :o3, 29155039, 12
-          tz.transition 1940, 2, :o4, 29156215, 12
-          tz.transition 1940, 5, :o5, 29157163, 12
-          tz.transition 1942, 11, :o6, 58335973, 24
-          tz.transition 1943, 3, :o5, 58339501, 24
-          tz.transition 1943, 10, :o6, 58344037, 24
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 9, :o1, 58352437, 24
-          tz.transition 1945, 4, :o2, 58357141, 24
-          tz.transition 1945, 9, :o1, 58361149, 24
-          tz.transition 1946, 5, :o2, 58367029, 24
-          tz.transition 1946, 10, :o1, 58370413, 24
-          tz.transition 1977, 4, :o2, 228877200
-          tz.transition 1977, 9, :o1, 243997200
-          tz.transition 1978, 4, :o2, 260326800
-          tz.transition 1978, 10, :o1, 276051600
-          tz.transition 1979, 4, :o2, 291776400
-          tz.transition 1979, 9, :o1, 307501200
-          tz.transition 1980, 4, :o2, 323830800
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Madrid.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Madrid.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Madrid.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Madrid.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,211 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Madrid
-        include TimezoneDefinition
-        
-        timezone 'Europe/Madrid' do |tz|
-          tz.offset :o0, -884, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          tz.offset :o3, 0, 7200, :WEMT
-          tz.offset :o4, 3600, 0, :CET
-          tz.offset :o5, 3600, 3600, :CEST
-          
-          tz.transition 1901, 1, :o1, 52172327021, 21600
-          tz.transition 1917, 5, :o2, 58112507, 24
-          tz.transition 1917, 10, :o1, 58116203, 24
-          tz.transition 1918, 4, :o2, 58120787, 24
-          tz.transition 1918, 10, :o1, 58124963, 24
-          tz.transition 1919, 4, :o2, 58129307, 24
-          tz.transition 1919, 10, :o1, 58133723, 24
-          tz.transition 1924, 4, :o2, 58173419, 24
-          tz.transition 1924, 10, :o1, 58177523, 24
-          tz.transition 1926, 4, :o2, 58190963, 24
-          tz.transition 1926, 10, :o1, 58194995, 24
-          tz.transition 1927, 4, :o2, 58199531, 24
-          tz.transition 1927, 10, :o1, 58203731, 24
-          tz.transition 1928, 4, :o2, 58208435, 24
-          tz.transition 1928, 10, :o1, 58212635, 24
-          tz.transition 1929, 4, :o2, 58217339, 24
-          tz.transition 1929, 10, :o1, 58221371, 24
-          tz.transition 1937, 5, :o2, 58288235, 24
-          tz.transition 1937, 10, :o1, 58291427, 24
-          tz.transition 1938, 3, :o2, 58295531, 24
-          tz.transition 1938, 10, :o1, 58300163, 24
-          tz.transition 1939, 4, :o2, 58304867, 24
-          tz.transition 1939, 10, :o1, 58309067, 24
-          tz.transition 1940, 3, :o2, 58312931, 24
-          tz.transition 1942, 5, :o3, 29165789, 12
-          tz.transition 1942, 9, :o2, 29167253, 12
-          tz.transition 1943, 4, :o3, 29169989, 12
-          tz.transition 1943, 10, :o2, 29172017, 12
-          tz.transition 1944, 4, :o3, 29174357, 12
-          tz.transition 1944, 10, :o2, 29176493, 12
-          tz.transition 1945, 4, :o3, 29178725, 12
-          tz.transition 1945, 9, :o2, 58361483, 24
-          tz.transition 1946, 4, :o3, 29183093, 12
-          tz.transition 1946, 9, :o4, 29185121, 12
-          tz.transition 1949, 4, :o5, 29196449, 12
-          tz.transition 1949, 9, :o4, 58396547, 24
-          tz.transition 1974, 4, :o5, 135122400
-          tz.transition 1974, 10, :o4, 150246000
-          tz.transition 1975, 4, :o5, 167176800
-          tz.transition 1975, 10, :o4, 181695600
-          tz.transition 1976, 3, :o5, 196812000
-          tz.transition 1976, 9, :o4, 212540400
-          tz.transition 1977, 4, :o5, 228866400
-          tz.transition 1977, 9, :o4, 243990000
-          tz.transition 1978, 4, :o5, 260402400
-          tz.transition 1978, 9, :o4, 276044400
-          tz.transition 1979, 4, :o5, 291776400
-          tz.transition 1979, 9, :o4, 307501200
-          tz.transition 1980, 4, :o5, 323830800
-          tz.transition 1980, 9, :o4, 338950800
-          tz.transition 1981, 3, :o5, 354675600
-          tz.transition 1981, 9, :o4, 370400400
-          tz.transition 1982, 3, :o5, 386125200
-          tz.transition 1982, 9, :o4, 401850000
-          tz.transition 1983, 3, :o5, 417574800
-          tz.transition 1983, 9, :o4, 433299600
-          tz.transition 1984, 3, :o5, 449024400
-          tz.transition 1984, 9, :o4, 465354000
-          tz.transition 1985, 3, :o5, 481078800
-          tz.transition 1985, 9, :o4, 496803600
-          tz.transition 1986, 3, :o5, 512528400
-          tz.transition 1986, 9, :o4, 528253200
-          tz.transition 1987, 3, :o5, 543978000
-          tz.transition 1987, 9, :o4, 559702800
-          tz.transition 1988, 3, :o5, 575427600
-          tz.transition 1988, 9, :o4, 591152400
-          tz.transition 1989, 3, :o5, 606877200
-          tz.transition 1989, 9, :o4, 622602000
-          tz.transition 1990, 3, :o5, 638326800
-          tz.transition 1990, 9, :o4, 654656400
-          tz.transition 1991, 3, :o5, 670381200
-          tz.transition 1991, 9, :o4, 686106000
-          tz.transition 1992, 3, :o5, 701830800
-          tz.transition 1992, 9, :o4, 717555600
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 9, :o4, 749005200
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 9, :o4, 780454800
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 9, :o4, 811904400
-          tz.transition 1996, 3, :o5, 828234000
-          tz.transition 1996, 10, :o4, 846378000
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o4, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o4, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o4, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o4, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o4, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Malta.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Malta.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Malta.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Malta.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,213 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Malta
-        include TimezoneDefinition
-        
-        timezone 'Europe/Malta' do |tz|
-          tz.offset :o0, 3484, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1893, 11, :o1, 52115820329, 21600
-          tz.transition 1916, 6, :o2, 58104419, 24
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 3, :o2, 58111667, 24
-          tz.transition 1917, 9, :o1, 58116035, 24
-          tz.transition 1918, 3, :o2, 58119899, 24
-          tz.transition 1918, 10, :o1, 58124939, 24
-          tz.transition 1919, 3, :o2, 58128467, 24
-          tz.transition 1919, 10, :o1, 58133675, 24
-          tz.transition 1920, 3, :o2, 58137707, 24
-          tz.transition 1920, 9, :o1, 58142075, 24
-          tz.transition 1940, 6, :o2, 58315091, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 4, :o2, 58357141, 24
-          tz.transition 1945, 9, :o1, 58361123, 24
-          tz.transition 1946, 3, :o2, 58365517, 24
-          tz.transition 1946, 10, :o1, 58370389, 24
-          tz.transition 1947, 3, :o2, 58374251, 24
-          tz.transition 1947, 10, :o1, 58379123, 24
-          tz.transition 1948, 2, :o2, 58382653, 24
-          tz.transition 1948, 10, :o1, 58387861, 24
-          tz.transition 1966, 5, :o2, 58542419, 24
-          tz.transition 1966, 9, :o1, 29272721, 12
-          tz.transition 1967, 5, :o2, 58551323, 24
-          tz.transition 1967, 9, :o1, 29277089, 12
-          tz.transition 1968, 5, :o2, 58560059, 24
-          tz.transition 1968, 9, :o1, 29281457, 12
-          tz.transition 1969, 5, :o2, 58568963, 24
-          tz.transition 1969, 9, :o1, 29285909, 12
-          tz.transition 1970, 5, :o2, 12956400
-          tz.transition 1970, 9, :o1, 23234400
-          tz.transition 1971, 5, :o2, 43801200
-          tz.transition 1971, 9, :o1, 54687600
-          tz.transition 1972, 5, :o2, 75855600
-          tz.transition 1972, 9, :o1, 86738400
-          tz.transition 1973, 3, :o2, 102380400
-          tz.transition 1973, 9, :o1, 118105200
-          tz.transition 1974, 4, :o2, 135730800
-          tz.transition 1974, 9, :o1, 148518000
-          tz.transition 1975, 4, :o2, 167187600
-          tz.transition 1975, 9, :o1, 180489600
-          tz.transition 1976, 4, :o2, 198637200
-          tz.transition 1976, 9, :o1, 211939200
-          tz.transition 1977, 4, :o2, 230086800
-          tz.transition 1977, 9, :o1, 243388800
-          tz.transition 1978, 4, :o2, 261536400
-          tz.transition 1978, 9, :o1, 274838400
-          tz.transition 1979, 4, :o2, 292986000
-          tz.transition 1979, 9, :o1, 306288000
-          tz.transition 1980, 3, :o2, 323312400
-          tz.transition 1980, 9, :o1, 338342400
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Mariehamn.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Mariehamn.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Mariehamn.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Mariehamn.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Mariehamn
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Mariehamn', 'Europe/Helsinki'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Minsk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Minsk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Minsk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Minsk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,170 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Minsk
-        include TimezoneDefinition
-        
-        timezone 'Europe/Minsk' do |tz|
-          tz.offset :o0, 6616, 0, :LMT
-          tz.offset :o1, 6600, 0, :MMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 10800, 0, :MSK
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 26003326573, 10800
-          tz.transition 1924, 5, :o2, 349042669, 144
-          tz.transition 1930, 6, :o3, 29113781, 12
-          tz.transition 1941, 6, :o4, 19441387, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 7, :o3, 29175293, 12
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o3, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o3, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o3, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o3, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o3, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o3, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o3, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o3, 591145200
-          tz.transition 1989, 3, :o6, 606870000
-          tz.transition 1989, 9, :o3, 622594800
-          tz.transition 1991, 3, :o7, 670374000
-          tz.transition 1991, 9, :o2, 686102400
-          tz.transition 1992, 3, :o7, 701820000
-          tz.transition 1992, 9, :o2, 717544800
-          tz.transition 1993, 3, :o7, 733276800
-          tz.transition 1993, 9, :o2, 749001600
-          tz.transition 1994, 3, :o7, 764726400
-          tz.transition 1994, 9, :o2, 780451200
-          tz.transition 1995, 3, :o7, 796176000
-          tz.transition 1995, 9, :o2, 811900800
-          tz.transition 1996, 3, :o7, 828230400
-          tz.transition 1996, 10, :o2, 846374400
-          tz.transition 1997, 3, :o7, 859680000
-          tz.transition 1997, 10, :o2, 877824000
-          tz.transition 1998, 3, :o7, 891129600
-          tz.transition 1998, 10, :o2, 909273600
-          tz.transition 1999, 3, :o7, 922579200
-          tz.transition 1999, 10, :o2, 941328000
-          tz.transition 2000, 3, :o7, 954028800
-          tz.transition 2000, 10, :o2, 972777600
-          tz.transition 2001, 3, :o7, 985478400
-          tz.transition 2001, 10, :o2, 1004227200
-          tz.transition 2002, 3, :o7, 1017532800
-          tz.transition 2002, 10, :o2, 1035676800
-          tz.transition 2003, 3, :o7, 1048982400
-          tz.transition 2003, 10, :o2, 1067126400
-          tz.transition 2004, 3, :o7, 1080432000
-          tz.transition 2004, 10, :o2, 1099180800
-          tz.transition 2005, 3, :o7, 1111881600
-          tz.transition 2005, 10, :o2, 1130630400
-          tz.transition 2006, 3, :o7, 1143331200
-          tz.transition 2006, 10, :o2, 1162080000
-          tz.transition 2007, 3, :o7, 1174780800
-          tz.transition 2007, 10, :o2, 1193529600
-          tz.transition 2008, 3, :o7, 1206835200
-          tz.transition 2008, 10, :o2, 1224979200
-          tz.transition 2009, 3, :o7, 1238284800
-          tz.transition 2009, 10, :o2, 1256428800
-          tz.transition 2010, 3, :o7, 1269734400
-          tz.transition 2010, 10, :o2, 1288483200
-          tz.transition 2011, 3, :o7, 1301184000
-          tz.transition 2011, 10, :o2, 1319932800
-          tz.transition 2012, 3, :o7, 1332633600
-          tz.transition 2012, 10, :o2, 1351382400
-          tz.transition 2013, 3, :o7, 1364688000
-          tz.transition 2013, 10, :o2, 1382832000
-          tz.transition 2014, 3, :o7, 1396137600
-          tz.transition 2014, 10, :o2, 1414281600
-          tz.transition 2015, 3, :o7, 1427587200
-          tz.transition 2015, 10, :o2, 1445731200
-          tz.transition 2016, 3, :o7, 1459036800
-          tz.transition 2016, 10, :o2, 1477785600
-          tz.transition 2017, 3, :o7, 1490486400
-          tz.transition 2017, 10, :o2, 1509235200
-          tz.transition 2018, 3, :o7, 1521936000
-          tz.transition 2018, 10, :o2, 1540684800
-          tz.transition 2019, 3, :o7, 1553990400
-          tz.transition 2019, 10, :o2, 1572134400
-          tz.transition 2020, 3, :o7, 1585440000
-          tz.transition 2020, 10, :o2, 1603584000
-          tz.transition 2021, 3, :o7, 1616889600
-          tz.transition 2021, 10, :o2, 1635638400
-          tz.transition 2022, 3, :o7, 1648339200
-          tz.transition 2022, 10, :o2, 1667088000
-          tz.transition 2023, 3, :o7, 1679788800
-          tz.transition 2023, 10, :o2, 1698537600
-          tz.transition 2024, 3, :o7, 1711843200
-          tz.transition 2024, 10, :o2, 1729987200
-          tz.transition 2025, 3, :o7, 1743292800
-          tz.transition 2025, 10, :o2, 1761436800
-          tz.transition 2026, 3, :o7, 1774742400
-          tz.transition 2026, 10, :o2, 1792886400
-          tz.transition 2027, 3, :o7, 1806192000
-          tz.transition 2027, 10, :o2, 1824940800
-          tz.transition 2028, 3, :o7, 1837641600
-          tz.transition 2028, 10, :o2, 1856390400
-          tz.transition 2029, 3, :o7, 1869091200
-          tz.transition 2029, 10, :o2, 1887840000
-          tz.transition 2030, 3, :o7, 1901145600
-          tz.transition 2030, 10, :o2, 1919289600
-          tz.transition 2031, 3, :o7, 1932595200
-          tz.transition 2031, 10, :o2, 1950739200
-          tz.transition 2032, 3, :o7, 1964044800
-          tz.transition 2032, 10, :o2, 1982793600
-          tz.transition 2033, 3, :o7, 1995494400
-          tz.transition 2033, 10, :o2, 2014243200
-          tz.transition 2034, 3, :o7, 2026944000
-          tz.transition 2034, 10, :o2, 2045692800
-          tz.transition 2035, 3, :o7, 2058393600
-          tz.transition 2035, 10, :o2, 2077142400
-          tz.transition 2036, 3, :o7, 2090448000
-          tz.transition 2036, 10, :o2, 2108592000
-          tz.transition 2037, 3, :o7, 2121897600
-          tz.transition 2037, 10, :o2, 2140041600
-          tz.transition 2038, 3, :o7, 4931021, 2
-          tz.transition 2038, 10, :o2, 4931455, 2
-          tz.transition 2039, 3, :o7, 4931749, 2
-          tz.transition 2039, 10, :o2, 4932183, 2
-          tz.transition 2040, 3, :o7, 4932477, 2
-          tz.transition 2040, 10, :o2, 4932911, 2
-          tz.transition 2041, 3, :o7, 4933219, 2
-          tz.transition 2041, 10, :o2, 4933639, 2
-          tz.transition 2042, 3, :o7, 4933947, 2
-          tz.transition 2042, 10, :o2, 4934367, 2
-          tz.transition 2043, 3, :o7, 4934675, 2
-          tz.transition 2043, 10, :o2, 4935095, 2
-          tz.transition 2044, 3, :o7, 4935403, 2
-          tz.transition 2044, 10, :o2, 4935837, 2
-          tz.transition 2045, 3, :o7, 4936131, 2
-          tz.transition 2045, 10, :o2, 4936565, 2
-          tz.transition 2046, 3, :o7, 4936859, 2
-          tz.transition 2046, 10, :o2, 4937293, 2
-          tz.transition 2047, 3, :o7, 4937601, 2
-          tz.transition 2047, 10, :o2, 4938021, 2
-          tz.transition 2048, 3, :o7, 4938329, 2
-          tz.transition 2048, 10, :o2, 4938749, 2
-          tz.transition 2049, 3, :o7, 4939057, 2
-          tz.transition 2049, 10, :o2, 4939491, 2
-          tz.transition 2050, 3, :o7, 4939785, 2
-          tz.transition 2050, 10, :o2, 4940219, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Monaco.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Monaco.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Monaco.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Monaco.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,233 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Monaco
-        include TimezoneDefinition
-        
-        timezone 'Europe/Monaco' do |tz|
-          tz.offset :o0, 1772, 0, :LMT
-          tz.offset :o1, 561, 0, :PMT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 0, 3600, :WEST
-          tz.offset :o4, 0, 7200, :WEMT
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 3600, 3600, :CEST
-          
-          tz.transition 1891, 3, :o1, 52095019957, 21600
-          tz.transition 1911, 3, :o2, 69670267013, 28800
-          tz.transition 1916, 6, :o3, 58104707, 24
-          tz.transition 1916, 10, :o2, 58107323, 24
-          tz.transition 1917, 3, :o3, 58111499, 24
-          tz.transition 1917, 10, :o2, 58116227, 24
-          tz.transition 1918, 3, :o3, 58119899, 24
-          tz.transition 1918, 10, :o2, 58124963, 24
-          tz.transition 1919, 3, :o3, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133699, 24
-          tz.transition 1920, 2, :o3, 58136867, 24
-          tz.transition 1920, 10, :o2, 58142915, 24
-          tz.transition 1921, 3, :o3, 58146323, 24
-          tz.transition 1921, 10, :o2, 58151723, 24
-          tz.transition 1922, 3, :o3, 58155347, 24
-          tz.transition 1922, 10, :o2, 58160051, 24
-          tz.transition 1923, 5, :o3, 58165595, 24
-          tz.transition 1923, 10, :o2, 58168787, 24
-          tz.transition 1924, 3, :o3, 58172987, 24
-          tz.transition 1924, 10, :o2, 58177523, 24
-          tz.transition 1925, 4, :o3, 58181891, 24
-          tz.transition 1925, 10, :o2, 58186259, 24
-          tz.transition 1926, 4, :o3, 58190963, 24
-          tz.transition 1926, 10, :o2, 58194995, 24
-          tz.transition 1927, 4, :o3, 58199531, 24
-          tz.transition 1927, 10, :o2, 58203731, 24
-          tz.transition 1928, 4, :o3, 58208435, 24
-          tz.transition 1928, 10, :o2, 58212635, 24
-          tz.transition 1929, 4, :o3, 58217339, 24
-          tz.transition 1929, 10, :o2, 58221371, 24
-          tz.transition 1930, 4, :o3, 58225907, 24
-          tz.transition 1930, 10, :o2, 58230107, 24
-          tz.transition 1931, 4, :o3, 58234811, 24
-          tz.transition 1931, 10, :o2, 58238843, 24
-          tz.transition 1932, 4, :o3, 58243211, 24
-          tz.transition 1932, 10, :o2, 58247579, 24
-          tz.transition 1933, 3, :o3, 58251779, 24
-          tz.transition 1933, 10, :o2, 58256483, 24
-          tz.transition 1934, 4, :o3, 58260851, 24
-          tz.transition 1934, 10, :o2, 58265219, 24
-          tz.transition 1935, 3, :o3, 58269419, 24
-          tz.transition 1935, 10, :o2, 58273955, 24
-          tz.transition 1936, 4, :o3, 58278659, 24
-          tz.transition 1936, 10, :o2, 58282691, 24
-          tz.transition 1937, 4, :o3, 58287059, 24
-          tz.transition 1937, 10, :o2, 58291427, 24
-          tz.transition 1938, 3, :o3, 58295627, 24
-          tz.transition 1938, 10, :o2, 58300163, 24
-          tz.transition 1939, 4, :o3, 58304867, 24
-          tz.transition 1939, 11, :o2, 58310075, 24
-          tz.transition 1940, 2, :o3, 29156215, 12
-          tz.transition 1941, 5, :o4, 58322867, 24
-          tz.transition 1941, 10, :o3, 29163281, 12
-          tz.transition 1942, 3, :o4, 58330259, 24
-          tz.transition 1942, 11, :o3, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o3, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 10, :o3, 58352915, 24
-          tz.transition 1945, 4, :o4, 58357141, 24
-          tz.transition 1945, 9, :o5, 58361149, 24
-          tz.transition 1976, 3, :o6, 196819200
-          tz.transition 1976, 9, :o5, 212540400
-          tz.transition 1977, 4, :o6, 228877200
-          tz.transition 1977, 9, :o5, 243997200
-          tz.transition 1978, 4, :o6, 260326800
-          tz.transition 1978, 10, :o5, 276051600
-          tz.transition 1979, 4, :o6, 291776400
-          tz.transition 1979, 9, :o5, 307501200
-          tz.transition 1980, 4, :o6, 323830800
-          tz.transition 1980, 9, :o5, 338950800
-          tz.transition 1981, 3, :o6, 354675600
-          tz.transition 1981, 9, :o5, 370400400
-          tz.transition 1982, 3, :o6, 386125200
-          tz.transition 1982, 9, :o5, 401850000
-          tz.transition 1983, 3, :o6, 417574800
-          tz.transition 1983, 9, :o5, 433299600
-          tz.transition 1984, 3, :o6, 449024400
-          tz.transition 1984, 9, :o5, 465354000
-          tz.transition 1985, 3, :o6, 481078800
-          tz.transition 1985, 9, :o5, 496803600
-          tz.transition 1986, 3, :o6, 512528400
-          tz.transition 1986, 9, :o5, 528253200
-          tz.transition 1987, 3, :o6, 543978000
-          tz.transition 1987, 9, :o5, 559702800
-          tz.transition 1988, 3, :o6, 575427600
-          tz.transition 1988, 9, :o5, 591152400
-          tz.transition 1989, 3, :o6, 606877200
-          tz.transition 1989, 9, :o5, 622602000
-          tz.transition 1990, 3, :o6, 638326800
-          tz.transition 1990, 9, :o5, 654656400
-          tz.transition 1991, 3, :o6, 670381200
-          tz.transition 1991, 9, :o5, 686106000
-          tz.transition 1992, 3, :o6, 701830800
-          tz.transition 1992, 9, :o5, 717555600
-          tz.transition 1993, 3, :o6, 733280400
-          tz.transition 1993, 9, :o5, 749005200
-          tz.transition 1994, 3, :o6, 764730000
-          tz.transition 1994, 9, :o5, 780454800
-          tz.transition 1995, 3, :o6, 796179600
-          tz.transition 1995, 9, :o5, 811904400
-          tz.transition 1996, 3, :o6, 828234000
-          tz.transition 1996, 10, :o5, 846378000
-          tz.transition 1997, 3, :o6, 859683600
-          tz.transition 1997, 10, :o5, 877827600
-          tz.transition 1998, 3, :o6, 891133200
-          tz.transition 1998, 10, :o5, 909277200
-          tz.transition 1999, 3, :o6, 922582800
-          tz.transition 1999, 10, :o5, 941331600
-          tz.transition 2000, 3, :o6, 954032400
-          tz.transition 2000, 10, :o5, 972781200
-          tz.transition 2001, 3, :o6, 985482000
-          tz.transition 2001, 10, :o5, 1004230800
-          tz.transition 2002, 3, :o6, 1017536400
-          tz.transition 2002, 10, :o5, 1035680400
-          tz.transition 2003, 3, :o6, 1048986000
-          tz.transition 2003, 10, :o5, 1067130000
-          tz.transition 2004, 3, :o6, 1080435600
-          tz.transition 2004, 10, :o5, 1099184400
-          tz.transition 2005, 3, :o6, 1111885200
-          tz.transition 2005, 10, :o5, 1130634000
-          tz.transition 2006, 3, :o6, 1143334800
-          tz.transition 2006, 10, :o5, 1162083600
-          tz.transition 2007, 3, :o6, 1174784400
-          tz.transition 2007, 10, :o5, 1193533200
-          tz.transition 2008, 3, :o6, 1206838800
-          tz.transition 2008, 10, :o5, 1224982800
-          tz.transition 2009, 3, :o6, 1238288400
-          tz.transition 2009, 10, :o5, 1256432400
-          tz.transition 2010, 3, :o6, 1269738000
-          tz.transition 2010, 10, :o5, 1288486800
-          tz.transition 2011, 3, :o6, 1301187600
-          tz.transition 2011, 10, :o5, 1319936400
-          tz.transition 2012, 3, :o6, 1332637200
-          tz.transition 2012, 10, :o5, 1351386000
-          tz.transition 2013, 3, :o6, 1364691600
-          tz.transition 2013, 10, :o5, 1382835600
-          tz.transition 2014, 3, :o6, 1396141200
-          tz.transition 2014, 10, :o5, 1414285200
-          tz.transition 2015, 3, :o6, 1427590800
-          tz.transition 2015, 10, :o5, 1445734800
-          tz.transition 2016, 3, :o6, 1459040400
-          tz.transition 2016, 10, :o5, 1477789200
-          tz.transition 2017, 3, :o6, 1490490000
-          tz.transition 2017, 10, :o5, 1509238800
-          tz.transition 2018, 3, :o6, 1521939600
-          tz.transition 2018, 10, :o5, 1540688400
-          tz.transition 2019, 3, :o6, 1553994000
-          tz.transition 2019, 10, :o5, 1572138000
-          tz.transition 2020, 3, :o6, 1585443600
-          tz.transition 2020, 10, :o5, 1603587600
-          tz.transition 2021, 3, :o6, 1616893200
-          tz.transition 2021, 10, :o5, 1635642000
-          tz.transition 2022, 3, :o6, 1648342800
-          tz.transition 2022, 10, :o5, 1667091600
-          tz.transition 2023, 3, :o6, 1679792400
-          tz.transition 2023, 10, :o5, 1698541200
-          tz.transition 2024, 3, :o6, 1711846800
-          tz.transition 2024, 10, :o5, 1729990800
-          tz.transition 2025, 3, :o6, 1743296400
-          tz.transition 2025, 10, :o5, 1761440400
-          tz.transition 2026, 3, :o6, 1774746000
-          tz.transition 2026, 10, :o5, 1792890000
-          tz.transition 2027, 3, :o6, 1806195600
-          tz.transition 2027, 10, :o5, 1824944400
-          tz.transition 2028, 3, :o6, 1837645200
-          tz.transition 2028, 10, :o5, 1856394000
-          tz.transition 2029, 3, :o6, 1869094800
-          tz.transition 2029, 10, :o5, 1887843600
-          tz.transition 2030, 3, :o6, 1901149200
-          tz.transition 2030, 10, :o5, 1919293200
-          tz.transition 2031, 3, :o6, 1932598800
-          tz.transition 2031, 10, :o5, 1950742800
-          tz.transition 2032, 3, :o6, 1964048400
-          tz.transition 2032, 10, :o5, 1982797200
-          tz.transition 2033, 3, :o6, 1995498000
-          tz.transition 2033, 10, :o5, 2014246800
-          tz.transition 2034, 3, :o6, 2026947600
-          tz.transition 2034, 10, :o5, 2045696400
-          tz.transition 2035, 3, :o6, 2058397200
-          tz.transition 2035, 10, :o5, 2077146000
-          tz.transition 2036, 3, :o6, 2090451600
-          tz.transition 2036, 10, :o5, 2108595600
-          tz.transition 2037, 3, :o6, 2121901200
-          tz.transition 2037, 10, :o5, 2140045200
-          tz.transition 2038, 3, :o6, 59172253, 24
-          tz.transition 2038, 10, :o5, 59177461, 24
-          tz.transition 2039, 3, :o6, 59180989, 24
-          tz.transition 2039, 10, :o5, 59186197, 24
-          tz.transition 2040, 3, :o6, 59189725, 24
-          tz.transition 2040, 10, :o5, 59194933, 24
-          tz.transition 2041, 3, :o6, 59198629, 24
-          tz.transition 2041, 10, :o5, 59203669, 24
-          tz.transition 2042, 3, :o6, 59207365, 24
-          tz.transition 2042, 10, :o5, 59212405, 24
-          tz.transition 2043, 3, :o6, 59216101, 24
-          tz.transition 2043, 10, :o5, 59221141, 24
-          tz.transition 2044, 3, :o6, 59224837, 24
-          tz.transition 2044, 10, :o5, 59230045, 24
-          tz.transition 2045, 3, :o6, 59233573, 24
-          tz.transition 2045, 10, :o5, 59238781, 24
-          tz.transition 2046, 3, :o6, 59242309, 24
-          tz.transition 2046, 10, :o5, 59247517, 24
-          tz.transition 2047, 3, :o6, 59251213, 24
-          tz.transition 2047, 10, :o5, 59256253, 24
-          tz.transition 2048, 3, :o6, 59259949, 24
-          tz.transition 2048, 10, :o5, 59264989, 24
-          tz.transition 2049, 3, :o6, 59268685, 24
-          tz.transition 2049, 10, :o5, 59273893, 24
-          tz.transition 2050, 3, :o6, 59277421, 24
-          tz.transition 2050, 10, :o5, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Moscow.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Moscow.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Moscow.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Moscow.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,181 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Moscow
-        include TimezoneDefinition
-        
-        timezone 'Europe/Moscow' do |tz|
-          tz.offset :o0, 9020, 0, :LMT
-          tz.offset :o1, 9000, 0, :MMT
-          tz.offset :o2, 9048, 0, :MMT
-          tz.offset :o3, 9048, 3600, :MST
-          tz.offset :o4, 9048, 7200, :MDST
-          tz.offset :o5, 10800, 3600, :MSD
-          tz.offset :o6, 10800, 0, :MSK
-          tz.offset :o7, 10800, 7200, :MSD
-          tz.offset :o8, 7200, 0, :EET
-          tz.offset :o9, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 10401330509, 4320
-          tz.transition 1916, 7, :o2, 116210275, 48
-          tz.transition 1917, 7, :o3, 8717080873, 3600
-          tz.transition 1917, 12, :o2, 8717725273, 3600
-          tz.transition 1918, 5, :o4, 8718283123, 3600
-          tz.transition 1918, 9, :o3, 8718668473, 3600
-          tz.transition 1919, 5, :o4, 8719597123, 3600
-          tz.transition 1919, 6, :o5, 8719705423, 3600
-          tz.transition 1919, 8, :o6, 7266559, 3
-          tz.transition 1921, 2, :o5, 7268206, 3
-          tz.transition 1921, 3, :o7, 58146463, 24
-          tz.transition 1921, 8, :o5, 58150399, 24
-          tz.transition 1921, 9, :o6, 7268890, 3
-          tz.transition 1922, 9, :o8, 19386627, 8
-          tz.transition 1930, 6, :o6, 29113781, 12
-          tz.transition 1981, 3, :o5, 354920400
-          tz.transition 1981, 9, :o6, 370728000
-          tz.transition 1982, 3, :o5, 386456400
-          tz.transition 1982, 9, :o6, 402264000
-          tz.transition 1983, 3, :o5, 417992400
-          tz.transition 1983, 9, :o6, 433800000
-          tz.transition 1984, 3, :o5, 449614800
-          tz.transition 1984, 9, :o6, 465346800
-          tz.transition 1985, 3, :o5, 481071600
-          tz.transition 1985, 9, :o6, 496796400
-          tz.transition 1986, 3, :o5, 512521200
-          tz.transition 1986, 9, :o6, 528246000
-          tz.transition 1987, 3, :o5, 543970800
-          tz.transition 1987, 9, :o6, 559695600
-          tz.transition 1988, 3, :o5, 575420400
-          tz.transition 1988, 9, :o6, 591145200
-          tz.transition 1989, 3, :o5, 606870000
-          tz.transition 1989, 9, :o6, 622594800
-          tz.transition 1990, 3, :o5, 638319600
-          tz.transition 1990, 9, :o6, 654649200
-          tz.transition 1991, 3, :o9, 670374000
-          tz.transition 1991, 9, :o8, 686102400
-          tz.transition 1992, 1, :o6, 695779200
-          tz.transition 1992, 3, :o5, 701812800
-          tz.transition 1992, 9, :o6, 717534000
-          tz.transition 1993, 3, :o5, 733273200
-          tz.transition 1993, 9, :o6, 748998000
-          tz.transition 1994, 3, :o5, 764722800
-          tz.transition 1994, 9, :o6, 780447600
-          tz.transition 1995, 3, :o5, 796172400
-          tz.transition 1995, 9, :o6, 811897200
-          tz.transition 1996, 3, :o5, 828226800
-          tz.transition 1996, 10, :o6, 846370800
-          tz.transition 1997, 3, :o5, 859676400
-          tz.transition 1997, 10, :o6, 877820400
-          tz.transition 1998, 3, :o5, 891126000
-          tz.transition 1998, 10, :o6, 909270000
-          tz.transition 1999, 3, :o5, 922575600
-          tz.transition 1999, 10, :o6, 941324400
-          tz.transition 2000, 3, :o5, 954025200
-          tz.transition 2000, 10, :o6, 972774000
-          tz.transition 2001, 3, :o5, 985474800
-          tz.transition 2001, 10, :o6, 1004223600
-          tz.transition 2002, 3, :o5, 1017529200
-          tz.transition 2002, 10, :o6, 1035673200
-          tz.transition 2003, 3, :o5, 1048978800
-          tz.transition 2003, 10, :o6, 1067122800
-          tz.transition 2004, 3, :o5, 1080428400
-          tz.transition 2004, 10, :o6, 1099177200
-          tz.transition 2005, 3, :o5, 1111878000
-          tz.transition 2005, 10, :o6, 1130626800
-          tz.transition 2006, 3, :o5, 1143327600
-          tz.transition 2006, 10, :o6, 1162076400
-          tz.transition 2007, 3, :o5, 1174777200
-          tz.transition 2007, 10, :o6, 1193526000
-          tz.transition 2008, 3, :o5, 1206831600
-          tz.transition 2008, 10, :o6, 1224975600
-          tz.transition 2009, 3, :o5, 1238281200
-          tz.transition 2009, 10, :o6, 1256425200
-          tz.transition 2010, 3, :o5, 1269730800
-          tz.transition 2010, 10, :o6, 1288479600
-          tz.transition 2011, 3, :o5, 1301180400
-          tz.transition 2011, 10, :o6, 1319929200
-          tz.transition 2012, 3, :o5, 1332630000
-          tz.transition 2012, 10, :o6, 1351378800
-          tz.transition 2013, 3, :o5, 1364684400
-          tz.transition 2013, 10, :o6, 1382828400
-          tz.transition 2014, 3, :o5, 1396134000
-          tz.transition 2014, 10, :o6, 1414278000
-          tz.transition 2015, 3, :o5, 1427583600
-          tz.transition 2015, 10, :o6, 1445727600
-          tz.transition 2016, 3, :o5, 1459033200
-          tz.transition 2016, 10, :o6, 1477782000
-          tz.transition 2017, 3, :o5, 1490482800
-          tz.transition 2017, 10, :o6, 1509231600
-          tz.transition 2018, 3, :o5, 1521932400
-          tz.transition 2018, 10, :o6, 1540681200
-          tz.transition 2019, 3, :o5, 1553986800
-          tz.transition 2019, 10, :o6, 1572130800
-          tz.transition 2020, 3, :o5, 1585436400
-          tz.transition 2020, 10, :o6, 1603580400
-          tz.transition 2021, 3, :o5, 1616886000
-          tz.transition 2021, 10, :o6, 1635634800
-          tz.transition 2022, 3, :o5, 1648335600
-          tz.transition 2022, 10, :o6, 1667084400
-          tz.transition 2023, 3, :o5, 1679785200
-          tz.transition 2023, 10, :o6, 1698534000
-          tz.transition 2024, 3, :o5, 1711839600
-          tz.transition 2024, 10, :o6, 1729983600
-          tz.transition 2025, 3, :o5, 1743289200
-          tz.transition 2025, 10, :o6, 1761433200
-          tz.transition 2026, 3, :o5, 1774738800
-          tz.transition 2026, 10, :o6, 1792882800
-          tz.transition 2027, 3, :o5, 1806188400
-          tz.transition 2027, 10, :o6, 1824937200
-          tz.transition 2028, 3, :o5, 1837638000
-          tz.transition 2028, 10, :o6, 1856386800
-          tz.transition 2029, 3, :o5, 1869087600
-          tz.transition 2029, 10, :o6, 1887836400
-          tz.transition 2030, 3, :o5, 1901142000
-          tz.transition 2030, 10, :o6, 1919286000
-          tz.transition 2031, 3, :o5, 1932591600
-          tz.transition 2031, 10, :o6, 1950735600
-          tz.transition 2032, 3, :o5, 1964041200
-          tz.transition 2032, 10, :o6, 1982790000
-          tz.transition 2033, 3, :o5, 1995490800
-          tz.transition 2033, 10, :o6, 2014239600
-          tz.transition 2034, 3, :o5, 2026940400
-          tz.transition 2034, 10, :o6, 2045689200
-          tz.transition 2035, 3, :o5, 2058390000
-          tz.transition 2035, 10, :o6, 2077138800
-          tz.transition 2036, 3, :o5, 2090444400
-          tz.transition 2036, 10, :o6, 2108588400
-          tz.transition 2037, 3, :o5, 2121894000
-          tz.transition 2037, 10, :o6, 2140038000
-          tz.transition 2038, 3, :o5, 59172251, 24
-          tz.transition 2038, 10, :o6, 59177459, 24
-          tz.transition 2039, 3, :o5, 59180987, 24
-          tz.transition 2039, 10, :o6, 59186195, 24
-          tz.transition 2040, 3, :o5, 59189723, 24
-          tz.transition 2040, 10, :o6, 59194931, 24
-          tz.transition 2041, 3, :o5, 59198627, 24
-          tz.transition 2041, 10, :o6, 59203667, 24
-          tz.transition 2042, 3, :o5, 59207363, 24
-          tz.transition 2042, 10, :o6, 59212403, 24
-          tz.transition 2043, 3, :o5, 59216099, 24
-          tz.transition 2043, 10, :o6, 59221139, 24
-          tz.transition 2044, 3, :o5, 59224835, 24
-          tz.transition 2044, 10, :o6, 59230043, 24
-          tz.transition 2045, 3, :o5, 59233571, 24
-          tz.transition 2045, 10, :o6, 59238779, 24
-          tz.transition 2046, 3, :o5, 59242307, 24
-          tz.transition 2046, 10, :o6, 59247515, 24
-          tz.transition 2047, 3, :o5, 59251211, 24
-          tz.transition 2047, 10, :o6, 59256251, 24
-          tz.transition 2048, 3, :o5, 59259947, 24
-          tz.transition 2048, 10, :o6, 59264987, 24
-          tz.transition 2049, 3, :o5, 59268683, 24
-          tz.transition 2049, 10, :o6, 59273891, 24
-          tz.transition 2050, 3, :o5, 59277419, 24
-          tz.transition 2050, 10, :o6, 59282627, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Nicosia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Nicosia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Nicosia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Nicosia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Nicosia
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Nicosia', 'Asia/Nicosia'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Oslo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Oslo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Oslo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Oslo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Oslo
-        include TimezoneDefinition
-        
-        timezone 'Europe/Oslo' do |tz|
-          tz.offset :o0, 2580, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1894, 12, :o1, 3475000037, 1440
-          tz.transition 1916, 5, :o2, 4842011, 2
-          tz.transition 1916, 9, :o1, 29053637, 12
-          tz.transition 1940, 8, :o2, 29158229, 12
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 4, :o2, 58357141, 24
-          tz.transition 1945, 10, :o1, 58361509, 24
-          tz.transition 1959, 3, :o2, 58479421, 24
-          tz.transition 1959, 9, :o1, 58483957, 24
-          tz.transition 1960, 3, :o2, 58488325, 24
-          tz.transition 1960, 9, :o1, 58492693, 24
-          tz.transition 1961, 3, :o2, 58497061, 24
-          tz.transition 1961, 9, :o1, 58501429, 24
-          tz.transition 1962, 3, :o2, 58505797, 24
-          tz.transition 1962, 9, :o1, 58510165, 24
-          tz.transition 1963, 3, :o2, 58514533, 24
-          tz.transition 1963, 9, :o1, 58518901, 24
-          tz.transition 1964, 3, :o2, 58523269, 24
-          tz.transition 1964, 9, :o1, 58527805, 24
-          tz.transition 1965, 4, :o2, 58533013, 24
-          tz.transition 1965, 9, :o1, 58536541, 24
-          tz.transition 1980, 4, :o2, 323830800
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Paris.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Paris.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Paris.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Paris.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,232 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Paris
-        include TimezoneDefinition
-        
-        timezone 'Europe/Paris' do |tz|
-          tz.offset :o0, 561, 0, :LMT
-          tz.offset :o1, 561, 0, :PMT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 0, 3600, :WEST
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 0, 7200, :WEMT
-          
-          tz.transition 1891, 3, :o1, 69460027033, 28800
-          tz.transition 1911, 3, :o2, 69670267033, 28800
-          tz.transition 1916, 6, :o3, 58104707, 24
-          tz.transition 1916, 10, :o2, 58107323, 24
-          tz.transition 1917, 3, :o3, 58111499, 24
-          tz.transition 1917, 10, :o2, 58116227, 24
-          tz.transition 1918, 3, :o3, 58119899, 24
-          tz.transition 1918, 10, :o2, 58124963, 24
-          tz.transition 1919, 3, :o3, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133699, 24
-          tz.transition 1920, 2, :o3, 58136867, 24
-          tz.transition 1920, 10, :o2, 58142915, 24
-          tz.transition 1921, 3, :o3, 58146323, 24
-          tz.transition 1921, 10, :o2, 58151723, 24
-          tz.transition 1922, 3, :o3, 58155347, 24
-          tz.transition 1922, 10, :o2, 58160051, 24
-          tz.transition 1923, 5, :o3, 58165595, 24
-          tz.transition 1923, 10, :o2, 58168787, 24
-          tz.transition 1924, 3, :o3, 58172987, 24
-          tz.transition 1924, 10, :o2, 58177523, 24
-          tz.transition 1925, 4, :o3, 58181891, 24
-          tz.transition 1925, 10, :o2, 58186259, 24
-          tz.transition 1926, 4, :o3, 58190963, 24
-          tz.transition 1926, 10, :o2, 58194995, 24
-          tz.transition 1927, 4, :o3, 58199531, 24
-          tz.transition 1927, 10, :o2, 58203731, 24
-          tz.transition 1928, 4, :o3, 58208435, 24
-          tz.transition 1928, 10, :o2, 58212635, 24
-          tz.transition 1929, 4, :o3, 58217339, 24
-          tz.transition 1929, 10, :o2, 58221371, 24
-          tz.transition 1930, 4, :o3, 58225907, 24
-          tz.transition 1930, 10, :o2, 58230107, 24
-          tz.transition 1931, 4, :o3, 58234811, 24
-          tz.transition 1931, 10, :o2, 58238843, 24
-          tz.transition 1932, 4, :o3, 58243211, 24
-          tz.transition 1932, 10, :o2, 58247579, 24
-          tz.transition 1933, 3, :o3, 58251779, 24
-          tz.transition 1933, 10, :o2, 58256483, 24
-          tz.transition 1934, 4, :o3, 58260851, 24
-          tz.transition 1934, 10, :o2, 58265219, 24
-          tz.transition 1935, 3, :o3, 58269419, 24
-          tz.transition 1935, 10, :o2, 58273955, 24
-          tz.transition 1936, 4, :o3, 58278659, 24
-          tz.transition 1936, 10, :o2, 58282691, 24
-          tz.transition 1937, 4, :o3, 58287059, 24
-          tz.transition 1937, 10, :o2, 58291427, 24
-          tz.transition 1938, 3, :o3, 58295627, 24
-          tz.transition 1938, 10, :o2, 58300163, 24
-          tz.transition 1939, 4, :o3, 58304867, 24
-          tz.transition 1939, 11, :o2, 58310075, 24
-          tz.transition 1940, 2, :o3, 29156215, 12
-          tz.transition 1940, 6, :o4, 29157545, 12
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 8, :o6, 29175929, 12
-          tz.transition 1944, 10, :o3, 58352915, 24
-          tz.transition 1945, 4, :o6, 58357141, 24
-          tz.transition 1945, 9, :o5, 58361149, 24
-          tz.transition 1976, 3, :o4, 196819200
-          tz.transition 1976, 9, :o5, 212540400
-          tz.transition 1977, 4, :o4, 228877200
-          tz.transition 1977, 9, :o5, 243997200
-          tz.transition 1978, 4, :o4, 260326800
-          tz.transition 1978, 10, :o5, 276051600
-          tz.transition 1979, 4, :o4, 291776400
-          tz.transition 1979, 9, :o5, 307501200
-          tz.transition 1980, 4, :o4, 323830800
-          tz.transition 1980, 9, :o5, 338950800
-          tz.transition 1981, 3, :o4, 354675600
-          tz.transition 1981, 9, :o5, 370400400
-          tz.transition 1982, 3, :o4, 386125200
-          tz.transition 1982, 9, :o5, 401850000
-          tz.transition 1983, 3, :o4, 417574800
-          tz.transition 1983, 9, :o5, 433299600
-          tz.transition 1984, 3, :o4, 449024400
-          tz.transition 1984, 9, :o5, 465354000
-          tz.transition 1985, 3, :o4, 481078800
-          tz.transition 1985, 9, :o5, 496803600
-          tz.transition 1986, 3, :o4, 512528400
-          tz.transition 1986, 9, :o5, 528253200
-          tz.transition 1987, 3, :o4, 543978000
-          tz.transition 1987, 9, :o5, 559702800
-          tz.transition 1988, 3, :o4, 575427600
-          tz.transition 1988, 9, :o5, 591152400
-          tz.transition 1989, 3, :o4, 606877200
-          tz.transition 1989, 9, :o5, 622602000
-          tz.transition 1990, 3, :o4, 638326800
-          tz.transition 1990, 9, :o5, 654656400
-          tz.transition 1991, 3, :o4, 670381200
-          tz.transition 1991, 9, :o5, 686106000
-          tz.transition 1992, 3, :o4, 701830800
-          tz.transition 1992, 9, :o5, 717555600
-          tz.transition 1993, 3, :o4, 733280400
-          tz.transition 1993, 9, :o5, 749005200
-          tz.transition 1994, 3, :o4, 764730000
-          tz.transition 1994, 9, :o5, 780454800
-          tz.transition 1995, 3, :o4, 796179600
-          tz.transition 1995, 9, :o5, 811904400
-          tz.transition 1996, 3, :o4, 828234000
-          tz.transition 1996, 10, :o5, 846378000
-          tz.transition 1997, 3, :o4, 859683600
-          tz.transition 1997, 10, :o5, 877827600
-          tz.transition 1998, 3, :o4, 891133200
-          tz.transition 1998, 10, :o5, 909277200
-          tz.transition 1999, 3, :o4, 922582800
-          tz.transition 1999, 10, :o5, 941331600
-          tz.transition 2000, 3, :o4, 954032400
-          tz.transition 2000, 10, :o5, 972781200
-          tz.transition 2001, 3, :o4, 985482000
-          tz.transition 2001, 10, :o5, 1004230800
-          tz.transition 2002, 3, :o4, 1017536400
-          tz.transition 2002, 10, :o5, 1035680400
-          tz.transition 2003, 3, :o4, 1048986000
-          tz.transition 2003, 10, :o5, 1067130000
-          tz.transition 2004, 3, :o4, 1080435600
-          tz.transition 2004, 10, :o5, 1099184400
-          tz.transition 2005, 3, :o4, 1111885200
-          tz.transition 2005, 10, :o5, 1130634000
-          tz.transition 2006, 3, :o4, 1143334800
-          tz.transition 2006, 10, :o5, 1162083600
-          tz.transition 2007, 3, :o4, 1174784400
-          tz.transition 2007, 10, :o5, 1193533200
-          tz.transition 2008, 3, :o4, 1206838800
-          tz.transition 2008, 10, :o5, 1224982800
-          tz.transition 2009, 3, :o4, 1238288400
-          tz.transition 2009, 10, :o5, 1256432400
-          tz.transition 2010, 3, :o4, 1269738000
-          tz.transition 2010, 10, :o5, 1288486800
-          tz.transition 2011, 3, :o4, 1301187600
-          tz.transition 2011, 10, :o5, 1319936400
-          tz.transition 2012, 3, :o4, 1332637200
-          tz.transition 2012, 10, :o5, 1351386000
-          tz.transition 2013, 3, :o4, 1364691600
-          tz.transition 2013, 10, :o5, 1382835600
-          tz.transition 2014, 3, :o4, 1396141200
-          tz.transition 2014, 10, :o5, 1414285200
-          tz.transition 2015, 3, :o4, 1427590800
-          tz.transition 2015, 10, :o5, 1445734800
-          tz.transition 2016, 3, :o4, 1459040400
-          tz.transition 2016, 10, :o5, 1477789200
-          tz.transition 2017, 3, :o4, 1490490000
-          tz.transition 2017, 10, :o5, 1509238800
-          tz.transition 2018, 3, :o4, 1521939600
-          tz.transition 2018, 10, :o5, 1540688400
-          tz.transition 2019, 3, :o4, 1553994000
-          tz.transition 2019, 10, :o5, 1572138000
-          tz.transition 2020, 3, :o4, 1585443600
-          tz.transition 2020, 10, :o5, 1603587600
-          tz.transition 2021, 3, :o4, 1616893200
-          tz.transition 2021, 10, :o5, 1635642000
-          tz.transition 2022, 3, :o4, 1648342800
-          tz.transition 2022, 10, :o5, 1667091600
-          tz.transition 2023, 3, :o4, 1679792400
-          tz.transition 2023, 10, :o5, 1698541200
-          tz.transition 2024, 3, :o4, 1711846800
-          tz.transition 2024, 10, :o5, 1729990800
-          tz.transition 2025, 3, :o4, 1743296400
-          tz.transition 2025, 10, :o5, 1761440400
-          tz.transition 2026, 3, :o4, 1774746000
-          tz.transition 2026, 10, :o5, 1792890000
-          tz.transition 2027, 3, :o4, 1806195600
-          tz.transition 2027, 10, :o5, 1824944400
-          tz.transition 2028, 3, :o4, 1837645200
-          tz.transition 2028, 10, :o5, 1856394000
-          tz.transition 2029, 3, :o4, 1869094800
-          tz.transition 2029, 10, :o5, 1887843600
-          tz.transition 2030, 3, :o4, 1901149200
-          tz.transition 2030, 10, :o5, 1919293200
-          tz.transition 2031, 3, :o4, 1932598800
-          tz.transition 2031, 10, :o5, 1950742800
-          tz.transition 2032, 3, :o4, 1964048400
-          tz.transition 2032, 10, :o5, 1982797200
-          tz.transition 2033, 3, :o4, 1995498000
-          tz.transition 2033, 10, :o5, 2014246800
-          tz.transition 2034, 3, :o4, 2026947600
-          tz.transition 2034, 10, :o5, 2045696400
-          tz.transition 2035, 3, :o4, 2058397200
-          tz.transition 2035, 10, :o5, 2077146000
-          tz.transition 2036, 3, :o4, 2090451600
-          tz.transition 2036, 10, :o5, 2108595600
-          tz.transition 2037, 3, :o4, 2121901200
-          tz.transition 2037, 10, :o5, 2140045200
-          tz.transition 2038, 3, :o4, 59172253, 24
-          tz.transition 2038, 10, :o5, 59177461, 24
-          tz.transition 2039, 3, :o4, 59180989, 24
-          tz.transition 2039, 10, :o5, 59186197, 24
-          tz.transition 2040, 3, :o4, 59189725, 24
-          tz.transition 2040, 10, :o5, 59194933, 24
-          tz.transition 2041, 3, :o4, 59198629, 24
-          tz.transition 2041, 10, :o5, 59203669, 24
-          tz.transition 2042, 3, :o4, 59207365, 24
-          tz.transition 2042, 10, :o5, 59212405, 24
-          tz.transition 2043, 3, :o4, 59216101, 24
-          tz.transition 2043, 10, :o5, 59221141, 24
-          tz.transition 2044, 3, :o4, 59224837, 24
-          tz.transition 2044, 10, :o5, 59230045, 24
-          tz.transition 2045, 3, :o4, 59233573, 24
-          tz.transition 2045, 10, :o5, 59238781, 24
-          tz.transition 2046, 3, :o4, 59242309, 24
-          tz.transition 2046, 10, :o5, 59247517, 24
-          tz.transition 2047, 3, :o4, 59251213, 24
-          tz.transition 2047, 10, :o5, 59256253, 24
-          tz.transition 2048, 3, :o4, 59259949, 24
-          tz.transition 2048, 10, :o5, 59264989, 24
-          tz.transition 2049, 3, :o4, 59268685, 24
-          tz.transition 2049, 10, :o5, 59273893, 24
-          tz.transition 2050, 3, :o4, 59277421, 24
-          tz.transition 2050, 10, :o5, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Podgorica.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Podgorica.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Podgorica.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Podgorica.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Podgorica
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Podgorica', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Prague.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Prague.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Prague.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Prague.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,187 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Prague
-        include TimezoneDefinition
-        
-        timezone 'Europe/Prague' do |tz|
-          tz.offset :o0, 3464, 0, :LMT
-          tz.offset :o1, 3464, 0, :PMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1849, 12, :o1, 25884991367, 10800
-          tz.transition 1891, 9, :o2, 26049669767, 10800
-          tz.transition 1916, 4, :o3, 29051813, 12
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1917, 4, :o3, 58112029, 24
-          tz.transition 1917, 9, :o2, 58115725, 24
-          tz.transition 1918, 4, :o3, 58120765, 24
-          tz.transition 1918, 9, :o2, 58124461, 24
-          tz.transition 1940, 4, :o3, 58313293, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 9, :o2, 58352413, 24
-          tz.transition 1945, 4, :o3, 58357285, 24
-          tz.transition 1945, 11, :o2, 58362661, 24
-          tz.transition 1946, 5, :o3, 58366717, 24
-          tz.transition 1946, 10, :o2, 58370389, 24
-          tz.transition 1947, 4, :o3, 58375093, 24
-          tz.transition 1947, 10, :o2, 58379125, 24
-          tz.transition 1948, 4, :o3, 58383829, 24
-          tz.transition 1948, 10, :o2, 58387861, 24
-          tz.transition 1949, 4, :o3, 58392373, 24
-          tz.transition 1949, 10, :o2, 58396597, 24
-          tz.transition 1979, 4, :o3, 291776400
-          tz.transition 1979, 9, :o2, 307501200
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Riga.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Riga.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Riga.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Riga.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,176 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Riga
-        include TimezoneDefinition
-        
-        timezone 'Europe/Riga' do |tz|
-          tz.offset :o0, 5784, 0, :LMT
-          tz.offset :o1, 5784, 0, :RMT
-          tz.offset :o2, 5784, 3600, :LST
-          tz.offset :o3, 7200, 0, :EET
-          tz.offset :o4, 10800, 0, :MSK
-          tz.offset :o5, 3600, 3600, :CEST
-          tz.offset :o6, 3600, 0, :CET
-          tz.offset :o7, 10800, 3600, :MSD
-          tz.offset :o8, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 8667775559, 3600
-          tz.transition 1918, 4, :o2, 8718114659, 3600
-          tz.transition 1918, 9, :o1, 8718669059, 3600
-          tz.transition 1919, 4, :o2, 8719378259, 3600
-          tz.transition 1919, 5, :o1, 8719561859, 3600
-          tz.transition 1926, 5, :o3, 8728727159, 3600
-          tz.transition 1940, 8, :o4, 29158157, 12
-          tz.transition 1941, 6, :o5, 19441411, 8
-          tz.transition 1942, 11, :o6, 58335973, 24
-          tz.transition 1943, 3, :o5, 58339501, 24
-          tz.transition 1943, 10, :o6, 58344037, 24
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 10, :o6, 58352773, 24
-          tz.transition 1944, 10, :o4, 58353035, 24
-          tz.transition 1981, 3, :o7, 354920400
-          tz.transition 1981, 9, :o4, 370728000
-          tz.transition 1982, 3, :o7, 386456400
-          tz.transition 1982, 9, :o4, 402264000
-          tz.transition 1983, 3, :o7, 417992400
-          tz.transition 1983, 9, :o4, 433800000
-          tz.transition 1984, 3, :o7, 449614800
-          tz.transition 1984, 9, :o4, 465346800
-          tz.transition 1985, 3, :o7, 481071600
-          tz.transition 1985, 9, :o4, 496796400
-          tz.transition 1986, 3, :o7, 512521200
-          tz.transition 1986, 9, :o4, 528246000
-          tz.transition 1987, 3, :o7, 543970800
-          tz.transition 1987, 9, :o4, 559695600
-          tz.transition 1988, 3, :o7, 575420400
-          tz.transition 1988, 9, :o4, 591145200
-          tz.transition 1989, 3, :o8, 606870000
-          tz.transition 1989, 9, :o3, 622598400
-          tz.transition 1990, 3, :o8, 638323200
-          tz.transition 1990, 9, :o3, 654652800
-          tz.transition 1991, 3, :o8, 670377600
-          tz.transition 1991, 9, :o3, 686102400
-          tz.transition 1992, 3, :o8, 701827200
-          tz.transition 1992, 9, :o3, 717552000
-          tz.transition 1993, 3, :o8, 733276800
-          tz.transition 1993, 9, :o3, 749001600
-          tz.transition 1994, 3, :o8, 764726400
-          tz.transition 1994, 9, :o3, 780451200
-          tz.transition 1995, 3, :o8, 796176000
-          tz.transition 1995, 9, :o3, 811900800
-          tz.transition 1996, 3, :o8, 828230400
-          tz.transition 1996, 9, :o3, 843955200
-          tz.transition 1997, 3, :o8, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o8, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o8, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2001, 3, :o8, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o8, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o8, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o8, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o8, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o8, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o8, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o8, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o8, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o8, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o8, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o8, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o8, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o8, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o8, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o8, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o8, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o8, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o8, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o8, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o8, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o8, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o8, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o8, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o8, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o8, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o8, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o8, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o8, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o8, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o8, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o8, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o8, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o8, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o8, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o8, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o8, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o8, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o8, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o8, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o8, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o8, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o8, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o8, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o8, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o8, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o8, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o8, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o8, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o8, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Rome.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Rome.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Rome.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Rome.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,215 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Rome
-        include TimezoneDefinition
-        
-        timezone 'Europe/Rome' do |tz|
-          tz.offset :o0, 2996, 0, :LMT
-          tz.offset :o1, 2996, 0, :RMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1866, 9, :o1, 51901915651, 21600
-          tz.transition 1893, 10, :o2, 52115798851, 21600
-          tz.transition 1916, 6, :o3, 58104419, 24
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1917, 3, :o3, 58111667, 24
-          tz.transition 1917, 9, :o2, 58116035, 24
-          tz.transition 1918, 3, :o3, 58119899, 24
-          tz.transition 1918, 10, :o2, 58124939, 24
-          tz.transition 1919, 3, :o3, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133675, 24
-          tz.transition 1920, 3, :o3, 58137707, 24
-          tz.transition 1920, 9, :o2, 58142075, 24
-          tz.transition 1940, 6, :o3, 58315091, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 9, :o2, 58352411, 24
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 9, :o2, 58361123, 24
-          tz.transition 1946, 3, :o3, 58365517, 24
-          tz.transition 1946, 10, :o2, 58370389, 24
-          tz.transition 1947, 3, :o3, 58374251, 24
-          tz.transition 1947, 10, :o2, 58379123, 24
-          tz.transition 1948, 2, :o3, 58382653, 24
-          tz.transition 1948, 10, :o2, 58387861, 24
-          tz.transition 1966, 5, :o3, 58542419, 24
-          tz.transition 1966, 9, :o2, 29272721, 12
-          tz.transition 1967, 5, :o3, 58551323, 24
-          tz.transition 1967, 9, :o2, 29277089, 12
-          tz.transition 1968, 5, :o3, 58560059, 24
-          tz.transition 1968, 9, :o2, 29281457, 12
-          tz.transition 1969, 5, :o3, 58568963, 24
-          tz.transition 1969, 9, :o2, 29285909, 12
-          tz.transition 1970, 5, :o3, 12956400
-          tz.transition 1970, 9, :o2, 23234400
-          tz.transition 1971, 5, :o3, 43801200
-          tz.transition 1971, 9, :o2, 54687600
-          tz.transition 1972, 5, :o3, 75855600
-          tz.transition 1972, 9, :o2, 86738400
-          tz.transition 1973, 6, :o3, 107910000
-          tz.transition 1973, 9, :o2, 118188000
-          tz.transition 1974, 5, :o3, 138754800
-          tz.transition 1974, 9, :o2, 149637600
-          tz.transition 1975, 5, :o3, 170809200
-          tz.transition 1975, 9, :o2, 181090800
-          tz.transition 1976, 5, :o3, 202258800
-          tz.transition 1976, 9, :o2, 212540400
-          tz.transition 1977, 5, :o3, 233103600
-          tz.transition 1977, 9, :o2, 243990000
-          tz.transition 1978, 5, :o3, 265158000
-          tz.transition 1978, 9, :o2, 276044400
-          tz.transition 1979, 5, :o3, 296607600
-          tz.transition 1979, 9, :o2, 307494000
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Samara.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Samara.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Samara.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Samara.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,168 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Samara
-        include TimezoneDefinition
-        
-        timezone 'Europe/Samara' do |tz|
-          tz.offset :o0, 12036, 0, :LMT
-          tz.offset :o1, 10800, 0, :SAMT
-          tz.offset :o2, 14400, 0, :SAMT
-          tz.offset :o3, 14400, 0, :KUYT
-          tz.offset :o4, 14400, 3600, :KUYST
-          tz.offset :o5, 10800, 3600, :KUYST
-          tz.offset :o6, 10800, 0, :KUYT
-          tz.offset :o7, 7200, 3600, :KUYST
-          tz.offset :o8, 14400, 3600, :SAMST
-          
-          tz.transition 1919, 6, :o1, 17439411197, 7200
-          tz.transition 1930, 6, :o2, 19409187, 8
-          tz.transition 1935, 1, :o3, 7283488, 3
-          tz.transition 1981, 3, :o4, 354916800
-          tz.transition 1981, 9, :o3, 370724400
-          tz.transition 1982, 3, :o4, 386452800
-          tz.transition 1982, 9, :o3, 402260400
-          tz.transition 1983, 3, :o4, 417988800
-          tz.transition 1983, 9, :o3, 433796400
-          tz.transition 1984, 3, :o4, 449611200
-          tz.transition 1984, 9, :o3, 465343200
-          tz.transition 1985, 3, :o4, 481068000
-          tz.transition 1985, 9, :o3, 496792800
-          tz.transition 1986, 3, :o4, 512517600
-          tz.transition 1986, 9, :o3, 528242400
-          tz.transition 1987, 3, :o4, 543967200
-          tz.transition 1987, 9, :o3, 559692000
-          tz.transition 1988, 3, :o4, 575416800
-          tz.transition 1988, 9, :o3, 591141600
-          tz.transition 1989, 3, :o5, 606866400
-          tz.transition 1989, 9, :o6, 622594800
-          tz.transition 1990, 3, :o5, 638319600
-          tz.transition 1990, 9, :o6, 654649200
-          tz.transition 1991, 3, :o7, 670374000
-          tz.transition 1991, 9, :o6, 686102400
-          tz.transition 1991, 10, :o2, 687916800
-          tz.transition 1992, 3, :o8, 701809200
-          tz.transition 1992, 9, :o2, 717530400
-          tz.transition 1993, 3, :o8, 733269600
-          tz.transition 1993, 9, :o2, 748994400
-          tz.transition 1994, 3, :o8, 764719200
-          tz.transition 1994, 9, :o2, 780444000
-          tz.transition 1995, 3, :o8, 796168800
-          tz.transition 1995, 9, :o2, 811893600
-          tz.transition 1996, 3, :o8, 828223200
-          tz.transition 1996, 10, :o2, 846367200
-          tz.transition 1997, 3, :o8, 859672800
-          tz.transition 1997, 10, :o2, 877816800
-          tz.transition 1998, 3, :o8, 891122400
-          tz.transition 1998, 10, :o2, 909266400
-          tz.transition 1999, 3, :o8, 922572000
-          tz.transition 1999, 10, :o2, 941320800
-          tz.transition 2000, 3, :o8, 954021600
-          tz.transition 2000, 10, :o2, 972770400
-          tz.transition 2001, 3, :o8, 985471200
-          tz.transition 2001, 10, :o2, 1004220000
-          tz.transition 2002, 3, :o8, 1017525600
-          tz.transition 2002, 10, :o2, 1035669600
-          tz.transition 2003, 3, :o8, 1048975200
-          tz.transition 2003, 10, :o2, 1067119200
-          tz.transition 2004, 3, :o8, 1080424800
-          tz.transition 2004, 10, :o2, 1099173600
-          tz.transition 2005, 3, :o8, 1111874400
-          tz.transition 2005, 10, :o2, 1130623200
-          tz.transition 2006, 3, :o8, 1143324000
-          tz.transition 2006, 10, :o2, 1162072800
-          tz.transition 2007, 3, :o8, 1174773600
-          tz.transition 2007, 10, :o2, 1193522400
-          tz.transition 2008, 3, :o8, 1206828000
-          tz.transition 2008, 10, :o2, 1224972000
-          tz.transition 2009, 3, :o8, 1238277600
-          tz.transition 2009, 10, :o2, 1256421600
-          tz.transition 2010, 3, :o8, 1269727200
-          tz.transition 2010, 10, :o2, 1288476000
-          tz.transition 2011, 3, :o8, 1301176800
-          tz.transition 2011, 10, :o2, 1319925600
-          tz.transition 2012, 3, :o8, 1332626400
-          tz.transition 2012, 10, :o2, 1351375200
-          tz.transition 2013, 3, :o8, 1364680800
-          tz.transition 2013, 10, :o2, 1382824800
-          tz.transition 2014, 3, :o8, 1396130400
-          tz.transition 2014, 10, :o2, 1414274400
-          tz.transition 2015, 3, :o8, 1427580000
-          tz.transition 2015, 10, :o2, 1445724000
-          tz.transition 2016, 3, :o8, 1459029600
-          tz.transition 2016, 10, :o2, 1477778400
-          tz.transition 2017, 3, :o8, 1490479200
-          tz.transition 2017, 10, :o2, 1509228000
-          tz.transition 2018, 3, :o8, 1521928800
-          tz.transition 2018, 10, :o2, 1540677600
-          tz.transition 2019, 3, :o8, 1553983200
-          tz.transition 2019, 10, :o2, 1572127200
-          tz.transition 2020, 3, :o8, 1585432800
-          tz.transition 2020, 10, :o2, 1603576800
-          tz.transition 2021, 3, :o8, 1616882400
-          tz.transition 2021, 10, :o2, 1635631200
-          tz.transition 2022, 3, :o8, 1648332000
-          tz.transition 2022, 10, :o2, 1667080800
-          tz.transition 2023, 3, :o8, 1679781600
-          tz.transition 2023, 10, :o2, 1698530400
-          tz.transition 2024, 3, :o8, 1711836000
-          tz.transition 2024, 10, :o2, 1729980000
-          tz.transition 2025, 3, :o8, 1743285600
-          tz.transition 2025, 10, :o2, 1761429600
-          tz.transition 2026, 3, :o8, 1774735200
-          tz.transition 2026, 10, :o2, 1792879200
-          tz.transition 2027, 3, :o8, 1806184800
-          tz.transition 2027, 10, :o2, 1824933600
-          tz.transition 2028, 3, :o8, 1837634400
-          tz.transition 2028, 10, :o2, 1856383200
-          tz.transition 2029, 3, :o8, 1869084000
-          tz.transition 2029, 10, :o2, 1887832800
-          tz.transition 2030, 3, :o8, 1901138400
-          tz.transition 2030, 10, :o2, 1919282400
-          tz.transition 2031, 3, :o8, 1932588000
-          tz.transition 2031, 10, :o2, 1950732000
-          tz.transition 2032, 3, :o8, 1964037600
-          tz.transition 2032, 10, :o2, 1982786400
-          tz.transition 2033, 3, :o8, 1995487200
-          tz.transition 2033, 10, :o2, 2014236000
-          tz.transition 2034, 3, :o8, 2026936800
-          tz.transition 2034, 10, :o2, 2045685600
-          tz.transition 2035, 3, :o8, 2058386400
-          tz.transition 2035, 10, :o2, 2077135200
-          tz.transition 2036, 3, :o8, 2090440800
-          tz.transition 2036, 10, :o2, 2108584800
-          tz.transition 2037, 3, :o8, 2121890400
-          tz.transition 2037, 10, :o2, 2140034400
-          tz.transition 2038, 3, :o8, 29586125, 12
-          tz.transition 2038, 10, :o2, 29588729, 12
-          tz.transition 2039, 3, :o8, 29590493, 12
-          tz.transition 2039, 10, :o2, 29593097, 12
-          tz.transition 2040, 3, :o8, 29594861, 12
-          tz.transition 2040, 10, :o2, 29597465, 12
-          tz.transition 2041, 3, :o8, 29599313, 12
-          tz.transition 2041, 10, :o2, 29601833, 12
-          tz.transition 2042, 3, :o8, 29603681, 12
-          tz.transition 2042, 10, :o2, 29606201, 12
-          tz.transition 2043, 3, :o8, 29608049, 12
-          tz.transition 2043, 10, :o2, 29610569, 12
-          tz.transition 2044, 3, :o8, 29612417, 12
-          tz.transition 2044, 10, :o2, 29615021, 12
-          tz.transition 2045, 3, :o8, 29616785, 12
-          tz.transition 2045, 10, :o2, 29619389, 12
-          tz.transition 2046, 3, :o8, 29621153, 12
-          tz.transition 2046, 10, :o2, 29623757, 12
-          tz.transition 2047, 3, :o8, 29625605, 12
-          tz.transition 2047, 10, :o2, 29628125, 12
-          tz.transition 2048, 3, :o8, 29629973, 12
-          tz.transition 2048, 10, :o2, 29632493, 12
-          tz.transition 2049, 3, :o8, 29634341, 12
-          tz.transition 2049, 10, :o2, 29636945, 12
-          tz.transition 2050, 3, :o8, 29638709, 12
-          tz.transition 2050, 10, :o2, 29641313, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/San_Marino.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/San_Marino.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/San_Marino.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/San_Marino.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module San_Marino
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/San_Marino', 'Europe/Rome'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sarajevo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sarajevo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sarajevo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sarajevo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Sarajevo
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Sarajevo', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Simferopol.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Simferopol.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Simferopol.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Simferopol.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,170 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Simferopol
-        include TimezoneDefinition
-        
-        timezone 'Europe/Simferopol' do |tz|
-          tz.offset :o0, 8184, 0, :LMT
-          tz.offset :o1, 8160, 0, :SMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 10800, 0, :MSK
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 8667775459, 3600
-          tz.transition 1924, 5, :o2, 436303333, 180
-          tz.transition 1930, 6, :o3, 29113781, 12
-          tz.transition 1941, 10, :o4, 19442395, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 4, :o3, 29174321, 12
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o3, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o3, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o3, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o3, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o3, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o3, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o3, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o3, 591145200
-          tz.transition 1989, 3, :o6, 606870000
-          tz.transition 1989, 9, :o3, 622594800
-          tz.transition 1990, 6, :o2, 646786800
-          tz.transition 1992, 3, :o7, 701820000
-          tz.transition 1992, 9, :o2, 717541200
-          tz.transition 1993, 3, :o7, 733269600
-          tz.transition 1993, 9, :o2, 748990800
-          tz.transition 1994, 3, :o7, 764719200
-          tz.transition 1994, 4, :o6, 767739600
-          tz.transition 1994, 9, :o3, 780436800
-          tz.transition 1995, 3, :o6, 796165200
-          tz.transition 1995, 9, :o3, 811886400
-          tz.transition 1996, 3, :o6, 828219600
-          tz.transition 1996, 10, :o3, 846374400
-          tz.transition 1997, 3, :o7, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o7, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o7, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o7, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o7, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o7, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o7, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o7, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o7, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o7, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o7, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o7, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o7, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o7, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o7, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o7, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o7, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o7, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o7, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o7, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o7, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o7, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o7, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o7, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o7, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o7, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o7, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o7, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o7, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o7, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o7, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o7, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o7, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o7, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o7, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o7, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o7, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o7, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o7, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o7, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o7, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o7, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o7, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o7, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o7, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o7, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o7, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o7, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o7, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o7, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o7, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o7, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o7, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o7, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Skopje.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Skopje.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Skopje.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Skopje.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Skopje
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Skopje', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sofia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sofia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sofia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Sofia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,173 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Sofia
-        include TimezoneDefinition
-        
-        timezone 'Europe/Sofia' do |tz|
-          tz.offset :o0, 5596, 0, :LMT
-          tz.offset :o1, 7016, 0, :IMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 3600, 0, :CET
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 52006653401, 21600
-          tz.transition 1894, 11, :o2, 26062154123, 10800
-          tz.transition 1942, 11, :o3, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o3, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 10, :o3, 58352773, 24
-          tz.transition 1945, 4, :o2, 29178571, 12
-          tz.transition 1979, 3, :o5, 291762000
-          tz.transition 1979, 9, :o2, 307576800
-          tz.transition 1980, 4, :o5, 323816400
-          tz.transition 1980, 9, :o2, 339026400
-          tz.transition 1981, 4, :o5, 355266000
-          tz.transition 1981, 9, :o2, 370393200
-          tz.transition 1982, 4, :o5, 386715600
-          tz.transition 1982, 9, :o2, 401846400
-          tz.transition 1983, 3, :o5, 417571200
-          tz.transition 1983, 9, :o2, 433296000
-          tz.transition 1984, 3, :o5, 449020800
-          tz.transition 1984, 9, :o2, 465350400
-          tz.transition 1985, 3, :o5, 481075200
-          tz.transition 1985, 9, :o2, 496800000
-          tz.transition 1986, 3, :o5, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o5, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o5, 575424000
-          tz.transition 1988, 9, :o2, 591148800
-          tz.transition 1989, 3, :o5, 606873600
-          tz.transition 1989, 9, :o2, 622598400
-          tz.transition 1990, 3, :o5, 638323200
-          tz.transition 1990, 9, :o2, 654652800
-          tz.transition 1991, 3, :o5, 670370400
-          tz.transition 1991, 9, :o2, 686091600
-          tz.transition 1992, 3, :o5, 701820000
-          tz.transition 1992, 9, :o2, 717541200
-          tz.transition 1993, 3, :o5, 733269600
-          tz.transition 1993, 9, :o2, 748990800
-          tz.transition 1994, 3, :o5, 764719200
-          tz.transition 1994, 9, :o2, 780440400
-          tz.transition 1995, 3, :o5, 796168800
-          tz.transition 1995, 9, :o2, 811890000
-          tz.transition 1996, 3, :o5, 828223200
-          tz.transition 1996, 10, :o2, 846363600
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Stockholm.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Stockholm.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Stockholm.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Stockholm.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Stockholm
-        include TimezoneDefinition
-        
-        timezone 'Europe/Stockholm' do |tz|
-          tz.offset :o0, 4332, 0, :LMT
-          tz.offset :o1, 3614, 0, :SET
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1878, 12, :o1, 17332923239, 7200
-          tz.transition 1899, 12, :o2, 104328883793, 43200
-          tz.transition 1916, 5, :o3, 29051981, 12
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tallinn.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tallinn.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tallinn.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tallinn.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,172 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Tallinn
-        include TimezoneDefinition
-        
-        timezone 'Europe/Tallinn' do |tz|
-          tz.offset :o0, 5940, 0, :LMT
-          tz.offset :o1, 5940, 0, :TMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          tz.offset :o4, 7200, 0, :EET
-          tz.offset :o5, 10800, 0, :MSK
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 385234469, 160
-          tz.transition 1918, 1, :o2, 387460069, 160
-          tz.transition 1918, 4, :o3, 58120765, 24
-          tz.transition 1918, 9, :o2, 58124461, 24
-          tz.transition 1919, 6, :o1, 58131371, 24
-          tz.transition 1921, 4, :o4, 387649669, 160
-          tz.transition 1940, 8, :o5, 29158169, 12
-          tz.transition 1941, 9, :o3, 19442019, 8
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 9, :o5, 29176265, 12
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o5, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o5, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o5, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o5, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o5, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o5, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o5, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o5, 591145200
-          tz.transition 1989, 3, :o7, 606870000
-          tz.transition 1989, 9, :o4, 622598400
-          tz.transition 1990, 3, :o7, 638323200
-          tz.transition 1990, 9, :o4, 654652800
-          tz.transition 1991, 3, :o7, 670377600
-          tz.transition 1991, 9, :o4, 686102400
-          tz.transition 1992, 3, :o7, 701827200
-          tz.transition 1992, 9, :o4, 717552000
-          tz.transition 1993, 3, :o7, 733276800
-          tz.transition 1993, 9, :o4, 749001600
-          tz.transition 1994, 3, :o7, 764726400
-          tz.transition 1994, 9, :o4, 780451200
-          tz.transition 1995, 3, :o7, 796176000
-          tz.transition 1995, 9, :o4, 811900800
-          tz.transition 1996, 3, :o7, 828230400
-          tz.transition 1996, 10, :o4, 846374400
-          tz.transition 1997, 3, :o7, 859680000
-          tz.transition 1997, 10, :o4, 877824000
-          tz.transition 1998, 3, :o7, 891129600
-          tz.transition 1998, 10, :o4, 909277200
-          tz.transition 1999, 3, :o7, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2002, 3, :o7, 1017536400
-          tz.transition 2002, 10, :o4, 1035680400
-          tz.transition 2003, 3, :o7, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o7, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o7, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o7, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o7, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o7, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o7, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o7, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o7, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o7, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o7, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o7, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o7, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o7, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o7, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o7, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o7, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o7, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o7, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o7, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o7, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o7, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o7, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o7, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o7, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o7, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o7, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o7, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o7, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o7, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o7, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o7, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o7, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o7, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o7, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o7, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o7, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o7, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o7, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o7, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o7, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o7, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o7, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o7, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o7, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o7, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o7, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o7, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tirane.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tirane.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tirane.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tirane.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,177 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Tirane
-        include TimezoneDefinition
-        
-        timezone 'Europe/Tirane' do |tz|
-          tz.offset :o0, 4760, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1913, 12, :o1, 5227488241, 2160
-          tz.transition 1940, 6, :o2, 58315115, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 4, :o1, 58339789, 24
-          tz.transition 1974, 5, :o2, 136854000
-          tz.transition 1974, 10, :o1, 149896800
-          tz.transition 1975, 4, :o2, 168130800
-          tz.transition 1975, 10, :o1, 181432800
-          tz.transition 1976, 5, :o2, 199839600
-          tz.transition 1976, 10, :o1, 213141600
-          tz.transition 1977, 5, :o2, 231894000
-          tz.transition 1977, 10, :o1, 244591200
-          tz.transition 1978, 5, :o2, 263257200
-          tz.transition 1978, 9, :o1, 276040800
-          tz.transition 1979, 5, :o2, 294706800
-          tz.transition 1979, 9, :o1, 307490400
-          tz.transition 1980, 5, :o2, 326156400
-          tz.transition 1980, 10, :o1, 339458400
-          tz.transition 1981, 4, :o2, 357087600
-          tz.transition 1981, 9, :o1, 370389600
-          tz.transition 1982, 5, :o2, 389142000
-          tz.transition 1982, 10, :o1, 402444000
-          tz.transition 1983, 4, :o2, 419468400
-          tz.transition 1983, 9, :o1, 433807200
-          tz.transition 1984, 3, :o2, 449622000
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tiraspol.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tiraspol.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tiraspol.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Tiraspol.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Tiraspol
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Tiraspol', 'Europe/Chisinau'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Uzhgorod.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Uzhgorod.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Uzhgorod.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Uzhgorod.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,168 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Uzhgorod
-        include TimezoneDefinition
-        
-        timezone 'Europe/Uzhgorod' do |tz|
-          tz.offset :o0, 5352, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          tz.offset :o3, 10800, 0, :MSK
-          tz.offset :o4, 10800, 3600, :MSD
-          tz.offset :o5, 7200, 0, :EET
-          tz.offset :o6, 7200, 3600, :EEST
-          
-          tz.transition 1890, 9, :o1, 8681909177, 3600
-          tz.transition 1940, 4, :o2, 58313293, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 29176673, 12
-          tz.transition 1945, 6, :o3, 58359251, 24
-          tz.transition 1981, 3, :o4, 354920400
-          tz.transition 1981, 9, :o3, 370728000
-          tz.transition 1982, 3, :o4, 386456400
-          tz.transition 1982, 9, :o3, 402264000
-          tz.transition 1983, 3, :o4, 417992400
-          tz.transition 1983, 9, :o3, 433800000
-          tz.transition 1984, 3, :o4, 449614800
-          tz.transition 1984, 9, :o3, 465346800
-          tz.transition 1985, 3, :o4, 481071600
-          tz.transition 1985, 9, :o3, 496796400
-          tz.transition 1986, 3, :o4, 512521200
-          tz.transition 1986, 9, :o3, 528246000
-          tz.transition 1987, 3, :o4, 543970800
-          tz.transition 1987, 9, :o3, 559695600
-          tz.transition 1988, 3, :o4, 575420400
-          tz.transition 1988, 9, :o3, 591145200
-          tz.transition 1989, 3, :o4, 606870000
-          tz.transition 1989, 9, :o3, 622594800
-          tz.transition 1990, 6, :o1, 646786800
-          tz.transition 1991, 3, :o5, 670384800
-          tz.transition 1992, 3, :o6, 701820000
-          tz.transition 1992, 9, :o5, 717541200
-          tz.transition 1993, 3, :o6, 733269600
-          tz.transition 1993, 9, :o5, 748990800
-          tz.transition 1994, 3, :o6, 764719200
-          tz.transition 1994, 9, :o5, 780440400
-          tz.transition 1995, 3, :o6, 796179600
-          tz.transition 1995, 9, :o5, 811904400
-          tz.transition 1996, 3, :o6, 828234000
-          tz.transition 1996, 10, :o5, 846378000
-          tz.transition 1997, 3, :o6, 859683600
-          tz.transition 1997, 10, :o5, 877827600
-          tz.transition 1998, 3, :o6, 891133200
-          tz.transition 1998, 10, :o5, 909277200
-          tz.transition 1999, 3, :o6, 922582800
-          tz.transition 1999, 10, :o5, 941331600
-          tz.transition 2000, 3, :o6, 954032400
-          tz.transition 2000, 10, :o5, 972781200
-          tz.transition 2001, 3, :o6, 985482000
-          tz.transition 2001, 10, :o5, 1004230800
-          tz.transition 2002, 3, :o6, 1017536400
-          tz.transition 2002, 10, :o5, 1035680400
-          tz.transition 2003, 3, :o6, 1048986000
-          tz.transition 2003, 10, :o5, 1067130000
-          tz.transition 2004, 3, :o6, 1080435600
-          tz.transition 2004, 10, :o5, 1099184400
-          tz.transition 2005, 3, :o6, 1111885200
-          tz.transition 2005, 10, :o5, 1130634000
-          tz.transition 2006, 3, :o6, 1143334800
-          tz.transition 2006, 10, :o5, 1162083600
-          tz.transition 2007, 3, :o6, 1174784400
-          tz.transition 2007, 10, :o5, 1193533200
-          tz.transition 2008, 3, :o6, 1206838800
-          tz.transition 2008, 10, :o5, 1224982800
-          tz.transition 2009, 3, :o6, 1238288400
-          tz.transition 2009, 10, :o5, 1256432400
-          tz.transition 2010, 3, :o6, 1269738000
-          tz.transition 2010, 10, :o5, 1288486800
-          tz.transition 2011, 3, :o6, 1301187600
-          tz.transition 2011, 10, :o5, 1319936400
-          tz.transition 2012, 3, :o6, 1332637200
-          tz.transition 2012, 10, :o5, 1351386000
-          tz.transition 2013, 3, :o6, 1364691600
-          tz.transition 2013, 10, :o5, 1382835600
-          tz.transition 2014, 3, :o6, 1396141200
-          tz.transition 2014, 10, :o5, 1414285200
-          tz.transition 2015, 3, :o6, 1427590800
-          tz.transition 2015, 10, :o5, 1445734800
-          tz.transition 2016, 3, :o6, 1459040400
-          tz.transition 2016, 10, :o5, 1477789200
-          tz.transition 2017, 3, :o6, 1490490000
-          tz.transition 2017, 10, :o5, 1509238800
-          tz.transition 2018, 3, :o6, 1521939600
-          tz.transition 2018, 10, :o5, 1540688400
-          tz.transition 2019, 3, :o6, 1553994000
-          tz.transition 2019, 10, :o5, 1572138000
-          tz.transition 2020, 3, :o6, 1585443600
-          tz.transition 2020, 10, :o5, 1603587600
-          tz.transition 2021, 3, :o6, 1616893200
-          tz.transition 2021, 10, :o5, 1635642000
-          tz.transition 2022, 3, :o6, 1648342800
-          tz.transition 2022, 10, :o5, 1667091600
-          tz.transition 2023, 3, :o6, 1679792400
-          tz.transition 2023, 10, :o5, 1698541200
-          tz.transition 2024, 3, :o6, 1711846800
-          tz.transition 2024, 10, :o5, 1729990800
-          tz.transition 2025, 3, :o6, 1743296400
-          tz.transition 2025, 10, :o5, 1761440400
-          tz.transition 2026, 3, :o6, 1774746000
-          tz.transition 2026, 10, :o5, 1792890000
-          tz.transition 2027, 3, :o6, 1806195600
-          tz.transition 2027, 10, :o5, 1824944400
-          tz.transition 2028, 3, :o6, 1837645200
-          tz.transition 2028, 10, :o5, 1856394000
-          tz.transition 2029, 3, :o6, 1869094800
-          tz.transition 2029, 10, :o5, 1887843600
-          tz.transition 2030, 3, :o6, 1901149200
-          tz.transition 2030, 10, :o5, 1919293200
-          tz.transition 2031, 3, :o6, 1932598800
-          tz.transition 2031, 10, :o5, 1950742800
-          tz.transition 2032, 3, :o6, 1964048400
-          tz.transition 2032, 10, :o5, 1982797200
-          tz.transition 2033, 3, :o6, 1995498000
-          tz.transition 2033, 10, :o5, 2014246800
-          tz.transition 2034, 3, :o6, 2026947600
-          tz.transition 2034, 10, :o5, 2045696400
-          tz.transition 2035, 3, :o6, 2058397200
-          tz.transition 2035, 10, :o5, 2077146000
-          tz.transition 2036, 3, :o6, 2090451600
-          tz.transition 2036, 10, :o5, 2108595600
-          tz.transition 2037, 3, :o6, 2121901200
-          tz.transition 2037, 10, :o5, 2140045200
-          tz.transition 2038, 3, :o6, 59172253, 24
-          tz.transition 2038, 10, :o5, 59177461, 24
-          tz.transition 2039, 3, :o6, 59180989, 24
-          tz.transition 2039, 10, :o5, 59186197, 24
-          tz.transition 2040, 3, :o6, 59189725, 24
-          tz.transition 2040, 10, :o5, 59194933, 24
-          tz.transition 2041, 3, :o6, 59198629, 24
-          tz.transition 2041, 10, :o5, 59203669, 24
-          tz.transition 2042, 3, :o6, 59207365, 24
-          tz.transition 2042, 10, :o5, 59212405, 24
-          tz.transition 2043, 3, :o6, 59216101, 24
-          tz.transition 2043, 10, :o5, 59221141, 24
-          tz.transition 2044, 3, :o6, 59224837, 24
-          tz.transition 2044, 10, :o5, 59230045, 24
-          tz.transition 2045, 3, :o6, 59233573, 24
-          tz.transition 2045, 10, :o5, 59238781, 24
-          tz.transition 2046, 3, :o6, 59242309, 24
-          tz.transition 2046, 10, :o5, 59247517, 24
-          tz.transition 2047, 3, :o6, 59251213, 24
-          tz.transition 2047, 10, :o5, 59256253, 24
-          tz.transition 2048, 3, :o6, 59259949, 24
-          tz.transition 2048, 10, :o5, 59264989, 24
-          tz.transition 2049, 3, :o6, 59268685, 24
-          tz.transition 2049, 10, :o5, 59273893, 24
-          tz.transition 2050, 3, :o6, 59277421, 24
-          tz.transition 2050, 10, :o5, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vaduz.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vaduz.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vaduz.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vaduz.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,159 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Vaduz
-        include TimezoneDefinition
-        
-        timezone 'Europe/Vaduz' do |tz|
-          tz.offset :o0, 2284, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1894, 5, :o1, 52120378229, 21600
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vatican.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vatican.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vatican.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vatican.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Vatican
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Vatican', 'Europe/Rome'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vienna.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vienna.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vienna.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vienna.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,183 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Vienna
-        include TimezoneDefinition
-        
-        timezone 'Europe/Vienna' do |tz|
-          tz.offset :o0, 3920, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1893, 3, :o1, 2605558811, 1080
-          tz.transition 1916, 4, :o2, 29051813, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 58112029, 24
-          tz.transition 1917, 9, :o1, 58115725, 24
-          tz.transition 1918, 4, :o2, 58120765, 24
-          tz.transition 1918, 9, :o1, 58124461, 24
-          tz.transition 1920, 4, :o2, 58138069, 24
-          tz.transition 1920, 9, :o1, 58141933, 24
-          tz.transition 1940, 4, :o2, 58313293, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 4, :o2, 58357141, 24
-          tz.transition 1945, 4, :o1, 58357381, 24
-          tz.transition 1946, 4, :o2, 58366189, 24
-          tz.transition 1946, 10, :o1, 58370389, 24
-          tz.transition 1947, 4, :o2, 58374757, 24
-          tz.transition 1947, 10, :o1, 58379125, 24
-          tz.transition 1948, 4, :o2, 58383829, 24
-          tz.transition 1948, 10, :o1, 58387861, 24
-          tz.transition 1980, 4, :o2, 323823600
-          tz.transition 1980, 9, :o1, 338940000
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vilnius.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vilnius.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vilnius.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Vilnius.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,170 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Vilnius
-        include TimezoneDefinition
-        
-        timezone 'Europe/Vilnius' do |tz|
-          tz.offset :o0, 6076, 0, :LMT
-          tz.offset :o1, 5040, 0, :WMT
-          tz.offset :o2, 5736, 0, :KMT
-          tz.offset :o3, 3600, 0, :CET
-          tz.offset :o4, 7200, 0, :EET
-          tz.offset :o5, 10800, 0, :MSK
-          tz.offset :o6, 3600, 3600, :CEST
-          tz.offset :o7, 10800, 3600, :MSD
-          tz.offset :o8, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 52006653281, 21600
-          tz.transition 1916, 12, :o2, 290547533, 120
-          tz.transition 1919, 10, :o3, 8720069161, 3600
-          tz.transition 1920, 7, :o4, 58140419, 24
-          tz.transition 1920, 10, :o3, 29071277, 12
-          tz.transition 1940, 8, :o5, 58316267, 24
-          tz.transition 1941, 6, :o6, 19441355, 8
-          tz.transition 1942, 11, :o3, 58335973, 24
-          tz.transition 1943, 3, :o6, 58339501, 24
-          tz.transition 1943, 10, :o3, 58344037, 24
-          tz.transition 1944, 4, :o6, 58348405, 24
-          tz.transition 1944, 7, :o5, 29175641, 12
-          tz.transition 1981, 3, :o7, 354920400
-          tz.transition 1981, 9, :o5, 370728000
-          tz.transition 1982, 3, :o7, 386456400
-          tz.transition 1982, 9, :o5, 402264000
-          tz.transition 1983, 3, :o7, 417992400
-          tz.transition 1983, 9, :o5, 433800000
-          tz.transition 1984, 3, :o7, 449614800
-          tz.transition 1984, 9, :o5, 465346800
-          tz.transition 1985, 3, :o7, 481071600
-          tz.transition 1985, 9, :o5, 496796400
-          tz.transition 1986, 3, :o7, 512521200
-          tz.transition 1986, 9, :o5, 528246000
-          tz.transition 1987, 3, :o7, 543970800
-          tz.transition 1987, 9, :o5, 559695600
-          tz.transition 1988, 3, :o7, 575420400
-          tz.transition 1988, 9, :o5, 591145200
-          tz.transition 1989, 3, :o7, 606870000
-          tz.transition 1989, 9, :o5, 622594800
-          tz.transition 1990, 3, :o7, 638319600
-          tz.transition 1990, 9, :o5, 654649200
-          tz.transition 1991, 3, :o8, 670374000
-          tz.transition 1991, 9, :o4, 686102400
-          tz.transition 1992, 3, :o8, 701827200
-          tz.transition 1992, 9, :o4, 717552000
-          tz.transition 1993, 3, :o8, 733276800
-          tz.transition 1993, 9, :o4, 749001600
-          tz.transition 1994, 3, :o8, 764726400
-          tz.transition 1994, 9, :o4, 780451200
-          tz.transition 1995, 3, :o8, 796176000
-          tz.transition 1995, 9, :o4, 811900800
-          tz.transition 1996, 3, :o8, 828230400
-          tz.transition 1996, 10, :o4, 846374400
-          tz.transition 1997, 3, :o8, 859680000
-          tz.transition 1997, 10, :o4, 877824000
-          tz.transition 1998, 3, :o6, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o6, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2003, 3, :o8, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o8, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o8, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o8, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o8, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o8, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o8, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o8, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o8, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o8, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o8, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o8, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o8, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o8, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o8, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o8, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o8, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o8, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o8, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o8, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o8, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o8, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o8, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o8, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o8, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o8, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o8, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o8, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o8, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o8, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o8, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o8, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o8, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o8, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o8, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o8, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o8, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o8, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o8, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o8, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o8, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o8, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o8, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o8, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o8, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o8, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o8, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o8, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Volgograd.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Volgograd.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Volgograd.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Volgograd.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,166 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Volgograd
-        include TimezoneDefinition
-        
-        timezone 'Europe/Volgograd' do |tz|
-          tz.offset :o0, 10660, 0, :LMT
-          tz.offset :o1, 10800, 0, :TSAT
-          tz.offset :o2, 10800, 0, :STAT
-          tz.offset :o3, 14400, 0, :STAT
-          tz.offset :o4, 14400, 0, :VOLT
-          tz.offset :o5, 14400, 3600, :VOLST
-          tz.offset :o6, 10800, 3600, :VOLST
-          tz.offset :o7, 10800, 0, :VOLT
-          
-          tz.transition 1920, 1, :o1, 10464449947, 4320
-          tz.transition 1925, 4, :o2, 19393971, 8
-          tz.transition 1930, 6, :o3, 19409187, 8
-          tz.transition 1961, 11, :o4, 7312843, 3
-          tz.transition 1981, 3, :o5, 354916800
-          tz.transition 1981, 9, :o4, 370724400
-          tz.transition 1982, 3, :o5, 386452800
-          tz.transition 1982, 9, :o4, 402260400
-          tz.transition 1983, 3, :o5, 417988800
-          tz.transition 1983, 9, :o4, 433796400
-          tz.transition 1984, 3, :o5, 449611200
-          tz.transition 1984, 9, :o4, 465343200
-          tz.transition 1985, 3, :o5, 481068000
-          tz.transition 1985, 9, :o4, 496792800
-          tz.transition 1986, 3, :o5, 512517600
-          tz.transition 1986, 9, :o4, 528242400
-          tz.transition 1987, 3, :o5, 543967200
-          tz.transition 1987, 9, :o4, 559692000
-          tz.transition 1988, 3, :o5, 575416800
-          tz.transition 1988, 9, :o4, 591141600
-          tz.transition 1989, 3, :o6, 606866400
-          tz.transition 1989, 9, :o7, 622594800
-          tz.transition 1990, 3, :o6, 638319600
-          tz.transition 1990, 9, :o7, 654649200
-          tz.transition 1991, 3, :o4, 670374000
-          tz.transition 1992, 3, :o6, 701820000
-          tz.transition 1992, 9, :o7, 717534000
-          tz.transition 1993, 3, :o6, 733273200
-          tz.transition 1993, 9, :o7, 748998000
-          tz.transition 1994, 3, :o6, 764722800
-          tz.transition 1994, 9, :o7, 780447600
-          tz.transition 1995, 3, :o6, 796172400
-          tz.transition 1995, 9, :o7, 811897200
-          tz.transition 1996, 3, :o6, 828226800
-          tz.transition 1996, 10, :o7, 846370800
-          tz.transition 1997, 3, :o6, 859676400
-          tz.transition 1997, 10, :o7, 877820400
-          tz.transition 1998, 3, :o6, 891126000
-          tz.transition 1998, 10, :o7, 909270000
-          tz.transition 1999, 3, :o6, 922575600
-          tz.transition 1999, 10, :o7, 941324400
-          tz.transition 2000, 3, :o6, 954025200
-          tz.transition 2000, 10, :o7, 972774000
-          tz.transition 2001, 3, :o6, 985474800
-          tz.transition 2001, 10, :o7, 1004223600
-          tz.transition 2002, 3, :o6, 1017529200
-          tz.transition 2002, 10, :o7, 1035673200
-          tz.transition 2003, 3, :o6, 1048978800
-          tz.transition 2003, 10, :o7, 1067122800
-          tz.transition 2004, 3, :o6, 1080428400
-          tz.transition 2004, 10, :o7, 1099177200
-          tz.transition 2005, 3, :o6, 1111878000
-          tz.transition 2005, 10, :o7, 1130626800
-          tz.transition 2006, 3, :o6, 1143327600
-          tz.transition 2006, 10, :o7, 1162076400
-          tz.transition 2007, 3, :o6, 1174777200
-          tz.transition 2007, 10, :o7, 1193526000
-          tz.transition 2008, 3, :o6, 1206831600
-          tz.transition 2008, 10, :o7, 1224975600
-          tz.transition 2009, 3, :o6, 1238281200
-          tz.transition 2009, 10, :o7, 1256425200
-          tz.transition 2010, 3, :o6, 1269730800
-          tz.transition 2010, 10, :o7, 1288479600
-          tz.transition 2011, 3, :o6, 1301180400
-          tz.transition 2011, 10, :o7, 1319929200
-          tz.transition 2012, 3, :o6, 1332630000
-          tz.transition 2012, 10, :o7, 1351378800
-          tz.transition 2013, 3, :o6, 1364684400
-          tz.transition 2013, 10, :o7, 1382828400
-          tz.transition 2014, 3, :o6, 1396134000
-          tz.transition 2014, 10, :o7, 1414278000
-          tz.transition 2015, 3, :o6, 1427583600
-          tz.transition 2015, 10, :o7, 1445727600
-          tz.transition 2016, 3, :o6, 1459033200
-          tz.transition 2016, 10, :o7, 1477782000
-          tz.transition 2017, 3, :o6, 1490482800
-          tz.transition 2017, 10, :o7, 1509231600
-          tz.transition 2018, 3, :o6, 1521932400
-          tz.transition 2018, 10, :o7, 1540681200
-          tz.transition 2019, 3, :o6, 1553986800
-          tz.transition 2019, 10, :o7, 1572130800
-          tz.transition 2020, 3, :o6, 1585436400
-          tz.transition 2020, 10, :o7, 1603580400
-          tz.transition 2021, 3, :o6, 1616886000
-          tz.transition 2021, 10, :o7, 1635634800
-          tz.transition 2022, 3, :o6, 1648335600
-          tz.transition 2022, 10, :o7, 1667084400
-          tz.transition 2023, 3, :o6, 1679785200
-          tz.transition 2023, 10, :o7, 1698534000
-          tz.transition 2024, 3, :o6, 1711839600
-          tz.transition 2024, 10, :o7, 1729983600
-          tz.transition 2025, 3, :o6, 1743289200
-          tz.transition 2025, 10, :o7, 1761433200
-          tz.transition 2026, 3, :o6, 1774738800
-          tz.transition 2026, 10, :o7, 1792882800
-          tz.transition 2027, 3, :o6, 1806188400
-          tz.transition 2027, 10, :o7, 1824937200
-          tz.transition 2028, 3, :o6, 1837638000
-          tz.transition 2028, 10, :o7, 1856386800
-          tz.transition 2029, 3, :o6, 1869087600
-          tz.transition 2029, 10, :o7, 1887836400
-          tz.transition 2030, 3, :o6, 1901142000
-          tz.transition 2030, 10, :o7, 1919286000
-          tz.transition 2031, 3, :o6, 1932591600
-          tz.transition 2031, 10, :o7, 1950735600
-          tz.transition 2032, 3, :o6, 1964041200
-          tz.transition 2032, 10, :o7, 1982790000
-          tz.transition 2033, 3, :o6, 1995490800
-          tz.transition 2033, 10, :o7, 2014239600
-          tz.transition 2034, 3, :o6, 2026940400
-          tz.transition 2034, 10, :o7, 2045689200
-          tz.transition 2035, 3, :o6, 2058390000
-          tz.transition 2035, 10, :o7, 2077138800
-          tz.transition 2036, 3, :o6, 2090444400
-          tz.transition 2036, 10, :o7, 2108588400
-          tz.transition 2037, 3, :o6, 2121894000
-          tz.transition 2037, 10, :o7, 2140038000
-          tz.transition 2038, 3, :o6, 59172251, 24
-          tz.transition 2038, 10, :o7, 59177459, 24
-          tz.transition 2039, 3, :o6, 59180987, 24
-          tz.transition 2039, 10, :o7, 59186195, 24
-          tz.transition 2040, 3, :o6, 59189723, 24
-          tz.transition 2040, 10, :o7, 59194931, 24
-          tz.transition 2041, 3, :o6, 59198627, 24
-          tz.transition 2041, 10, :o7, 59203667, 24
-          tz.transition 2042, 3, :o6, 59207363, 24
-          tz.transition 2042, 10, :o7, 59212403, 24
-          tz.transition 2043, 3, :o6, 59216099, 24
-          tz.transition 2043, 10, :o7, 59221139, 24
-          tz.transition 2044, 3, :o6, 59224835, 24
-          tz.transition 2044, 10, :o7, 59230043, 24
-          tz.transition 2045, 3, :o6, 59233571, 24
-          tz.transition 2045, 10, :o7, 59238779, 24
-          tz.transition 2046, 3, :o6, 59242307, 24
-          tz.transition 2046, 10, :o7, 59247515, 24
-          tz.transition 2047, 3, :o6, 59251211, 24
-          tz.transition 2047, 10, :o7, 59256251, 24
-          tz.transition 2048, 3, :o6, 59259947, 24
-          tz.transition 2048, 10, :o7, 59264987, 24
-          tz.transition 2049, 3, :o6, 59268683, 24
-          tz.transition 2049, 10, :o7, 59273891, 24
-          tz.transition 2050, 3, :o6, 59277419, 24
-          tz.transition 2050, 10, :o7, 59282627, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Warsaw.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Warsaw.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Warsaw.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Warsaw.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,212 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Warsaw
-        include TimezoneDefinition
-        
-        timezone 'Europe/Warsaw' do |tz|
-          tz.offset :o0, 5040, 0, :LMT
-          tz.offset :o1, 5040, 0, :WMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          tz.offset :o4, 7200, 0, :EET
-          tz.offset :o5, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 288925853, 120
-          tz.transition 1915, 8, :o2, 290485733, 120
-          tz.transition 1916, 4, :o3, 29051813, 12
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1917, 4, :o3, 58112029, 24
-          tz.transition 1917, 9, :o2, 58115725, 24
-          tz.transition 1918, 4, :o3, 58120765, 24
-          tz.transition 1918, 9, :o4, 58124461, 24
-          tz.transition 1919, 4, :o5, 4844127, 2
-          tz.transition 1919, 9, :o4, 4844435, 2
-          tz.transition 1922, 5, :o2, 29078477, 12
-          tz.transition 1940, 6, :o3, 58315285, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 10, :o2, 4862735, 2
-          tz.transition 1945, 4, :o3, 58357787, 24
-          tz.transition 1945, 10, :o2, 29181125, 12
-          tz.transition 1946, 4, :o3, 58366187, 24
-          tz.transition 1946, 10, :o2, 58370413, 24
-          tz.transition 1947, 5, :o3, 58375429, 24
-          tz.transition 1947, 10, :o2, 58379125, 24
-          tz.transition 1948, 4, :o3, 58383829, 24
-          tz.transition 1948, 10, :o2, 58387861, 24
-          tz.transition 1949, 4, :o3, 58392397, 24
-          tz.transition 1949, 10, :o2, 58396597, 24
-          tz.transition 1957, 6, :o3, 4871983, 2
-          tz.transition 1957, 9, :o2, 4872221, 2
-          tz.transition 1958, 3, :o3, 4872585, 2
-          tz.transition 1958, 9, :o2, 4872949, 2
-          tz.transition 1959, 5, :o3, 4873439, 2
-          tz.transition 1959, 10, :o2, 4873691, 2
-          tz.transition 1960, 4, :o3, 4874055, 2
-          tz.transition 1960, 10, :o2, 4874419, 2
-          tz.transition 1961, 5, :o3, 4874895, 2
-          tz.transition 1961, 10, :o2, 4875147, 2
-          tz.transition 1962, 5, :o3, 4875623, 2
-          tz.transition 1962, 9, :o2, 4875875, 2
-          tz.transition 1963, 5, :o3, 4876351, 2
-          tz.transition 1963, 9, :o2, 4876603, 2
-          tz.transition 1964, 5, :o3, 4877093, 2
-          tz.transition 1964, 9, :o2, 4877331, 2
-          tz.transition 1977, 4, :o3, 228873600
-          tz.transition 1977, 9, :o2, 243993600
-          tz.transition 1978, 4, :o3, 260323200
-          tz.transition 1978, 10, :o2, 276048000
-          tz.transition 1979, 4, :o3, 291772800
-          tz.transition 1979, 9, :o2, 307497600
-          tz.transition 1980, 4, :o3, 323827200
-          tz.transition 1980, 9, :o2, 338947200
-          tz.transition 1981, 3, :o3, 354672000
-          tz.transition 1981, 9, :o2, 370396800
-          tz.transition 1982, 3, :o3, 386121600
-          tz.transition 1982, 9, :o2, 401846400
-          tz.transition 1983, 3, :o3, 417571200
-          tz.transition 1983, 9, :o2, 433296000
-          tz.transition 1984, 3, :o3, 449020800
-          tz.transition 1984, 9, :o2, 465350400
-          tz.transition 1985, 3, :o3, 481075200
-          tz.transition 1985, 9, :o2, 496800000
-          tz.transition 1986, 3, :o3, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o3, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zagreb.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zagreb.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zagreb.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zagreb.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Zagreb
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Zagreb', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zaporozhye.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zaporozhye.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zaporozhye.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zaporozhye.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,171 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Zaporozhye
-        include TimezoneDefinition
-        
-        timezone 'Europe/Zaporozhye' do |tz|
-          tz.offset :o0, 8440, 0, :LMT
-          tz.offset :o1, 8400, 0, :CUT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 10800, 0, :MSK
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 5200665269, 2160
-          tz.transition 1924, 5, :o2, 174521333, 72
-          tz.transition 1930, 6, :o3, 29113781, 12
-          tz.transition 1941, 8, :o4, 19441851, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1943, 10, :o3, 58344539, 24
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o3, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o3, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o3, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o3, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o3, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o3, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o3, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o3, 591145200
-          tz.transition 1989, 3, :o6, 606870000
-          tz.transition 1989, 9, :o3, 622594800
-          tz.transition 1990, 3, :o6, 638319600
-          tz.transition 1990, 9, :o3, 654649200
-          tz.transition 1991, 3, :o7, 670374000
-          tz.transition 1991, 9, :o2, 686091600
-          tz.transition 1992, 3, :o7, 701820000
-          tz.transition 1992, 9, :o2, 717541200
-          tz.transition 1993, 3, :o7, 733269600
-          tz.transition 1993, 9, :o2, 748990800
-          tz.transition 1994, 3, :o7, 764719200
-          tz.transition 1994, 9, :o2, 780440400
-          tz.transition 1995, 3, :o7, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o7, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o7, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o7, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o7, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o7, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o7, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o7, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o7, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o7, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o7, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o7, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o7, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o7, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o7, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o7, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o7, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o7, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o7, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o7, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o7, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o7, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o7, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o7, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o7, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o7, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o7, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o7, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o7, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o7, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o7, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o7, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o7, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o7, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o7, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o7, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o7, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o7, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o7, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o7, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o7, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o7, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o7, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o7, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o7, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o7, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o7, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o7, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o7, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o7, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o7, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o7, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o7, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o7, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o7, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o7, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zurich.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zurich.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zurich.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Europe/Zurich.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,167 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Zurich
-        include TimezoneDefinition
-        
-        timezone 'Europe/Zurich' do |tz|
-          tz.offset :o0, 2048, 0, :LMT
-          tz.offset :o1, 1784, 0, :BMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1848, 9, :o1, 3234981343, 1350
-          tz.transition 1894, 5, :o2, 26060189177, 10800
-          tz.transition 1940, 11, :o3, 58318451, 24
-          tz.transition 1940, 12, :o2, 29159933, 12
-          tz.transition 1941, 5, :o3, 58322845, 24
-          tz.transition 1941, 10, :o2, 29163269, 12
-          tz.transition 1942, 5, :o3, 58331581, 24
-          tz.transition 1942, 10, :o2, 29167637, 12
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module GB
-      include TimezoneDefinition
-      
-      linked_timezone 'GB', 'Europe/London'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB__m__Eire.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB__m__Eire.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB__m__Eire.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GB__m__Eire.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module GB__m__Eire
-      include TimezoneDefinition
-      
-      linked_timezone 'GB-Eire', 'Europe/London'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module GMT
-      include TimezoneDefinition
-      
-      linked_timezone 'GMT', 'Etc/GMT'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT0.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT0.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT0.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT0.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module GMT0
-      include TimezoneDefinition
-      
-      linked_timezone 'GMT0', 'Etc/GMT'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__m__0.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__m__0.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__m__0.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__m__0.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module GMT__m__0
-      include TimezoneDefinition
-      
-      linked_timezone 'GMT-0', 'Etc/GMT'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__p__0.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__p__0.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__p__0.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/GMT__p__0.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module GMT__p__0
-      include TimezoneDefinition
-      
-      linked_timezone 'GMT+0', 'Etc/GMT'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Greenwich.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Greenwich.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Greenwich.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Greenwich.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Greenwich
-      include TimezoneDefinition
-      
-      linked_timezone 'Greenwich', 'Etc/GMT'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/HST.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/HST.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/HST.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/HST.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,14 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module HST
-      include TimezoneDefinition
-      
-      timezone 'HST' do |tz|
-        tz.offset :o0, -36000, 0, :HST
-        
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Hongkong.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Hongkong.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Hongkong.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Hongkong.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Hongkong
-      include TimezoneDefinition
-      
-      linked_timezone 'Hongkong', 'Asia/Hong_Kong'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iceland.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iceland.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iceland.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iceland.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Iceland
-      include TimezoneDefinition
-      
-      linked_timezone 'Iceland', 'Atlantic/Reykjavik'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Antananarivo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Antananarivo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Antananarivo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Antananarivo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Antananarivo
-        include TimezoneDefinition
-        
-        timezone 'Indian/Antananarivo' do |tz|
-          tz.offset :o0, 11404, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          tz.offset :o2, 10800, 3600, :EAST
-          
-          tz.transition 1911, 6, :o1, 52255116749, 21600
-          tz.transition 1954, 2, :o2, 7304404, 3
-          tz.transition 1954, 5, :o1, 7304677, 3
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Chagos.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Chagos.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Chagos.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Chagos.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Chagos
-        include TimezoneDefinition
-        
-        timezone 'Indian/Chagos' do |tz|
-          tz.offset :o0, 17380, 0, :LMT
-          tz.offset :o1, 18000, 0, :IOT
-          tz.offset :o2, 21600, 0, :IOT
-          
-          tz.transition 1906, 12, :o1, 10443929611, 4320
-          tz.transition 1995, 12, :o2, 820436400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Christmas.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Christmas.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Christmas.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Christmas.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Christmas
-        include TimezoneDefinition
-        
-        timezone 'Indian/Christmas' do |tz|
-          tz.offset :o0, 25372, 0, :LMT
-          tz.offset :o1, 25200, 0, :CXT
-          
-          tz.transition 1895, 1, :o1, 52125664457, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Cocos.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Cocos.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Cocos.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Cocos.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Cocos
-        include TimezoneDefinition
-        
-        timezone 'Indian/Cocos' do |tz|
-          tz.offset :o0, 23260, 0, :LMT
-          tz.offset :o1, 23400, 0, :CCT
-          
-          tz.transition 1899, 12, :o1, 10432887397, 4320
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Comoro.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Comoro.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Comoro.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Comoro.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Comoro
-        include TimezoneDefinition
-        
-        timezone 'Indian/Comoro' do |tz|
-          tz.offset :o0, 10384, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          
-          tz.transition 1911, 6, :o1, 13063779251, 5400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Kerguelen.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Kerguelen.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Kerguelen.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Kerguelen.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Kerguelen
-        include TimezoneDefinition
-        
-        timezone 'Indian/Kerguelen' do |tz|
-          tz.offset :o0, 0, 0, :zzz
-          tz.offset :o1, 18000, 0, :TFT
-          
-          tz.transition 1950, 1, :o1, 4866565, 2
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mahe.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mahe.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mahe.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mahe.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Mahe
-        include TimezoneDefinition
-        
-        timezone 'Indian/Mahe' do |tz|
-          tz.offset :o0, 13308, 0, :LMT
-          tz.offset :o1, 14400, 0, :SCT
-          
-          tz.transition 1906, 5, :o1, 17405008891, 7200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Maldives.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Maldives.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Maldives.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Maldives.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Maldives
-        include TimezoneDefinition
-        
-        timezone 'Indian/Maldives' do |tz|
-          tz.offset :o0, 17640, 0, :LMT
-          tz.offset :o1, 17640, 0, :MMT
-          tz.offset :o2, 18000, 0, :MVT
-          
-          tz.transition 1879, 12, :o1, 577851671, 240
-          tz.transition 1959, 12, :o2, 584864231, 240
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mauritius.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mauritius.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mauritius.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mauritius.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Mauritius
-        include TimezoneDefinition
-        
-        timezone 'Indian/Mauritius' do |tz|
-          tz.offset :o0, 13800, 0, :LMT
-          tz.offset :o1, 14400, 0, :MUT
-          
-          tz.transition 1906, 12, :o1, 348130993, 144
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mayotte.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mayotte.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mayotte.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Mayotte.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Mayotte
-        include TimezoneDefinition
-        
-        timezone 'Indian/Mayotte' do |tz|
-          tz.offset :o0, 10856, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          
-          tz.transition 1911, 6, :o1, 26127558443, 10800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Reunion.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Reunion.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Reunion.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Indian/Reunion.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Indian
-      module Reunion
-        include TimezoneDefinition
-        
-        timezone 'Indian/Reunion' do |tz|
-          tz.offset :o0, 13312, 0, :LMT
-          tz.offset :o1, 14400, 0, :RET
-          
-          tz.transition 1911, 5, :o1, 3265904267, 1350
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iran.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iran.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iran.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Iran.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Iran
-      include TimezoneDefinition
-      
-      linked_timezone 'Iran', 'Asia/Tehran'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Israel.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Israel.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Israel.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Israel.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Israel
-      include TimezoneDefinition
-      
-      linked_timezone 'Israel', 'Asia/Jerusalem'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Jamaica.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Jamaica.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Jamaica.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Jamaica.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Jamaica
-      include TimezoneDefinition
-      
-      linked_timezone 'Jamaica', 'America/Jamaica'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Japan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Japan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Japan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Japan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Japan
-      include TimezoneDefinition
-      
-      linked_timezone 'Japan', 'Asia/Tokyo'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Kwajalein.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Kwajalein.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Kwajalein.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Kwajalein.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Kwajalein
-      include TimezoneDefinition
-      
-      linked_timezone 'Kwajalein', 'Pacific/Kwajalein'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Libya.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Libya.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Libya.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Libya.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Libya
-      include TimezoneDefinition
-      
-      linked_timezone 'Libya', 'Africa/Tripoli'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MET.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MET.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MET.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MET.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,175 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module MET
-      include TimezoneDefinition
-      
-      timezone 'MET' do |tz|
-        tz.offset :o0, 3600, 0, :MET
-        tz.offset :o1, 3600, 3600, :MEST
-        
-        tz.transition 1916, 4, :o1, 29051813, 12
-        tz.transition 1916, 9, :o0, 58107299, 24
-        tz.transition 1917, 4, :o1, 58112029, 24
-        tz.transition 1917, 9, :o0, 58115725, 24
-        tz.transition 1918, 4, :o1, 58120765, 24
-        tz.transition 1918, 9, :o0, 58124461, 24
-        tz.transition 1940, 4, :o1, 58313293, 24
-        tz.transition 1942, 11, :o0, 58335973, 24
-        tz.transition 1943, 3, :o1, 58339501, 24
-        tz.transition 1943, 10, :o0, 58344037, 24
-        tz.transition 1944, 4, :o1, 58348405, 24
-        tz.transition 1944, 10, :o0, 58352773, 24
-        tz.transition 1977, 4, :o1, 228877200
-        tz.transition 1977, 9, :o0, 243997200
-        tz.transition 1978, 4, :o1, 260326800
-        tz.transition 1978, 10, :o0, 276051600
-        tz.transition 1979, 4, :o1, 291776400
-        tz.transition 1979, 9, :o0, 307501200
-        tz.transition 1980, 4, :o1, 323830800
-        tz.transition 1980, 9, :o0, 338950800
-        tz.transition 1981, 3, :o1, 354675600
-        tz.transition 1981, 9, :o0, 370400400
-        tz.transition 1982, 3, :o1, 386125200
-        tz.transition 1982, 9, :o0, 401850000
-        tz.transition 1983, 3, :o1, 417574800
-        tz.transition 1983, 9, :o0, 433299600
-        tz.transition 1984, 3, :o1, 449024400
-        tz.transition 1984, 9, :o0, 465354000
-        tz.transition 1985, 3, :o1, 481078800
-        tz.transition 1985, 9, :o0, 496803600
-        tz.transition 1986, 3, :o1, 512528400
-        tz.transition 1986, 9, :o0, 528253200
-        tz.transition 1987, 3, :o1, 543978000
-        tz.transition 1987, 9, :o0, 559702800
-        tz.transition 1988, 3, :o1, 575427600
-        tz.transition 1988, 9, :o0, 591152400
-        tz.transition 1989, 3, :o1, 606877200
-        tz.transition 1989, 9, :o0, 622602000
-        tz.transition 1990, 3, :o1, 638326800
-        tz.transition 1990, 9, :o0, 654656400
-        tz.transition 1991, 3, :o1, 670381200
-        tz.transition 1991, 9, :o0, 686106000
-        tz.transition 1992, 3, :o1, 701830800
-        tz.transition 1992, 9, :o0, 717555600
-        tz.transition 1993, 3, :o1, 733280400
-        tz.transition 1993, 9, :o0, 749005200
-        tz.transition 1994, 3, :o1, 764730000
-        tz.transition 1994, 9, :o0, 780454800
-        tz.transition 1995, 3, :o1, 796179600
-        tz.transition 1995, 9, :o0, 811904400
-        tz.transition 1996, 3, :o1, 828234000
-        tz.transition 1996, 10, :o0, 846378000
-        tz.transition 1997, 3, :o1, 859683600
-        tz.transition 1997, 10, :o0, 877827600
-        tz.transition 1998, 3, :o1, 891133200
-        tz.transition 1998, 10, :o0, 909277200
-        tz.transition 1999, 3, :o1, 922582800
-        tz.transition 1999, 10, :o0, 941331600
-        tz.transition 2000, 3, :o1, 954032400
-        tz.transition 2000, 10, :o0, 972781200
-        tz.transition 2001, 3, :o1, 985482000
-        tz.transition 2001, 10, :o0, 1004230800
-        tz.transition 2002, 3, :o1, 1017536400
-        tz.transition 2002, 10, :o0, 1035680400
-        tz.transition 2003, 3, :o1, 1048986000
-        tz.transition 2003, 10, :o0, 1067130000
-        tz.transition 2004, 3, :o1, 1080435600
-        tz.transition 2004, 10, :o0, 1099184400
-        tz.transition 2005, 3, :o1, 1111885200
-        tz.transition 2005, 10, :o0, 1130634000
-        tz.transition 2006, 3, :o1, 1143334800
-        tz.transition 2006, 10, :o0, 1162083600
-        tz.transition 2007, 3, :o1, 1174784400
-        tz.transition 2007, 10, :o0, 1193533200
-        tz.transition 2008, 3, :o1, 1206838800
-        tz.transition 2008, 10, :o0, 1224982800
-        tz.transition 2009, 3, :o1, 1238288400
-        tz.transition 2009, 10, :o0, 1256432400
-        tz.transition 2010, 3, :o1, 1269738000
-        tz.transition 2010, 10, :o0, 1288486800
-        tz.transition 2011, 3, :o1, 1301187600
-        tz.transition 2011, 10, :o0, 1319936400
-        tz.transition 2012, 3, :o1, 1332637200
-        tz.transition 2012, 10, :o0, 1351386000
-        tz.transition 2013, 3, :o1, 1364691600
-        tz.transition 2013, 10, :o0, 1382835600
-        tz.transition 2014, 3, :o1, 1396141200
-        tz.transition 2014, 10, :o0, 1414285200
-        tz.transition 2015, 3, :o1, 1427590800
-        tz.transition 2015, 10, :o0, 1445734800
-        tz.transition 2016, 3, :o1, 1459040400
-        tz.transition 2016, 10, :o0, 1477789200
-        tz.transition 2017, 3, :o1, 1490490000
-        tz.transition 2017, 10, :o0, 1509238800
-        tz.transition 2018, 3, :o1, 1521939600
-        tz.transition 2018, 10, :o0, 1540688400
-        tz.transition 2019, 3, :o1, 1553994000
-        tz.transition 2019, 10, :o0, 1572138000
-        tz.transition 2020, 3, :o1, 1585443600
-        tz.transition 2020, 10, :o0, 1603587600
-        tz.transition 2021, 3, :o1, 1616893200
-        tz.transition 2021, 10, :o0, 1635642000
-        tz.transition 2022, 3, :o1, 1648342800
-        tz.transition 2022, 10, :o0, 1667091600
-        tz.transition 2023, 3, :o1, 1679792400
-        tz.transition 2023, 10, :o0, 1698541200
-        tz.transition 2024, 3, :o1, 1711846800
-        tz.transition 2024, 10, :o0, 1729990800
-        tz.transition 2025, 3, :o1, 1743296400
-        tz.transition 2025, 10, :o0, 1761440400
-        tz.transition 2026, 3, :o1, 1774746000
-        tz.transition 2026, 10, :o0, 1792890000
-        tz.transition 2027, 3, :o1, 1806195600
-        tz.transition 2027, 10, :o0, 1824944400
-        tz.transition 2028, 3, :o1, 1837645200
-        tz.transition 2028, 10, :o0, 1856394000
-        tz.transition 2029, 3, :o1, 1869094800
-        tz.transition 2029, 10, :o0, 1887843600
-        tz.transition 2030, 3, :o1, 1901149200
-        tz.transition 2030, 10, :o0, 1919293200
-        tz.transition 2031, 3, :o1, 1932598800
-        tz.transition 2031, 10, :o0, 1950742800
-        tz.transition 2032, 3, :o1, 1964048400
-        tz.transition 2032, 10, :o0, 1982797200
-        tz.transition 2033, 3, :o1, 1995498000
-        tz.transition 2033, 10, :o0, 2014246800
-        tz.transition 2034, 3, :o1, 2026947600
-        tz.transition 2034, 10, :o0, 2045696400
-        tz.transition 2035, 3, :o1, 2058397200
-        tz.transition 2035, 10, :o0, 2077146000
-        tz.transition 2036, 3, :o1, 2090451600
-        tz.transition 2036, 10, :o0, 2108595600
-        tz.transition 2037, 3, :o1, 2121901200
-        tz.transition 2037, 10, :o0, 2140045200
-        tz.transition 2038, 3, :o1, 59172253, 24
-        tz.transition 2038, 10, :o0, 59177461, 24
-        tz.transition 2039, 3, :o1, 59180989, 24
-        tz.transition 2039, 10, :o0, 59186197, 24
-        tz.transition 2040, 3, :o1, 59189725, 24
-        tz.transition 2040, 10, :o0, 59194933, 24
-        tz.transition 2041, 3, :o1, 59198629, 24
-        tz.transition 2041, 10, :o0, 59203669, 24
-        tz.transition 2042, 3, :o1, 59207365, 24
-        tz.transition 2042, 10, :o0, 59212405, 24
-        tz.transition 2043, 3, :o1, 59216101, 24
-        tz.transition 2043, 10, :o0, 59221141, 24
-        tz.transition 2044, 3, :o1, 59224837, 24
-        tz.transition 2044, 10, :o0, 59230045, 24
-        tz.transition 2045, 3, :o1, 59233573, 24
-        tz.transition 2045, 10, :o0, 59238781, 24
-        tz.transition 2046, 3, :o1, 59242309, 24
-        tz.transition 2046, 10, :o0, 59247517, 24
-        tz.transition 2047, 3, :o1, 59251213, 24
-        tz.transition 2047, 10, :o0, 59256253, 24
-        tz.transition 2048, 3, :o1, 59259949, 24
-        tz.transition 2048, 10, :o0, 59264989, 24
-        tz.transition 2049, 3, :o1, 59268685, 24
-        tz.transition 2049, 10, :o0, 59273893, 24
-        tz.transition 2050, 3, :o1, 59277421, 24
-        tz.transition 2050, 10, :o0, 59282629, 24
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,14 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module MST
-      include TimezoneDefinition
-      
-      timezone 'MST' do |tz|
-        tz.offset :o0, -25200, 0, :MST
-        
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST7MDT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST7MDT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST7MDT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/MST7MDT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,192 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module MST7MDT
-      include TimezoneDefinition
-      
-      timezone 'MST7MDT' do |tz|
-        tz.offset :o0, -25200, 0, :MST
-        tz.offset :o1, -25200, 3600, :MDT
-        tz.offset :o2, -25200, 3600, :MWT
-        tz.offset :o3, -25200, 3600, :MPT
-        
-        tz.transition 1918, 3, :o1, 19373471, 8
-        tz.transition 1918, 10, :o0, 14531363, 6
-        tz.transition 1919, 3, :o1, 19376383, 8
-        tz.transition 1919, 10, :o0, 14533547, 6
-        tz.transition 1942, 2, :o2, 19443199, 8
-        tz.transition 1945, 8, :o3, 58360379, 24
-        tz.transition 1945, 9, :o0, 14590373, 6
-        tz.transition 1967, 4, :o1, 19516887, 8
-        tz.transition 1967, 10, :o0, 14638757, 6
-        tz.transition 1968, 4, :o1, 19519799, 8
-        tz.transition 1968, 10, :o0, 14640941, 6
-        tz.transition 1969, 4, :o1, 19522711, 8
-        tz.transition 1969, 10, :o0, 14643125, 6
-        tz.transition 1970, 4, :o1, 9968400
-        tz.transition 1970, 10, :o0, 25689600
-        tz.transition 1971, 4, :o1, 41418000
-        tz.transition 1971, 10, :o0, 57744000
-        tz.transition 1972, 4, :o1, 73472400
-        tz.transition 1972, 10, :o0, 89193600
-        tz.transition 1973, 4, :o1, 104922000
-        tz.transition 1973, 10, :o0, 120643200
-        tz.transition 1974, 1, :o1, 126694800
-        tz.transition 1974, 10, :o0, 152092800
-        tz.transition 1975, 2, :o1, 162378000
-        tz.transition 1975, 10, :o0, 183542400
-        tz.transition 1976, 4, :o1, 199270800
-        tz.transition 1976, 10, :o0, 215596800
-        tz.transition 1977, 4, :o1, 230720400
-        tz.transition 1977, 10, :o0, 247046400
-        tz.transition 1978, 4, :o1, 262774800
-        tz.transition 1978, 10, :o0, 278496000
-        tz.transition 1979, 4, :o1, 294224400
-        tz.transition 1979, 10, :o0, 309945600
-        tz.transition 1980, 4, :o1, 325674000
-        tz.transition 1980, 10, :o0, 341395200
-        tz.transition 1981, 4, :o1, 357123600
-        tz.transition 1981, 10, :o0, 372844800
-        tz.transition 1982, 4, :o1, 388573200
-        tz.transition 1982, 10, :o0, 404899200
-        tz.transition 1983, 4, :o1, 420022800
-        tz.transition 1983, 10, :o0, 436348800
-        tz.transition 1984, 4, :o1, 452077200
-        tz.transition 1984, 10, :o0, 467798400
-        tz.transition 1985, 4, :o1, 483526800
-        tz.transition 1985, 10, :o0, 499248000
-        tz.transition 1986, 4, :o1, 514976400
-        tz.transition 1986, 10, :o0, 530697600
-        tz.transition 1987, 4, :o1, 544611600
-        tz.transition 1987, 10, :o0, 562147200
-        tz.transition 1988, 4, :o1, 576061200
-        tz.transition 1988, 10, :o0, 594201600
-        tz.transition 1989, 4, :o1, 607510800
-        tz.transition 1989, 10, :o0, 625651200
-        tz.transition 1990, 4, :o1, 638960400
-        tz.transition 1990, 10, :o0, 657100800
-        tz.transition 1991, 4, :o1, 671014800
-        tz.transition 1991, 10, :o0, 688550400
-        tz.transition 1992, 4, :o1, 702464400
-        tz.transition 1992, 10, :o0, 720000000
-        tz.transition 1993, 4, :o1, 733914000
-        tz.transition 1993, 10, :o0, 752054400
-        tz.transition 1994, 4, :o1, 765363600
-        tz.transition 1994, 10, :o0, 783504000
-        tz.transition 1995, 4, :o1, 796813200
-        tz.transition 1995, 10, :o0, 814953600
-        tz.transition 1996, 4, :o1, 828867600
-        tz.transition 1996, 10, :o0, 846403200
-        tz.transition 1997, 4, :o1, 860317200
-        tz.transition 1997, 10, :o0, 877852800
-        tz.transition 1998, 4, :o1, 891766800
-        tz.transition 1998, 10, :o0, 909302400
-        tz.transition 1999, 4, :o1, 923216400
-        tz.transition 1999, 10, :o0, 941356800
-        tz.transition 2000, 4, :o1, 954666000
-        tz.transition 2000, 10, :o0, 972806400
-        tz.transition 2001, 4, :o1, 986115600
-        tz.transition 2001, 10, :o0, 1004256000
-        tz.transition 2002, 4, :o1, 1018170000
-        tz.transition 2002, 10, :o0, 1035705600
-        tz.transition 2003, 4, :o1, 1049619600
-        tz.transition 2003, 10, :o0, 1067155200
-        tz.transition 2004, 4, :o1, 1081069200
-        tz.transition 2004, 10, :o0, 1099209600
-        tz.transition 2005, 4, :o1, 1112518800
-        tz.transition 2005, 10, :o0, 1130659200
-        tz.transition 2006, 4, :o1, 1143968400
-        tz.transition 2006, 10, :o0, 1162108800
-        tz.transition 2007, 3, :o1, 1173603600
-        tz.transition 2007, 11, :o0, 1194163200
-        tz.transition 2008, 3, :o1, 1205053200
-        tz.transition 2008, 11, :o0, 1225612800
-        tz.transition 2009, 3, :o1, 1236502800
-        tz.transition 2009, 11, :o0, 1257062400
-        tz.transition 2010, 3, :o1, 1268557200
-        tz.transition 2010, 11, :o0, 1289116800
-        tz.transition 2011, 3, :o1, 1300006800
-        tz.transition 2011, 11, :o0, 1320566400
-        tz.transition 2012, 3, :o1, 1331456400
-        tz.transition 2012, 11, :o0, 1352016000
-        tz.transition 2013, 3, :o1, 1362906000
-        tz.transition 2013, 11, :o0, 1383465600
-        tz.transition 2014, 3, :o1, 1394355600
-        tz.transition 2014, 11, :o0, 1414915200
-        tz.transition 2015, 3, :o1, 1425805200
-        tz.transition 2015, 11, :o0, 1446364800
-        tz.transition 2016, 3, :o1, 1457859600
-        tz.transition 2016, 11, :o0, 1478419200
-        tz.transition 2017, 3, :o1, 1489309200
-        tz.transition 2017, 11, :o0, 1509868800
-        tz.transition 2018, 3, :o1, 1520758800
-        tz.transition 2018, 11, :o0, 1541318400
-        tz.transition 2019, 3, :o1, 1552208400
-        tz.transition 2019, 11, :o0, 1572768000
-        tz.transition 2020, 3, :o1, 1583658000
-        tz.transition 2020, 11, :o0, 1604217600
-        tz.transition 2021, 3, :o1, 1615712400
-        tz.transition 2021, 11, :o0, 1636272000
-        tz.transition 2022, 3, :o1, 1647162000
-        tz.transition 2022, 11, :o0, 1667721600
-        tz.transition 2023, 3, :o1, 1678611600
-        tz.transition 2023, 11, :o0, 1699171200
-        tz.transition 2024, 3, :o1, 1710061200
-        tz.transition 2024, 11, :o0, 1730620800
-        tz.transition 2025, 3, :o1, 1741510800
-        tz.transition 2025, 11, :o0, 1762070400
-        tz.transition 2026, 3, :o1, 1772960400
-        tz.transition 2026, 11, :o0, 1793520000
-        tz.transition 2027, 3, :o1, 1805014800
-        tz.transition 2027, 11, :o0, 1825574400
-        tz.transition 2028, 3, :o1, 1836464400
-        tz.transition 2028, 11, :o0, 1857024000
-        tz.transition 2029, 3, :o1, 1867914000
-        tz.transition 2029, 11, :o0, 1888473600
-        tz.transition 2030, 3, :o1, 1899363600
-        tz.transition 2030, 11, :o0, 1919923200
-        tz.transition 2031, 3, :o1, 1930813200
-        tz.transition 2031, 11, :o0, 1951372800
-        tz.transition 2032, 3, :o1, 1962867600
-        tz.transition 2032, 11, :o0, 1983427200
-        tz.transition 2033, 3, :o1, 1994317200
-        tz.transition 2033, 11, :o0, 2014876800
-        tz.transition 2034, 3, :o1, 2025766800
-        tz.transition 2034, 11, :o0, 2046326400
-        tz.transition 2035, 3, :o1, 2057216400
-        tz.transition 2035, 11, :o0, 2077776000
-        tz.transition 2036, 3, :o1, 2088666000
-        tz.transition 2036, 11, :o0, 2109225600
-        tz.transition 2037, 3, :o1, 2120115600
-        tz.transition 2037, 11, :o0, 2140675200
-        tz.transition 2038, 3, :o1, 19723975, 8
-        tz.transition 2038, 11, :o0, 14794409, 6
-        tz.transition 2039, 3, :o1, 19726887, 8
-        tz.transition 2039, 11, :o0, 14796593, 6
-        tz.transition 2040, 3, :o1, 19729799, 8
-        tz.transition 2040, 11, :o0, 14798777, 6
-        tz.transition 2041, 3, :o1, 19732711, 8
-        tz.transition 2041, 11, :o0, 14800961, 6
-        tz.transition 2042, 3, :o1, 19735623, 8
-        tz.transition 2042, 11, :o0, 14803145, 6
-        tz.transition 2043, 3, :o1, 19738535, 8
-        tz.transition 2043, 11, :o0, 14805329, 6
-        tz.transition 2044, 3, :o1, 19741503, 8
-        tz.transition 2044, 11, :o0, 14807555, 6
-        tz.transition 2045, 3, :o1, 19744415, 8
-        tz.transition 2045, 11, :o0, 14809739, 6
-        tz.transition 2046, 3, :o1, 19747327, 8
-        tz.transition 2046, 11, :o0, 14811923, 6
-        tz.transition 2047, 3, :o1, 19750239, 8
-        tz.transition 2047, 11, :o0, 14814107, 6
-        tz.transition 2048, 3, :o1, 19753151, 8
-        tz.transition 2048, 11, :o0, 14816291, 6
-        tz.transition 2049, 3, :o1, 19756119, 8
-        tz.transition 2049, 11, :o0, 14818517, 6
-        tz.transition 2050, 3, :o1, 19759031, 8
-        tz.transition 2050, 11, :o0, 14820701, 6
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaNorte.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaNorte.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaNorte.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaNorte.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Mexico
-      module BajaNorte
-        include TimezoneDefinition
-        
-        linked_timezone 'Mexico/BajaNorte', 'America/Tijuana'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaSur.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaSur.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaSur.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/BajaSur.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Mexico
-      module BajaSur
-        include TimezoneDefinition
-        
-        linked_timezone 'Mexico/BajaSur', 'America/Mazatlan'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/General.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/General.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/General.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mexico/General.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Mexico
-      module General
-        include TimezoneDefinition
-        
-        linked_timezone 'Mexico/General', 'America/Mexico_City'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh87.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh87.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh87.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh87.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Mideast
-      module Riyadh87
-        include TimezoneDefinition
-        
-        linked_timezone 'Mideast/Riyadh87', 'Asia/Riyadh87'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh88.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh88.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh88.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh88.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Mideast
-      module Riyadh88
-        include TimezoneDefinition
-        
-        linked_timezone 'Mideast/Riyadh88', 'Asia/Riyadh88'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh89.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh89.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh89.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Mideast/Riyadh89.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Mideast
-      module Riyadh89
-        include TimezoneDefinition
-        
-        linked_timezone 'Mideast/Riyadh89', 'Asia/Riyadh89'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module NZ
-      include TimezoneDefinition
-      
-      linked_timezone 'NZ', 'Pacific/Auckland'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ__m__CHAT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ__m__CHAT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ__m__CHAT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/NZ__m__CHAT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module NZ__m__CHAT
-      include TimezoneDefinition
-      
-      linked_timezone 'NZ-CHAT', 'Pacific/Chatham'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Navajo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Navajo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Navajo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Navajo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Navajo
-      include TimezoneDefinition
-      
-      linked_timezone 'Navajo', 'America/Denver'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PRC.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PRC.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PRC.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PRC.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module PRC
-      include TimezoneDefinition
-      
-      linked_timezone 'PRC', 'Asia/Shanghai'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PST8PDT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PST8PDT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PST8PDT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/PST8PDT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,192 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module PST8PDT
-      include TimezoneDefinition
-      
-      timezone 'PST8PDT' do |tz|
-        tz.offset :o0, -28800, 0, :PST
-        tz.offset :o1, -28800, 3600, :PDT
-        tz.offset :o2, -28800, 3600, :PWT
-        tz.offset :o3, -28800, 3600, :PPT
-        
-        tz.transition 1918, 3, :o1, 29060207, 12
-        tz.transition 1918, 10, :o0, 19375151, 8
-        tz.transition 1919, 3, :o1, 29064575, 12
-        tz.transition 1919, 10, :o0, 19378063, 8
-        tz.transition 1942, 2, :o2, 29164799, 12
-        tz.transition 1945, 8, :o3, 58360379, 24
-        tz.transition 1945, 9, :o0, 19453831, 8
-        tz.transition 1967, 4, :o1, 29275331, 12
-        tz.transition 1967, 10, :o0, 19518343, 8
-        tz.transition 1968, 4, :o1, 29279699, 12
-        tz.transition 1968, 10, :o0, 19521255, 8
-        tz.transition 1969, 4, :o1, 29284067, 12
-        tz.transition 1969, 10, :o0, 19524167, 8
-        tz.transition 1970, 4, :o1, 9972000
-        tz.transition 1970, 10, :o0, 25693200
-        tz.transition 1971, 4, :o1, 41421600
-        tz.transition 1971, 10, :o0, 57747600
-        tz.transition 1972, 4, :o1, 73476000
-        tz.transition 1972, 10, :o0, 89197200
-        tz.transition 1973, 4, :o1, 104925600
-        tz.transition 1973, 10, :o0, 120646800
-        tz.transition 1974, 1, :o1, 126698400
-        tz.transition 1974, 10, :o0, 152096400
-        tz.transition 1975, 2, :o1, 162381600
-        tz.transition 1975, 10, :o0, 183546000
-        tz.transition 1976, 4, :o1, 199274400
-        tz.transition 1976, 10, :o0, 215600400
-        tz.transition 1977, 4, :o1, 230724000
-        tz.transition 1977, 10, :o0, 247050000
-        tz.transition 1978, 4, :o1, 262778400
-        tz.transition 1978, 10, :o0, 278499600
-        tz.transition 1979, 4, :o1, 294228000
-        tz.transition 1979, 10, :o0, 309949200
-        tz.transition 1980, 4, :o1, 325677600
-        tz.transition 1980, 10, :o0, 341398800
-        tz.transition 1981, 4, :o1, 357127200
-        tz.transition 1981, 10, :o0, 372848400
-        tz.transition 1982, 4, :o1, 388576800
-        tz.transition 1982, 10, :o0, 404902800
-        tz.transition 1983, 4, :o1, 420026400
-        tz.transition 1983, 10, :o0, 436352400
-        tz.transition 1984, 4, :o1, 452080800
-        tz.transition 1984, 10, :o0, 467802000
-        tz.transition 1985, 4, :o1, 483530400
-        tz.transition 1985, 10, :o0, 499251600
-        tz.transition 1986, 4, :o1, 514980000
-        tz.transition 1986, 10, :o0, 530701200
-        tz.transition 1987, 4, :o1, 544615200
-        tz.transition 1987, 10, :o0, 562150800
-        tz.transition 1988, 4, :o1, 576064800
-        tz.transition 1988, 10, :o0, 594205200
-        tz.transition 1989, 4, :o1, 607514400
-        tz.transition 1989, 10, :o0, 625654800
-        tz.transition 1990, 4, :o1, 638964000
-        tz.transition 1990, 10, :o0, 657104400
-        tz.transition 1991, 4, :o1, 671018400
-        tz.transition 1991, 10, :o0, 688554000
-        tz.transition 1992, 4, :o1, 702468000
-        tz.transition 1992, 10, :o0, 720003600
-        tz.transition 1993, 4, :o1, 733917600
-        tz.transition 1993, 10, :o0, 752058000
-        tz.transition 1994, 4, :o1, 765367200
-        tz.transition 1994, 10, :o0, 783507600
-        tz.transition 1995, 4, :o1, 796816800
-        tz.transition 1995, 10, :o0, 814957200
-        tz.transition 1996, 4, :o1, 828871200
-        tz.transition 1996, 10, :o0, 846406800
-        tz.transition 1997, 4, :o1, 860320800
-        tz.transition 1997, 10, :o0, 877856400
-        tz.transition 1998, 4, :o1, 891770400
-        tz.transition 1998, 10, :o0, 909306000
-        tz.transition 1999, 4, :o1, 923220000
-        tz.transition 1999, 10, :o0, 941360400
-        tz.transition 2000, 4, :o1, 954669600
-        tz.transition 2000, 10, :o0, 972810000
-        tz.transition 2001, 4, :o1, 986119200
-        tz.transition 2001, 10, :o0, 1004259600
-        tz.transition 2002, 4, :o1, 1018173600
-        tz.transition 2002, 10, :o0, 1035709200
-        tz.transition 2003, 4, :o1, 1049623200
-        tz.transition 2003, 10, :o0, 1067158800
-        tz.transition 2004, 4, :o1, 1081072800
-        tz.transition 2004, 10, :o0, 1099213200
-        tz.transition 2005, 4, :o1, 1112522400
-        tz.transition 2005, 10, :o0, 1130662800
-        tz.transition 2006, 4, :o1, 1143972000
-        tz.transition 2006, 10, :o0, 1162112400
-        tz.transition 2007, 3, :o1, 1173607200
-        tz.transition 2007, 11, :o0, 1194166800
-        tz.transition 2008, 3, :o1, 1205056800
-        tz.transition 2008, 11, :o0, 1225616400
-        tz.transition 2009, 3, :o1, 1236506400
-        tz.transition 2009, 11, :o0, 1257066000
-        tz.transition 2010, 3, :o1, 1268560800
-        tz.transition 2010, 11, :o0, 1289120400
-        tz.transition 2011, 3, :o1, 1300010400
-        tz.transition 2011, 11, :o0, 1320570000
-        tz.transition 2012, 3, :o1, 1331460000
-        tz.transition 2012, 11, :o0, 1352019600
-        tz.transition 2013, 3, :o1, 1362909600
-        tz.transition 2013, 11, :o0, 1383469200
-        tz.transition 2014, 3, :o1, 1394359200
-        tz.transition 2014, 11, :o0, 1414918800
-        tz.transition 2015, 3, :o1, 1425808800
-        tz.transition 2015, 11, :o0, 1446368400
-        tz.transition 2016, 3, :o1, 1457863200
-        tz.transition 2016, 11, :o0, 1478422800
-        tz.transition 2017, 3, :o1, 1489312800
-        tz.transition 2017, 11, :o0, 1509872400
-        tz.transition 2018, 3, :o1, 1520762400
-        tz.transition 2018, 11, :o0, 1541322000
-        tz.transition 2019, 3, :o1, 1552212000
-        tz.transition 2019, 11, :o0, 1572771600
-        tz.transition 2020, 3, :o1, 1583661600
-        tz.transition 2020, 11, :o0, 1604221200
-        tz.transition 2021, 3, :o1, 1615716000
-        tz.transition 2021, 11, :o0, 1636275600
-        tz.transition 2022, 3, :o1, 1647165600
-        tz.transition 2022, 11, :o0, 1667725200
-        tz.transition 2023, 3, :o1, 1678615200
-        tz.transition 2023, 11, :o0, 1699174800
-        tz.transition 2024, 3, :o1, 1710064800
-        tz.transition 2024, 11, :o0, 1730624400
-        tz.transition 2025, 3, :o1, 1741514400
-        tz.transition 2025, 11, :o0, 1762074000
-        tz.transition 2026, 3, :o1, 1772964000
-        tz.transition 2026, 11, :o0, 1793523600
-        tz.transition 2027, 3, :o1, 1805018400
-        tz.transition 2027, 11, :o0, 1825578000
-        tz.transition 2028, 3, :o1, 1836468000
-        tz.transition 2028, 11, :o0, 1857027600
-        tz.transition 2029, 3, :o1, 1867917600
-        tz.transition 2029, 11, :o0, 1888477200
-        tz.transition 2030, 3, :o1, 1899367200
-        tz.transition 2030, 11, :o0, 1919926800
-        tz.transition 2031, 3, :o1, 1930816800
-        tz.transition 2031, 11, :o0, 1951376400
-        tz.transition 2032, 3, :o1, 1962871200
-        tz.transition 2032, 11, :o0, 1983430800
-        tz.transition 2033, 3, :o1, 1994320800
-        tz.transition 2033, 11, :o0, 2014880400
-        tz.transition 2034, 3, :o1, 2025770400
-        tz.transition 2034, 11, :o0, 2046330000
-        tz.transition 2035, 3, :o1, 2057220000
-        tz.transition 2035, 11, :o0, 2077779600
-        tz.transition 2036, 3, :o1, 2088669600
-        tz.transition 2036, 11, :o0, 2109229200
-        tz.transition 2037, 3, :o1, 2120119200
-        tz.transition 2037, 11, :o0, 2140678800
-        tz.transition 2038, 3, :o1, 29585963, 12
-        tz.transition 2038, 11, :o0, 19725879, 8
-        tz.transition 2039, 3, :o1, 29590331, 12
-        tz.transition 2039, 11, :o0, 19728791, 8
-        tz.transition 2040, 3, :o1, 29594699, 12
-        tz.transition 2040, 11, :o0, 19731703, 8
-        tz.transition 2041, 3, :o1, 29599067, 12
-        tz.transition 2041, 11, :o0, 19734615, 8
-        tz.transition 2042, 3, :o1, 29603435, 12
-        tz.transition 2042, 11, :o0, 19737527, 8
-        tz.transition 2043, 3, :o1, 29607803, 12
-        tz.transition 2043, 11, :o0, 19740439, 8
-        tz.transition 2044, 3, :o1, 29612255, 12
-        tz.transition 2044, 11, :o0, 19743407, 8
-        tz.transition 2045, 3, :o1, 29616623, 12
-        tz.transition 2045, 11, :o0, 19746319, 8
-        tz.transition 2046, 3, :o1, 29620991, 12
-        tz.transition 2046, 11, :o0, 19749231, 8
-        tz.transition 2047, 3, :o1, 29625359, 12
-        tz.transition 2047, 11, :o0, 19752143, 8
-        tz.transition 2048, 3, :o1, 29629727, 12
-        tz.transition 2048, 11, :o0, 19755055, 8
-        tz.transition 2049, 3, :o1, 29634179, 12
-        tz.transition 2049, 11, :o0, 19758023, 8
-        tz.transition 2050, 3, :o1, 29638547, 12
-        tz.transition 2050, 11, :o0, 19760935, 8
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Apia.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Apia.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Apia.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Apia.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Apia
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Apia' do |tz|
-          tz.offset :o0, 45184, 0, :LMT
-          tz.offset :o1, -41216, 0, :LMT
-          tz.offset :o2, -41400, 0, :SAMT
-          tz.offset :o3, -39600, 0, :WST
-          
-          tz.transition 1879, 7, :o1, 3250172219, 1350
-          tz.transition 1911, 1, :o2, 3265701269, 1350
-          tz.transition 1950, 1, :o3, 116797583, 48
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Auckland.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Auckland.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Auckland.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Auckland.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,202 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Auckland
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Auckland' do |tz|
-          tz.offset :o0, 41944, 0, :LMT
-          tz.offset :o1, 41400, 0, :NZMT
-          tz.offset :o2, 41400, 3600, :NZST
-          tz.offset :o3, 41400, 1800, :NZST
-          tz.offset :o4, 43200, 0, :NZST
-          tz.offset :o5, 43200, 3600, :NZDT
-          
-          tz.transition 1868, 11, :o1, 25959290557, 10800
-          tz.transition 1927, 11, :o2, 116409125, 48
-          tz.transition 1928, 3, :o1, 38804945, 16
-          tz.transition 1928, 10, :o3, 116425589, 48
-          tz.transition 1929, 3, :o1, 29108245, 12
-          tz.transition 1929, 10, :o3, 116443061, 48
-          tz.transition 1930, 3, :o1, 29112613, 12
-          tz.transition 1930, 10, :o3, 116460533, 48
-          tz.transition 1931, 3, :o1, 29116981, 12
-          tz.transition 1931, 10, :o3, 116478005, 48
-          tz.transition 1932, 3, :o1, 29121433, 12
-          tz.transition 1932, 10, :o3, 116495477, 48
-          tz.transition 1933, 3, :o1, 29125801, 12
-          tz.transition 1933, 10, :o3, 116512949, 48
-          tz.transition 1934, 4, :o1, 29130673, 12
-          tz.transition 1934, 9, :o3, 116530085, 48
-          tz.transition 1935, 4, :o1, 29135041, 12
-          tz.transition 1935, 9, :o3, 116547557, 48
-          tz.transition 1936, 4, :o1, 29139409, 12
-          tz.transition 1936, 9, :o3, 116565029, 48
-          tz.transition 1937, 4, :o1, 29143777, 12
-          tz.transition 1937, 9, :o3, 116582501, 48
-          tz.transition 1938, 4, :o1, 29148145, 12
-          tz.transition 1938, 9, :o3, 116599973, 48
-          tz.transition 1939, 4, :o1, 29152597, 12
-          tz.transition 1939, 9, :o3, 116617445, 48
-          tz.transition 1940, 4, :o1, 29156965, 12
-          tz.transition 1940, 9, :o3, 116635253, 48
-          tz.transition 1945, 12, :o4, 2431821, 1
-          tz.transition 1974, 11, :o5, 152632800
-          tz.transition 1975, 2, :o4, 162309600
-          tz.transition 1975, 10, :o5, 183477600
-          tz.transition 1976, 3, :o4, 194968800
-          tz.transition 1976, 10, :o5, 215532000
-          tz.transition 1977, 3, :o4, 226418400
-          tz.transition 1977, 10, :o5, 246981600
-          tz.transition 1978, 3, :o4, 257868000
-          tz.transition 1978, 10, :o5, 278431200
-          tz.transition 1979, 3, :o4, 289317600
-          tz.transition 1979, 10, :o5, 309880800
-          tz.transition 1980, 3, :o4, 320767200
-          tz.transition 1980, 10, :o5, 341330400
-          tz.transition 1981, 2, :o4, 352216800
-          tz.transition 1981, 10, :o5, 372780000
-          tz.transition 1982, 3, :o4, 384271200
-          tz.transition 1982, 10, :o5, 404834400
-          tz.transition 1983, 3, :o4, 415720800
-          tz.transition 1983, 10, :o5, 436284000
-          tz.transition 1984, 3, :o4, 447170400
-          tz.transition 1984, 10, :o5, 467733600
-          tz.transition 1985, 3, :o4, 478620000
-          tz.transition 1985, 10, :o5, 499183200
-          tz.transition 1986, 3, :o4, 510069600
-          tz.transition 1986, 10, :o5, 530632800
-          tz.transition 1987, 2, :o4, 541519200
-          tz.transition 1987, 10, :o5, 562082400
-          tz.transition 1988, 3, :o4, 573573600
-          tz.transition 1988, 10, :o5, 594136800
-          tz.transition 1989, 3, :o4, 605023200
-          tz.transition 1989, 10, :o5, 623772000
-          tz.transition 1990, 3, :o4, 637682400
-          tz.transition 1990, 10, :o5, 655221600
-          tz.transition 1991, 3, :o4, 669132000
-          tz.transition 1991, 10, :o5, 686671200
-          tz.transition 1992, 3, :o4, 700581600
-          tz.transition 1992, 10, :o5, 718120800
-          tz.transition 1993, 3, :o4, 732636000
-          tz.transition 1993, 10, :o5, 749570400
-          tz.transition 1994, 3, :o4, 764085600
-          tz.transition 1994, 10, :o5, 781020000
-          tz.transition 1995, 3, :o4, 795535200
-          tz.transition 1995, 9, :o5, 812469600
-          tz.transition 1996, 3, :o4, 826984800
-          tz.transition 1996, 10, :o5, 844524000
-          tz.transition 1997, 3, :o4, 858434400
-          tz.transition 1997, 10, :o5, 875973600
-          tz.transition 1998, 3, :o4, 889884000
-          tz.transition 1998, 10, :o5, 907423200
-          tz.transition 1999, 3, :o4, 921938400
-          tz.transition 1999, 10, :o5, 938872800
-          tz.transition 2000, 3, :o4, 953388000
-          tz.transition 2000, 9, :o5, 970322400
-          tz.transition 2001, 3, :o4, 984837600
-          tz.transition 2001, 10, :o5, 1002376800
-          tz.transition 2002, 3, :o4, 1016287200
-          tz.transition 2002, 10, :o5, 1033826400
-          tz.transition 2003, 3, :o4, 1047736800
-          tz.transition 2003, 10, :o5, 1065276000
-          tz.transition 2004, 3, :o4, 1079791200
-          tz.transition 2004, 10, :o5, 1096725600
-          tz.transition 2005, 3, :o4, 1111240800
-          tz.transition 2005, 10, :o5, 1128175200
-          tz.transition 2006, 3, :o4, 1142690400
-          tz.transition 2006, 9, :o5, 1159624800
-          tz.transition 2007, 3, :o4, 1174140000
-          tz.transition 2007, 10, :o5, 1191679200
-          tz.transition 2008, 3, :o4, 1205589600
-          tz.transition 2008, 10, :o5, 1223128800
-          tz.transition 2009, 3, :o4, 1237039200
-          tz.transition 2009, 10, :o5, 1254578400
-          tz.transition 2010, 3, :o4, 1269093600
-          tz.transition 2010, 10, :o5, 1286028000
-          tz.transition 2011, 3, :o4, 1300543200
-          tz.transition 2011, 10, :o5, 1317477600
-          tz.transition 2012, 3, :o4, 1331992800
-          tz.transition 2012, 10, :o5, 1349532000
-          tz.transition 2013, 3, :o4, 1363442400
-          tz.transition 2013, 10, :o5, 1380981600
-          tz.transition 2014, 3, :o4, 1394892000
-          tz.transition 2014, 10, :o5, 1412431200
-          tz.transition 2015, 3, :o4, 1426341600
-          tz.transition 2015, 10, :o5, 1443880800
-          tz.transition 2016, 3, :o4, 1458396000
-          tz.transition 2016, 10, :o5, 1475330400
-          tz.transition 2017, 3, :o4, 1489845600
-          tz.transition 2017, 9, :o5, 1506780000
-          tz.transition 2018, 3, :o4, 1521295200
-          tz.transition 2018, 10, :o5, 1538834400
-          tz.transition 2019, 3, :o4, 1552744800
-          tz.transition 2019, 10, :o5, 1570284000
-          tz.transition 2020, 3, :o4, 1584194400
-          tz.transition 2020, 10, :o5, 1601733600
-          tz.transition 2021, 3, :o4, 1616248800
-          tz.transition 2021, 10, :o5, 1633183200
-          tz.transition 2022, 3, :o4, 1647698400
-          tz.transition 2022, 10, :o5, 1664632800
-          tz.transition 2023, 3, :o4, 1679148000
-          tz.transition 2023, 9, :o5, 1696082400
-          tz.transition 2024, 3, :o4, 1710597600
-          tz.transition 2024, 10, :o5, 1728136800
-          tz.transition 2025, 3, :o4, 1742047200
-          tz.transition 2025, 10, :o5, 1759586400
-          tz.transition 2026, 3, :o4, 1773496800
-          tz.transition 2026, 10, :o5, 1791036000
-          tz.transition 2027, 3, :o4, 1805551200
-          tz.transition 2027, 10, :o5, 1822485600
-          tz.transition 2028, 3, :o4, 1837000800
-          tz.transition 2028, 9, :o5, 1853935200
-          tz.transition 2029, 3, :o4, 1868450400
-          tz.transition 2029, 10, :o5, 1885989600
-          tz.transition 2030, 3, :o4, 1899900000
-          tz.transition 2030, 10, :o5, 1917439200
-          tz.transition 2031, 3, :o4, 1931349600
-          tz.transition 2031, 10, :o5, 1948888800
-          tz.transition 2032, 3, :o4, 1963404000
-          tz.transition 2032, 10, :o5, 1980338400
-          tz.transition 2033, 3, :o4, 1994853600
-          tz.transition 2033, 10, :o5, 2011788000
-          tz.transition 2034, 3, :o4, 2026303200
-          tz.transition 2034, 9, :o5, 2043237600
-          tz.transition 2035, 3, :o4, 2057752800
-          tz.transition 2035, 10, :o5, 2075292000
-          tz.transition 2036, 3, :o4, 2089202400
-          tz.transition 2036, 10, :o5, 2106741600
-          tz.transition 2037, 3, :o4, 2120652000
-          tz.transition 2037, 10, :o5, 2138191200
-          tz.transition 2038, 3, :o4, 29586037, 12
-          tz.transition 2038, 10, :o5, 29588389, 12
-          tz.transition 2039, 3, :o4, 29590405, 12
-          tz.transition 2039, 10, :o5, 29592757, 12
-          tz.transition 2040, 3, :o4, 29594773, 12
-          tz.transition 2040, 10, :o5, 29597209, 12
-          tz.transition 2041, 3, :o4, 29599141, 12
-          tz.transition 2041, 10, :o5, 29601577, 12
-          tz.transition 2042, 3, :o4, 29603509, 12
-          tz.transition 2042, 10, :o5, 29605945, 12
-          tz.transition 2043, 3, :o4, 29607877, 12
-          tz.transition 2043, 10, :o5, 29610313, 12
-          tz.transition 2044, 3, :o4, 29612329, 12
-          tz.transition 2044, 10, :o5, 29614681, 12
-          tz.transition 2045, 3, :o4, 29616697, 12
-          tz.transition 2045, 9, :o5, 29619049, 12
-          tz.transition 2046, 3, :o4, 29621065, 12
-          tz.transition 2046, 10, :o5, 29623501, 12
-          tz.transition 2047, 3, :o4, 29625433, 12
-          tz.transition 2047, 10, :o5, 29627869, 12
-          tz.transition 2048, 3, :o4, 29629801, 12
-          tz.transition 2048, 10, :o5, 29632237, 12
-          tz.transition 2049, 3, :o4, 29634253, 12
-          tz.transition 2049, 10, :o5, 29636605, 12
-          tz.transition 2050, 3, :o4, 29638621, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Chatham.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Chatham.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Chatham.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Chatham.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,171 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Chatham
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Chatham' do |tz|
-          tz.offset :o0, 44028, 0, :LMT
-          tz.offset :o1, 45900, 0, :CHAST
-          tz.offset :o2, 45900, 3600, :CHADT
-          
-          tz.transition 1956, 12, :o1, 5846013577, 2400
-          tz.transition 1974, 11, :o2, 152632800
-          tz.transition 1975, 2, :o1, 162309600
-          tz.transition 1975, 10, :o2, 183477600
-          tz.transition 1976, 3, :o1, 194968800
-          tz.transition 1976, 10, :o2, 215532000
-          tz.transition 1977, 3, :o1, 226418400
-          tz.transition 1977, 10, :o2, 246981600
-          tz.transition 1978, 3, :o1, 257868000
-          tz.transition 1978, 10, :o2, 278431200
-          tz.transition 1979, 3, :o1, 289317600
-          tz.transition 1979, 10, :o2, 309880800
-          tz.transition 1980, 3, :o1, 320767200
-          tz.transition 1980, 10, :o2, 341330400
-          tz.transition 1981, 2, :o1, 352216800
-          tz.transition 1981, 10, :o2, 372780000
-          tz.transition 1982, 3, :o1, 384271200
-          tz.transition 1982, 10, :o2, 404834400
-          tz.transition 1983, 3, :o1, 415720800
-          tz.transition 1983, 10, :o2, 436284000
-          tz.transition 1984, 3, :o1, 447170400
-          tz.transition 1984, 10, :o2, 467733600
-          tz.transition 1985, 3, :o1, 478620000
-          tz.transition 1985, 10, :o2, 499183200
-          tz.transition 1986, 3, :o1, 510069600
-          tz.transition 1986, 10, :o2, 530632800
-          tz.transition 1987, 2, :o1, 541519200
-          tz.transition 1987, 10, :o2, 562082400
-          tz.transition 1988, 3, :o1, 573573600
-          tz.transition 1988, 10, :o2, 594136800
-          tz.transition 1989, 3, :o1, 605023200
-          tz.transition 1989, 10, :o2, 623772000
-          tz.transition 1990, 3, :o1, 637682400
-          tz.transition 1990, 10, :o2, 655221600
-          tz.transition 1991, 3, :o1, 669132000
-          tz.transition 1991, 10, :o2, 686671200
-          tz.transition 1992, 3, :o1, 700581600
-          tz.transition 1992, 10, :o2, 718120800
-          tz.transition 1993, 3, :o1, 732636000
-          tz.transition 1993, 10, :o2, 749570400
-          tz.transition 1994, 3, :o1, 764085600
-          tz.transition 1994, 10, :o2, 781020000
-          tz.transition 1995, 3, :o1, 795535200
-          tz.transition 1995, 9, :o2, 812469600
-          tz.transition 1996, 3, :o1, 826984800
-          tz.transition 1996, 10, :o2, 844524000
-          tz.transition 1997, 3, :o1, 858434400
-          tz.transition 1997, 10, :o2, 875973600
-          tz.transition 1998, 3, :o1, 889884000
-          tz.transition 1998, 10, :o2, 907423200
-          tz.transition 1999, 3, :o1, 921938400
-          tz.transition 1999, 10, :o2, 938872800
-          tz.transition 2000, 3, :o1, 953388000
-          tz.transition 2000, 9, :o2, 970322400
-          tz.transition 2001, 3, :o1, 984837600
-          tz.transition 2001, 10, :o2, 1002376800
-          tz.transition 2002, 3, :o1, 1016287200
-          tz.transition 2002, 10, :o2, 1033826400
-          tz.transition 2003, 3, :o1, 1047736800
-          tz.transition 2003, 10, :o2, 1065276000
-          tz.transition 2004, 3, :o1, 1079791200
-          tz.transition 2004, 10, :o2, 1096725600
-          tz.transition 2005, 3, :o1, 1111240800
-          tz.transition 2005, 10, :o2, 1128175200
-          tz.transition 2006, 3, :o1, 1142690400
-          tz.transition 2006, 9, :o2, 1159624800
-          tz.transition 2007, 3, :o1, 1174140000
-          tz.transition 2007, 10, :o2, 1191679200
-          tz.transition 2008, 3, :o1, 1205589600
-          tz.transition 2008, 10, :o2, 1223128800
-          tz.transition 2009, 3, :o1, 1237039200
-          tz.transition 2009, 10, :o2, 1254578400
-          tz.transition 2010, 3, :o1, 1269093600
-          tz.transition 2010, 10, :o2, 1286028000
-          tz.transition 2011, 3, :o1, 1300543200
-          tz.transition 2011, 10, :o2, 1317477600
-          tz.transition 2012, 3, :o1, 1331992800
-          tz.transition 2012, 10, :o2, 1349532000
-          tz.transition 2013, 3, :o1, 1363442400
-          tz.transition 2013, 10, :o2, 1380981600
-          tz.transition 2014, 3, :o1, 1394892000
-          tz.transition 2014, 10, :o2, 1412431200
-          tz.transition 2015, 3, :o1, 1426341600
-          tz.transition 2015, 10, :o2, 1443880800
-          tz.transition 2016, 3, :o1, 1458396000
-          tz.transition 2016, 10, :o2, 1475330400
-          tz.transition 2017, 3, :o1, 1489845600
-          tz.transition 2017, 9, :o2, 1506780000
-          tz.transition 2018, 3, :o1, 1521295200
-          tz.transition 2018, 10, :o2, 1538834400
-          tz.transition 2019, 3, :o1, 1552744800
-          tz.transition 2019, 10, :o2, 1570284000
-          tz.transition 2020, 3, :o1, 1584194400
-          tz.transition 2020, 10, :o2, 1601733600
-          tz.transition 2021, 3, :o1, 1616248800
-          tz.transition 2021, 10, :o2, 1633183200
-          tz.transition 2022, 3, :o1, 1647698400
-          tz.transition 2022, 10, :o2, 1664632800
-          tz.transition 2023, 3, :o1, 1679148000
-          tz.transition 2023, 9, :o2, 1696082400
-          tz.transition 2024, 3, :o1, 1710597600
-          tz.transition 2024, 10, :o2, 1728136800
-          tz.transition 2025, 3, :o1, 1742047200
-          tz.transition 2025, 10, :o2, 1759586400
-          tz.transition 2026, 3, :o1, 1773496800
-          tz.transition 2026, 10, :o2, 1791036000
-          tz.transition 2027, 3, :o1, 1805551200
-          tz.transition 2027, 10, :o2, 1822485600
-          tz.transition 2028, 3, :o1, 1837000800
-          tz.transition 2028, 9, :o2, 1853935200
-          tz.transition 2029, 3, :o1, 1868450400
-          tz.transition 2029, 10, :o2, 1885989600
-          tz.transition 2030, 3, :o1, 1899900000
-          tz.transition 2030, 10, :o2, 1917439200
-          tz.transition 2031, 3, :o1, 1931349600
-          tz.transition 2031, 10, :o2, 1948888800
-          tz.transition 2032, 3, :o1, 1963404000
-          tz.transition 2032, 10, :o2, 1980338400
-          tz.transition 2033, 3, :o1, 1994853600
-          tz.transition 2033, 10, :o2, 2011788000
-          tz.transition 2034, 3, :o1, 2026303200
-          tz.transition 2034, 9, :o2, 2043237600
-          tz.transition 2035, 3, :o1, 2057752800
-          tz.transition 2035, 10, :o2, 2075292000
-          tz.transition 2036, 3, :o1, 2089202400
-          tz.transition 2036, 10, :o2, 2106741600
-          tz.transition 2037, 3, :o1, 2120652000
-          tz.transition 2037, 10, :o2, 2138191200
-          tz.transition 2038, 3, :o1, 29586037, 12
-          tz.transition 2038, 10, :o2, 29588389, 12
-          tz.transition 2039, 3, :o1, 29590405, 12
-          tz.transition 2039, 10, :o2, 29592757, 12
-          tz.transition 2040, 3, :o1, 29594773, 12
-          tz.transition 2040, 10, :o2, 29597209, 12
-          tz.transition 2041, 3, :o1, 29599141, 12
-          tz.transition 2041, 10, :o2, 29601577, 12
-          tz.transition 2042, 3, :o1, 29603509, 12
-          tz.transition 2042, 10, :o2, 29605945, 12
-          tz.transition 2043, 3, :o1, 29607877, 12
-          tz.transition 2043, 10, :o2, 29610313, 12
-          tz.transition 2044, 3, :o1, 29612329, 12
-          tz.transition 2044, 10, :o2, 29614681, 12
-          tz.transition 2045, 3, :o1, 29616697, 12
-          tz.transition 2045, 9, :o2, 29619049, 12
-          tz.transition 2046, 3, :o1, 29621065, 12
-          tz.transition 2046, 10, :o2, 29623501, 12
-          tz.transition 2047, 3, :o1, 29625433, 12
-          tz.transition 2047, 10, :o2, 29627869, 12
-          tz.transition 2048, 3, :o1, 29629801, 12
-          tz.transition 2048, 10, :o2, 29632237, 12
-          tz.transition 2049, 3, :o1, 29634253, 12
-          tz.transition 2049, 10, :o2, 29636605, 12
-          tz.transition 2050, 3, :o1, 29638621, 12
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Easter.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Easter.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Easter.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Easter.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,191 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Easter
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Easter' do |tz|
-          tz.offset :o0, -26248, 0, :LMT
-          tz.offset :o1, -26248, 0, :MMT
-          tz.offset :o2, -25200, 0, :EAST
-          tz.offset :o3, -25200, 3600, :EASST
-          tz.offset :o4, -21600, 0, :EAST
-          tz.offset :o5, -21600, 3600, :EASST
-          
-          tz.transition 1890, 1, :o1, 26042783081, 10800
-          tz.transition 1932, 9, :o2, 26211079481, 10800
-          tz.transition 1966, 10, :o3, 7318223, 3
-          tz.transition 1967, 3, :o2, 19516493, 8
-          tz.transition 1967, 10, :o3, 7319336, 3
-          tz.transition 1968, 3, :o2, 19519405, 8
-          tz.transition 1968, 10, :o3, 7320428, 3
-          tz.transition 1969, 3, :o2, 19522317, 8
-          tz.transition 1969, 10, :o3, 7321520, 3
-          tz.transition 1970, 3, :o2, 6318000
-          tz.transition 1970, 10, :o3, 24465600
-          tz.transition 1971, 3, :o2, 37767600
-          tz.transition 1971, 10, :o3, 55915200
-          tz.transition 1972, 3, :o2, 69217200
-          tz.transition 1972, 10, :o3, 87969600
-          tz.transition 1973, 3, :o2, 100666800
-          tz.transition 1973, 10, :o3, 119419200
-          tz.transition 1974, 3, :o2, 132116400
-          tz.transition 1974, 10, :o3, 150868800
-          tz.transition 1975, 3, :o2, 163566000
-          tz.transition 1975, 10, :o3, 182318400
-          tz.transition 1976, 3, :o2, 195620400
-          tz.transition 1976, 10, :o3, 213768000
-          tz.transition 1977, 3, :o2, 227070000
-          tz.transition 1977, 10, :o3, 245217600
-          tz.transition 1978, 3, :o2, 258519600
-          tz.transition 1978, 10, :o3, 277272000
-          tz.transition 1979, 3, :o2, 289969200
-          tz.transition 1979, 10, :o3, 308721600
-          tz.transition 1980, 3, :o2, 321418800
-          tz.transition 1980, 10, :o3, 340171200
-          tz.transition 1981, 3, :o2, 353473200
-          tz.transition 1981, 10, :o3, 371620800
-          tz.transition 1982, 3, :o4, 384922800
-          tz.transition 1982, 10, :o5, 403070400
-          tz.transition 1983, 3, :o4, 416372400
-          tz.transition 1983, 10, :o5, 434520000
-          tz.transition 1984, 3, :o4, 447822000
-          tz.transition 1984, 10, :o5, 466574400
-          tz.transition 1985, 3, :o4, 479271600
-          tz.transition 1985, 10, :o5, 498024000
-          tz.transition 1986, 3, :o4, 510721200
-          tz.transition 1986, 10, :o5, 529473600
-          tz.transition 1987, 3, :o4, 542775600
-          tz.transition 1987, 10, :o5, 560923200
-          tz.transition 1988, 3, :o4, 574225200
-          tz.transition 1988, 10, :o5, 592372800
-          tz.transition 1989, 3, :o4, 605674800
-          tz.transition 1989, 10, :o5, 624427200
-          tz.transition 1990, 3, :o4, 637124400
-          tz.transition 1990, 10, :o5, 655876800
-          tz.transition 1991, 3, :o4, 668574000
-          tz.transition 1991, 10, :o5, 687326400
-          tz.transition 1992, 3, :o4, 700628400
-          tz.transition 1992, 10, :o5, 718776000
-          tz.transition 1993, 3, :o4, 732078000
-          tz.transition 1993, 10, :o5, 750225600
-          tz.transition 1994, 3, :o4, 763527600
-          tz.transition 1994, 10, :o5, 781675200
-          tz.transition 1995, 3, :o4, 794977200
-          tz.transition 1995, 10, :o5, 813729600
-          tz.transition 1996, 3, :o4, 826426800
-          tz.transition 1996, 10, :o5, 845179200
-          tz.transition 1997, 3, :o4, 857876400
-          tz.transition 1997, 10, :o5, 876628800
-          tz.transition 1998, 3, :o4, 889930800
-          tz.transition 1998, 9, :o5, 906868800
-          tz.transition 1999, 4, :o4, 923194800
-          tz.transition 1999, 10, :o5, 939528000
-          tz.transition 2000, 3, :o4, 952830000
-          tz.transition 2000, 10, :o5, 971582400
-          tz.transition 2001, 3, :o4, 984279600
-          tz.transition 2001, 10, :o5, 1003032000
-          tz.transition 2002, 3, :o4, 1015729200
-          tz.transition 2002, 10, :o5, 1034481600
-          tz.transition 2003, 3, :o4, 1047178800
-          tz.transition 2003, 10, :o5, 1065931200
-          tz.transition 2004, 3, :o4, 1079233200
-          tz.transition 2004, 10, :o5, 1097380800
-          tz.transition 2005, 3, :o4, 1110682800
-          tz.transition 2005, 10, :o5, 1128830400
-          tz.transition 2006, 3, :o4, 1142132400
-          tz.transition 2006, 10, :o5, 1160884800
-          tz.transition 2007, 3, :o4, 1173582000
-          tz.transition 2007, 10, :o5, 1192334400
-          tz.transition 2008, 3, :o4, 1205031600
-          tz.transition 2008, 10, :o5, 1223784000
-          tz.transition 2009, 3, :o4, 1237086000
-          tz.transition 2009, 10, :o5, 1255233600
-          tz.transition 2010, 3, :o4, 1268535600
-          tz.transition 2010, 10, :o5, 1286683200
-          tz.transition 2011, 3, :o4, 1299985200
-          tz.transition 2011, 10, :o5, 1318132800
-          tz.transition 2012, 3, :o4, 1331434800
-          tz.transition 2012, 10, :o5, 1350187200
-          tz.transition 2013, 3, :o4, 1362884400
-          tz.transition 2013, 10, :o5, 1381636800
-          tz.transition 2014, 3, :o4, 1394334000
-          tz.transition 2014, 10, :o5, 1413086400
-          tz.transition 2015, 3, :o4, 1426388400
-          tz.transition 2015, 10, :o5, 1444536000
-          tz.transition 2016, 3, :o4, 1457838000
-          tz.transition 2016, 10, :o5, 1475985600
-          tz.transition 2017, 3, :o4, 1489287600
-          tz.transition 2017, 10, :o5, 1508040000
-          tz.transition 2018, 3, :o4, 1520737200
-          tz.transition 2018, 10, :o5, 1539489600
-          tz.transition 2019, 3, :o4, 1552186800
-          tz.transition 2019, 10, :o5, 1570939200
-          tz.transition 2020, 3, :o4, 1584241200
-          tz.transition 2020, 10, :o5, 1602388800
-          tz.transition 2021, 3, :o4, 1615690800
-          tz.transition 2021, 10, :o5, 1633838400
-          tz.transition 2022, 3, :o4, 1647140400
-          tz.transition 2022, 10, :o5, 1665288000
-          tz.transition 2023, 3, :o4, 1678590000
-          tz.transition 2023, 10, :o5, 1697342400
-          tz.transition 2024, 3, :o4, 1710039600
-          tz.transition 2024, 10, :o5, 1728792000
-          tz.transition 2025, 3, :o4, 1741489200
-          tz.transition 2025, 10, :o5, 1760241600
-          tz.transition 2026, 3, :o4, 1773543600
-          tz.transition 2026, 10, :o5, 1791691200
-          tz.transition 2027, 3, :o4, 1804993200
-          tz.transition 2027, 10, :o5, 1823140800
-          tz.transition 2028, 3, :o4, 1836442800
-          tz.transition 2028, 10, :o5, 1855195200
-          tz.transition 2029, 3, :o4, 1867892400
-          tz.transition 2029, 10, :o5, 1886644800
-          tz.transition 2030, 3, :o4, 1899342000
-          tz.transition 2030, 10, :o5, 1918094400
-          tz.transition 2031, 3, :o4, 1930791600
-          tz.transition 2031, 10, :o5, 1949544000
-          tz.transition 2032, 3, :o4, 1962846000
-          tz.transition 2032, 10, :o5, 1980993600
-          tz.transition 2033, 3, :o4, 1994295600
-          tz.transition 2033, 10, :o5, 2012443200
-          tz.transition 2034, 3, :o4, 2025745200
-          tz.transition 2034, 10, :o5, 2044497600
-          tz.transition 2035, 3, :o4, 2057194800
-          tz.transition 2035, 10, :o5, 2075947200
-          tz.transition 2036, 3, :o4, 2088644400
-          tz.transition 2036, 10, :o5, 2107396800
-          tz.transition 2037, 3, :o4, 2120698800
-          tz.transition 2037, 10, :o5, 2138846400
-          tz.transition 2038, 3, :o4, 19723973, 8
-          tz.transition 2038, 10, :o5, 7397120, 3
-          tz.transition 2039, 3, :o4, 19726885, 8
-          tz.transition 2039, 10, :o5, 7398212, 3
-          tz.transition 2040, 3, :o4, 19729797, 8
-          tz.transition 2040, 10, :o5, 7399325, 3
-          tz.transition 2041, 3, :o4, 19732709, 8
-          tz.transition 2041, 10, :o5, 7400417, 3
-          tz.transition 2042, 3, :o4, 19735621, 8
-          tz.transition 2042, 10, :o5, 7401509, 3
-          tz.transition 2043, 3, :o4, 19738589, 8
-          tz.transition 2043, 10, :o5, 7402601, 3
-          tz.transition 2044, 3, :o4, 19741501, 8
-          tz.transition 2044, 10, :o5, 7403693, 3
-          tz.transition 2045, 3, :o4, 19744413, 8
-          tz.transition 2045, 10, :o5, 7404806, 3
-          tz.transition 2046, 3, :o4, 19747325, 8
-          tz.transition 2046, 10, :o5, 7405898, 3
-          tz.transition 2047, 3, :o4, 19750237, 8
-          tz.transition 2047, 10, :o5, 7406990, 3
-          tz.transition 2048, 3, :o4, 19753205, 8
-          tz.transition 2048, 10, :o5, 7408082, 3
-          tz.transition 2049, 3, :o4, 19756117, 8
-          tz.transition 2049, 10, :o5, 7409174, 3
-          tz.transition 2050, 3, :o4, 19759029, 8
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Efate.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Efate.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Efate.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Efate.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,39 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Efate
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Efate' do |tz|
-          tz.offset :o0, 40396, 0, :LMT
-          tz.offset :o1, 39600, 0, :VUT
-          tz.offset :o2, 39600, 3600, :VUST
-          
-          tz.transition 1912, 1, :o1, 52259343101, 21600
-          tz.transition 1983, 9, :o2, 433256400
-          tz.transition 1984, 3, :o1, 448977600
-          tz.transition 1984, 10, :o2, 467298000
-          tz.transition 1985, 3, :o1, 480427200
-          tz.transition 1985, 9, :o2, 496760400
-          tz.transition 1986, 3, :o1, 511876800
-          tz.transition 1986, 9, :o2, 528210000
-          tz.transition 1987, 3, :o1, 543931200
-          tz.transition 1987, 9, :o2, 559659600
-          tz.transition 1988, 3, :o1, 575380800
-          tz.transition 1988, 9, :o2, 591109200
-          tz.transition 1989, 3, :o1, 606830400
-          tz.transition 1989, 9, :o2, 622558800
-          tz.transition 1990, 3, :o1, 638280000
-          tz.transition 1990, 9, :o2, 654008400
-          tz.transition 1991, 3, :o1, 669729600
-          tz.transition 1991, 9, :o2, 686062800
-          tz.transition 1992, 1, :o1, 696340800
-          tz.transition 1992, 10, :o2, 719931600
-          tz.transition 1993, 1, :o1, 727790400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Enderbury.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Enderbury.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Enderbury.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Enderbury.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Enderbury
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Enderbury' do |tz|
-          tz.offset :o0, -41060, 0, :LMT
-          tz.offset :o1, -43200, 0, :PHOT
-          tz.offset :o2, -39600, 0, :PHOT
-          tz.offset :o3, 46800, 0, :PHOT
-          
-          tz.transition 1901, 1, :o1, 10434467413, 4320
-          tz.transition 1979, 10, :o2, 307627200
-          tz.transition 1995, 1, :o3, 788958000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fakaofo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fakaofo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fakaofo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fakaofo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Fakaofo
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Fakaofo' do |tz|
-          tz.offset :o0, -41096, 0, :LMT
-          tz.offset :o1, -36000, 0, :TKT
-          
-          tz.transition 1901, 1, :o1, 26086168537, 10800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fiji.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fiji.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fiji.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Fiji.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Fiji
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Fiji' do |tz|
-          tz.offset :o0, 42820, 0, :LMT
-          tz.offset :o1, 43200, 0, :FJT
-          tz.offset :o2, 43200, 3600, :FJST
-          
-          tz.transition 1915, 10, :o1, 10457838739, 4320
-          tz.transition 1998, 10, :o2, 909842400
-          tz.transition 1999, 2, :o1, 920124000
-          tz.transition 1999, 11, :o2, 941896800
-          tz.transition 2000, 2, :o1, 951573600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Funafuti.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Funafuti.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Funafuti.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Funafuti.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Funafuti
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Funafuti' do |tz|
-          tz.offset :o0, 43012, 0, :LMT
-          tz.offset :o1, 43200, 0, :TVT
-          
-          tz.transition 1900, 12, :o1, 52172316047, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Galapagos.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Galapagos.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Galapagos.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Galapagos.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Galapagos
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Galapagos' do |tz|
-          tz.offset :o0, -21504, 0, :LMT
-          tz.offset :o1, -18000, 0, :ECT
-          tz.offset :o2, -21600, 0, :GALT
-          
-          tz.transition 1931, 1, :o1, 1091854237, 450
-          tz.transition 1986, 1, :o2, 504939600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Gambier.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Gambier.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Gambier.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Gambier.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Gambier
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Gambier' do |tz|
-          tz.offset :o0, -32388, 0, :LMT
-          tz.offset :o1, -32400, 0, :GAMT
-          
-          tz.transition 1912, 10, :o1, 17421673499, 7200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guadalcanal.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guadalcanal.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guadalcanal.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guadalcanal.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Guadalcanal
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Guadalcanal' do |tz|
-          tz.offset :o0, 38388, 0, :LMT
-          tz.offset :o1, 39600, 0, :SBT
-          
-          tz.transition 1912, 9, :o1, 17421667601, 7200
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guam.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guam.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guam.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Guam.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Guam
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Guam' do |tz|
-          tz.offset :o0, -51660, 0, :LMT
-          tz.offset :o1, 34740, 0, :LMT
-          tz.offset :o2, 36000, 0, :GST
-          tz.offset :o3, 36000, 0, :ChST
-          
-          tz.transition 1844, 12, :o1, 1149567407, 480
-          tz.transition 1900, 12, :o2, 1159384847, 480
-          tz.transition 2000, 12, :o3, 977493600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Honolulu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Honolulu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Honolulu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Honolulu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,28 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Honolulu
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Honolulu' do |tz|
-          tz.offset :o0, -37886, 0, :LMT
-          tz.offset :o1, -37800, 0, :HST
-          tz.offset :o2, -37800, 3600, :HDT
-          tz.offset :o3, -37800, 3600, :HWT
-          tz.offset :o4, -37800, 3600, :HPT
-          tz.offset :o5, -36000, 0, :HST
-          
-          tz.transition 1900, 1, :o1, 104328926143, 43200
-          tz.transition 1933, 4, :o2, 116505265, 48
-          tz.transition 1933, 5, :o1, 116506271, 48
-          tz.transition 1942, 2, :o3, 116659201, 48
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 116722991, 48
-          tz.transition 1947, 6, :o5, 116752561, 48
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Johnston.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Johnston.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Johnston.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Johnston.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Johnston
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Johnston' do |tz|
-          tz.offset :o0, -36000, 0, :HST
-          
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kiritimati.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kiritimati.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kiritimati.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kiritimati.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Kiritimati
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Kiritimati' do |tz|
-          tz.offset :o0, -37760, 0, :LMT
-          tz.offset :o1, -38400, 0, :LINT
-          tz.offset :o2, -36000, 0, :LINT
-          tz.offset :o3, 50400, 0, :LINT
-          
-          tz.transition 1901, 1, :o1, 652154203, 270
-          tz.transition 1979, 10, :o2, 307622400
-          tz.transition 1995, 1, :o3, 788954400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kosrae.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kosrae.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kosrae.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kosrae.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,21 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Kosrae
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Kosrae' do |tz|
-          tz.offset :o0, 39116, 0, :LMT
-          tz.offset :o1, 39600, 0, :KOST
-          tz.offset :o2, 43200, 0, :KOST
-          
-          tz.transition 1900, 12, :o1, 52172317021, 21600
-          tz.transition 1969, 9, :o2, 58571881, 24
-          tz.transition 1998, 12, :o1, 915105600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kwajalein.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kwajalein.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kwajalein.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Kwajalein.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Kwajalein
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Kwajalein' do |tz|
-          tz.offset :o0, 40160, 0, :LMT
-          tz.offset :o1, 39600, 0, :MHT
-          tz.offset :o2, -43200, 0, :KWAT
-          tz.offset :o3, 43200, 0, :MHT
-          
-          tz.transition 1900, 12, :o1, 1304307919, 540
-          tz.transition 1969, 9, :o2, 58571881, 24
-          tz.transition 1993, 8, :o3, 745848000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Majuro.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Majuro.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Majuro.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Majuro.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Majuro
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Majuro' do |tz|
-          tz.offset :o0, 41088, 0, :LMT
-          tz.offset :o1, 39600, 0, :MHT
-          tz.offset :o2, 43200, 0, :MHT
-          
-          tz.transition 1900, 12, :o1, 1086923261, 450
-          tz.transition 1969, 9, :o2, 58571881, 24
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Marquesas.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Marquesas.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Marquesas.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Marquesas.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Marquesas
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Marquesas' do |tz|
-          tz.offset :o0, -33480, 0, :LMT
-          tz.offset :o1, -34200, 0, :MART
-          
-          tz.transition 1912, 10, :o1, 193574151, 80
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Midway.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Midway.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Midway.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Midway.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Midway
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Midway' do |tz|
-          tz.offset :o0, -42568, 0, :LMT
-          tz.offset :o1, -39600, 0, :NST
-          tz.offset :o2, -39600, 3600, :NDT
-          tz.offset :o3, -39600, 0, :BST
-          tz.offset :o4, -39600, 0, :SST
-          
-          tz.transition 1901, 1, :o1, 26086168721, 10800
-          tz.transition 1956, 6, :o2, 58455071, 24
-          tz.transition 1956, 9, :o1, 29228627, 12
-          tz.transition 1967, 4, :o3, 58549967, 24
-          tz.transition 1983, 11, :o4, 439038000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Nauru.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Nauru.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Nauru.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Nauru.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Nauru
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Nauru' do |tz|
-          tz.offset :o0, 40060, 0, :LMT
-          tz.offset :o1, 41400, 0, :NRT
-          tz.offset :o2, 32400, 0, :JST
-          tz.offset :o3, 43200, 0, :NRT
-          
-          tz.transition 1921, 1, :o1, 10466081437, 4320
-          tz.transition 1942, 3, :o2, 116660785, 48
-          tz.transition 1944, 8, :o1, 19450537, 8
-          tz.transition 1979, 4, :o3, 294323400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Niue.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Niue.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Niue.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Niue.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Niue
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Niue' do |tz|
-          tz.offset :o0, -40780, 0, :LMT
-          tz.offset :o1, -40800, 0, :NUT
-          tz.offset :o2, -41400, 0, :NUT
-          tz.offset :o3, -39600, 0, :NUT
-          
-          tz.transition 1901, 1, :o1, 10434467399, 4320
-          tz.transition 1951, 1, :o2, 87611327, 36
-          tz.transition 1978, 10, :o3, 276089400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Norfolk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Norfolk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Norfolk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Norfolk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Norfolk
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Norfolk' do |tz|
-          tz.offset :o0, 40312, 0, :LMT
-          tz.offset :o1, 40320, 0, :NMT
-          tz.offset :o2, 41400, 0, :NFT
-          
-          tz.transition 1900, 12, :o1, 26086158361, 10800
-          tz.transition 1950, 12, :o2, 73009411, 30
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Noumea.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Noumea.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Noumea.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Noumea.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Noumea
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Noumea' do |tz|
-          tz.offset :o0, 39948, 0, :LMT
-          tz.offset :o1, 39600, 0, :NCT
-          tz.offset :o2, 39600, 3600, :NCST
-          
-          tz.transition 1912, 1, :o1, 17419781071, 7200
-          tz.transition 1977, 12, :o2, 250002000
-          tz.transition 1978, 2, :o1, 257342400
-          tz.transition 1978, 12, :o2, 281451600
-          tz.transition 1979, 2, :o1, 288878400
-          tz.transition 1996, 11, :o2, 849366000
-          tz.transition 1997, 3, :o1, 857228400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pago_Pago.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pago_Pago.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pago_Pago.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pago_Pago.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,26 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Pago_Pago
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Pago_Pago' do |tz|
-          tz.offset :o0, 45432, 0, :LMT
-          tz.offset :o1, -40968, 0, :LMT
-          tz.offset :o2, -41400, 0, :SAMT
-          tz.offset :o3, -39600, 0, :NST
-          tz.offset :o4, -39600, 0, :BST
-          tz.offset :o5, -39600, 0, :SST
-          
-          tz.transition 1879, 7, :o1, 2889041969, 1200
-          tz.transition 1911, 1, :o2, 2902845569, 1200
-          tz.transition 1950, 1, :o3, 116797583, 48
-          tz.transition 1967, 4, :o4, 58549967, 24
-          tz.transition 1983, 11, :o5, 439038000
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Palau.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Palau.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Palau.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Palau.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Palau
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Palau' do |tz|
-          tz.offset :o0, 32276, 0, :LMT
-          tz.offset :o1, 32400, 0, :PWT
-          
-          tz.transition 1900, 12, :o1, 52172318731, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pitcairn.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pitcairn.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pitcairn.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Pitcairn.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Pitcairn
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Pitcairn' do |tz|
-          tz.offset :o0, -31220, 0, :LMT
-          tz.offset :o1, -30600, 0, :PNT
-          tz.offset :o2, -28800, 0, :PST
-          
-          tz.transition 1901, 1, :o1, 10434466921, 4320
-          tz.transition 1998, 4, :o2, 893665800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Ponape.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Ponape.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Ponape.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Ponape.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Ponape
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Ponape' do |tz|
-          tz.offset :o0, 37972, 0, :LMT
-          tz.offset :o1, 39600, 0, :PONT
-          
-          tz.transition 1900, 12, :o1, 52172317307, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Port_Moresby.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Port_Moresby.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Port_Moresby.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Port_Moresby.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Port_Moresby
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Port_Moresby' do |tz|
-          tz.offset :o0, 35320, 0, :LMT
-          tz.offset :o1, 35312, 0, :PMMT
-          tz.offset :o2, 36000, 0, :PGT
-          
-          tz.transition 1879, 12, :o1, 5200664597, 2160
-          tz.transition 1894, 12, :o2, 13031248093, 5400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Rarotonga.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Rarotonga.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Rarotonga.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Rarotonga.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,46 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Rarotonga
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Rarotonga' do |tz|
-          tz.offset :o0, -38344, 0, :LMT
-          tz.offset :o1, -37800, 0, :CKT
-          tz.offset :o2, -36000, 1800, :CKHST
-          tz.offset :o3, -36000, 0, :CKT
-          
-          tz.transition 1901, 1, :o1, 26086168193, 10800
-          tz.transition 1978, 11, :o2, 279714600
-          tz.transition 1979, 3, :o3, 289387800
-          tz.transition 1979, 10, :o2, 309952800
-          tz.transition 1980, 3, :o3, 320837400
-          tz.transition 1980, 10, :o2, 341402400
-          tz.transition 1981, 3, :o3, 352287000
-          tz.transition 1981, 10, :o2, 372852000
-          tz.transition 1982, 3, :o3, 384341400
-          tz.transition 1982, 10, :o2, 404906400
-          tz.transition 1983, 3, :o3, 415791000
-          tz.transition 1983, 10, :o2, 436356000
-          tz.transition 1984, 3, :o3, 447240600
-          tz.transition 1984, 10, :o2, 467805600
-          tz.transition 1985, 3, :o3, 478690200
-          tz.transition 1985, 10, :o2, 499255200
-          tz.transition 1986, 3, :o3, 510139800
-          tz.transition 1986, 10, :o2, 530704800
-          tz.transition 1987, 3, :o3, 541589400
-          tz.transition 1987, 10, :o2, 562154400
-          tz.transition 1988, 3, :o3, 573643800
-          tz.transition 1988, 10, :o2, 594208800
-          tz.transition 1989, 3, :o3, 605093400
-          tz.transition 1989, 10, :o2, 625658400
-          tz.transition 1990, 3, :o3, 636543000
-          tz.transition 1990, 10, :o2, 657108000
-          tz.transition 1991, 3, :o3, 667992600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Saipan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Saipan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Saipan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Saipan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,24 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Saipan
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Saipan' do |tz|
-          tz.offset :o0, -51420, 0, :LMT
-          tz.offset :o1, 34980, 0, :LMT
-          tz.offset :o2, 32400, 0, :MPT
-          tz.offset :o3, 36000, 0, :MPT
-          tz.offset :o4, 36000, 0, :ChST
-          
-          tz.transition 1844, 12, :o1, 3448702217, 1440
-          tz.transition 1900, 12, :o2, 3478154537, 1440
-          tz.transition 1969, 9, :o3, 19523961, 8
-          tz.transition 2000, 12, :o4, 977493600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Samoa.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Samoa.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Samoa.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Samoa.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Samoa
-        include TimezoneDefinition
-        
-        linked_timezone 'Pacific/Samoa', 'Pacific/Pago_Pago'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tahiti.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tahiti.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tahiti.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tahiti.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Tahiti
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Tahiti' do |tz|
-          tz.offset :o0, -35896, 0, :LMT
-          tz.offset :o1, -36000, 0, :TAHT
-          
-          tz.transition 1912, 10, :o1, 26132510687, 10800
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tarawa.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tarawa.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tarawa.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tarawa.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Tarawa
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Tarawa' do |tz|
-          tz.offset :o0, 41524, 0, :LMT
-          tz.offset :o1, 43200, 0, :GILT
-          
-          tz.transition 1900, 12, :o1, 52172316419, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tongatapu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tongatapu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tongatapu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Tongatapu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,27 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Tongatapu
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Tongatapu' do |tz|
-          tz.offset :o0, 44360, 0, :LMT
-          tz.offset :o1, 44400, 0, :TOT
-          tz.offset :o2, 46800, 0, :TOT
-          tz.offset :o3, 46800, 3600, :TOST
-          
-          tz.transition 1900, 12, :o1, 5217231571, 2160
-          tz.transition 1940, 12, :o2, 174959639, 72
-          tz.transition 1999, 10, :o3, 939214800
-          tz.transition 2000, 3, :o2, 953384400
-          tz.transition 2000, 11, :o3, 973342800
-          tz.transition 2001, 1, :o2, 980596800
-          tz.transition 2001, 11, :o3, 1004792400
-          tz.transition 2002, 1, :o2, 1012046400
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Truk.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Truk.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Truk.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Truk.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Truk
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Truk' do |tz|
-          tz.offset :o0, 36428, 0, :LMT
-          tz.offset :o1, 36000, 0, :TRUT
-          
-          tz.transition 1900, 12, :o1, 52172317693, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wake.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wake.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wake.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wake.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Wake
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Wake' do |tz|
-          tz.offset :o0, 39988, 0, :LMT
-          tz.offset :o1, 43200, 0, :WAKT
-          
-          tz.transition 1900, 12, :o1, 52172316803, 21600
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wallis.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wallis.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wallis.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Wallis.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Wallis
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Wallis' do |tz|
-          tz.offset :o0, 44120, 0, :LMT
-          tz.offset :o1, 43200, 0, :WFT
-          
-          tz.transition 1900, 12, :o1, 5217231577, 2160
-        end
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Yap.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Yap.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Yap.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Pacific/Yap.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Yap
-        include TimezoneDefinition
-        
-        linked_timezone 'Pacific/Yap', 'Pacific/Truk'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Poland.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Poland.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Poland.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Poland.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Poland
-      include TimezoneDefinition
-      
-      linked_timezone 'Poland', 'Europe/Warsaw'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Portugal.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Portugal.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Portugal.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Portugal.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Portugal
-      include TimezoneDefinition
-      
-      linked_timezone 'Portugal', 'Europe/Lisbon'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROC.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROC.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROC.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROC.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module ROC
-      include TimezoneDefinition
-      
-      linked_timezone 'ROC', 'Asia/Taipei'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROK.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROK.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROK.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/ROK.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module ROK
-      include TimezoneDefinition
-      
-      linked_timezone 'ROK', 'Asia/Seoul'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Singapore.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Singapore.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Singapore.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Singapore.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Singapore
-      include TimezoneDefinition
-      
-      linked_timezone 'Singapore', 'Asia/Singapore'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Turkey.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Turkey.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Turkey.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Turkey.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Turkey
-      include TimezoneDefinition
-      
-      linked_timezone 'Turkey', 'Europe/Istanbul'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UCT.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UCT.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UCT.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UCT.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module UCT
-      include TimezoneDefinition
-      
-      linked_timezone 'UCT', 'Etc/UCT'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Alaska.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Alaska.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Alaska.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Alaska.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Alaska
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Alaska', 'America/Anchorage'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Aleutian.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Aleutian.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Aleutian.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Aleutian.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Aleutian
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Aleutian', 'America/Adak'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Arizona.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Arizona.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Arizona.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Arizona.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Arizona
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Arizona', 'America/Phoenix'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Central.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Central.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Central.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Central.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Central
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Central', 'America/Chicago'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/East__m__Indiana.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/East__m__Indiana.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/East__m__Indiana.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/East__m__Indiana.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module East__m__Indiana
-        include TimezoneDefinition
-        
-        linked_timezone 'US/East-Indiana', 'America/Indiana/Indianapolis'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Eastern.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Eastern.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Eastern.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Eastern.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Eastern
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Eastern', 'America/New_York'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Hawaii.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Hawaii.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Hawaii.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Hawaii.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Hawaii
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Hawaii', 'Pacific/Honolulu'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Indiana__m__Starke.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Indiana__m__Starke.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Indiana__m__Starke.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Indiana__m__Starke.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Indiana__m__Starke
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Indiana-Starke', 'America/Indiana/Knox'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Michigan.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Michigan.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Michigan.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Michigan.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Michigan
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Michigan', 'America/Detroit'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Mountain.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Mountain.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Mountain.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Mountain.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Mountain
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Mountain', 'America/Denver'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Pacific
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Pacific', 'America/Los_Angeles'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific__m__New.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific__m__New.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific__m__New.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Pacific__m__New.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Pacific__m__New
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Pacific-New', 'America/Los_Angeles'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Samoa.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Samoa.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Samoa.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/US/Samoa.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module US
-      module Samoa
-        include TimezoneDefinition
-        
-        linked_timezone 'US/Samoa', 'Pacific/Pago_Pago'
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UTC.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UTC.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UTC.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/UTC.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module UTC
-      include TimezoneDefinition
-      
-      linked_timezone 'UTC', 'Etc/UTC'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Universal.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Universal.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Universal.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Universal.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Universal
-      include TimezoneDefinition
-      
-      linked_timezone 'Universal', 'Etc/UTC'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/WET.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/WET.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/WET.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/WET.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module WET
-      include TimezoneDefinition
-      
-      timezone 'WET' do |tz|
-        tz.offset :o0, 0, 0, :WET
-        tz.offset :o1, 0, 3600, :WEST
-        
-        tz.transition 1977, 4, :o1, 228877200
-        tz.transition 1977, 9, :o0, 243997200
-        tz.transition 1978, 4, :o1, 260326800
-        tz.transition 1978, 10, :o0, 276051600
-        tz.transition 1979, 4, :o1, 291776400
-        tz.transition 1979, 9, :o0, 307501200
-        tz.transition 1980, 4, :o1, 323830800
-        tz.transition 1980, 9, :o0, 338950800
-        tz.transition 1981, 3, :o1, 354675600
-        tz.transition 1981, 9, :o0, 370400400
-        tz.transition 1982, 3, :o1, 386125200
-        tz.transition 1982, 9, :o0, 401850000
-        tz.transition 1983, 3, :o1, 417574800
-        tz.transition 1983, 9, :o0, 433299600
-        tz.transition 1984, 3, :o1, 449024400
-        tz.transition 1984, 9, :o0, 465354000
-        tz.transition 1985, 3, :o1, 481078800
-        tz.transition 1985, 9, :o0, 496803600
-        tz.transition 1986, 3, :o1, 512528400
-        tz.transition 1986, 9, :o0, 528253200
-        tz.transition 1987, 3, :o1, 543978000
-        tz.transition 1987, 9, :o0, 559702800
-        tz.transition 1988, 3, :o1, 575427600
-        tz.transition 1988, 9, :o0, 591152400
-        tz.transition 1989, 3, :o1, 606877200
-        tz.transition 1989, 9, :o0, 622602000
-        tz.transition 1990, 3, :o1, 638326800
-        tz.transition 1990, 9, :o0, 654656400
-        tz.transition 1991, 3, :o1, 670381200
-        tz.transition 1991, 9, :o0, 686106000
-        tz.transition 1992, 3, :o1, 701830800
-        tz.transition 1992, 9, :o0, 717555600
-        tz.transition 1993, 3, :o1, 733280400
-        tz.transition 1993, 9, :o0, 749005200
-        tz.transition 1994, 3, :o1, 764730000
-        tz.transition 1994, 9, :o0, 780454800
-        tz.transition 1995, 3, :o1, 796179600
-        tz.transition 1995, 9, :o0, 811904400
-        tz.transition 1996, 3, :o1, 828234000
-        tz.transition 1996, 10, :o0, 846378000
-        tz.transition 1997, 3, :o1, 859683600
-        tz.transition 1997, 10, :o0, 877827600
-        tz.transition 1998, 3, :o1, 891133200
-        tz.transition 1998, 10, :o0, 909277200
-        tz.transition 1999, 3, :o1, 922582800
-        tz.transition 1999, 10, :o0, 941331600
-        tz.transition 2000, 3, :o1, 954032400
-        tz.transition 2000, 10, :o0, 972781200
-        tz.transition 2001, 3, :o1, 985482000
-        tz.transition 2001, 10, :o0, 1004230800
-        tz.transition 2002, 3, :o1, 1017536400
-        tz.transition 2002, 10, :o0, 1035680400
-        tz.transition 2003, 3, :o1, 1048986000
-        tz.transition 2003, 10, :o0, 1067130000
-        tz.transition 2004, 3, :o1, 1080435600
-        tz.transition 2004, 10, :o0, 1099184400
-        tz.transition 2005, 3, :o1, 1111885200
-        tz.transition 2005, 10, :o0, 1130634000
-        tz.transition 2006, 3, :o1, 1143334800
-        tz.transition 2006, 10, :o0, 1162083600
-        tz.transition 2007, 3, :o1, 1174784400
-        tz.transition 2007, 10, :o0, 1193533200
-        tz.transition 2008, 3, :o1, 1206838800
-        tz.transition 2008, 10, :o0, 1224982800
-        tz.transition 2009, 3, :o1, 1238288400
-        tz.transition 2009, 10, :o0, 1256432400
-        tz.transition 2010, 3, :o1, 1269738000
-        tz.transition 2010, 10, :o0, 1288486800
-        tz.transition 2011, 3, :o1, 1301187600
-        tz.transition 2011, 10, :o0, 1319936400
-        tz.transition 2012, 3, :o1, 1332637200
-        tz.transition 2012, 10, :o0, 1351386000
-        tz.transition 2013, 3, :o1, 1364691600
-        tz.transition 2013, 10, :o0, 1382835600
-        tz.transition 2014, 3, :o1, 1396141200
-        tz.transition 2014, 10, :o0, 1414285200
-        tz.transition 2015, 3, :o1, 1427590800
-        tz.transition 2015, 10, :o0, 1445734800
-        tz.transition 2016, 3, :o1, 1459040400
-        tz.transition 2016, 10, :o0, 1477789200
-        tz.transition 2017, 3, :o1, 1490490000
-        tz.transition 2017, 10, :o0, 1509238800
-        tz.transition 2018, 3, :o1, 1521939600
-        tz.transition 2018, 10, :o0, 1540688400
-        tz.transition 2019, 3, :o1, 1553994000
-        tz.transition 2019, 10, :o0, 1572138000
-        tz.transition 2020, 3, :o1, 1585443600
-        tz.transition 2020, 10, :o0, 1603587600
-        tz.transition 2021, 3, :o1, 1616893200
-        tz.transition 2021, 10, :o0, 1635642000
-        tz.transition 2022, 3, :o1, 1648342800
-        tz.transition 2022, 10, :o0, 1667091600
-        tz.transition 2023, 3, :o1, 1679792400
-        tz.transition 2023, 10, :o0, 1698541200
-        tz.transition 2024, 3, :o1, 1711846800
-        tz.transition 2024, 10, :o0, 1729990800
-        tz.transition 2025, 3, :o1, 1743296400
-        tz.transition 2025, 10, :o0, 1761440400
-        tz.transition 2026, 3, :o1, 1774746000
-        tz.transition 2026, 10, :o0, 1792890000
-        tz.transition 2027, 3, :o1, 1806195600
-        tz.transition 2027, 10, :o0, 1824944400
-        tz.transition 2028, 3, :o1, 1837645200
-        tz.transition 2028, 10, :o0, 1856394000
-        tz.transition 2029, 3, :o1, 1869094800
-        tz.transition 2029, 10, :o0, 1887843600
-        tz.transition 2030, 3, :o1, 1901149200
-        tz.transition 2030, 10, :o0, 1919293200
-        tz.transition 2031, 3, :o1, 1932598800
-        tz.transition 2031, 10, :o0, 1950742800
-        tz.transition 2032, 3, :o1, 1964048400
-        tz.transition 2032, 10, :o0, 1982797200
-        tz.transition 2033, 3, :o1, 1995498000
-        tz.transition 2033, 10, :o0, 2014246800
-        tz.transition 2034, 3, :o1, 2026947600
-        tz.transition 2034, 10, :o0, 2045696400
-        tz.transition 2035, 3, :o1, 2058397200
-        tz.transition 2035, 10, :o0, 2077146000
-        tz.transition 2036, 3, :o1, 2090451600
-        tz.transition 2036, 10, :o0, 2108595600
-        tz.transition 2037, 3, :o1, 2121901200
-        tz.transition 2037, 10, :o0, 2140045200
-        tz.transition 2038, 3, :o1, 59172253, 24
-        tz.transition 2038, 10, :o0, 59177461, 24
-        tz.transition 2039, 3, :o1, 59180989, 24
-        tz.transition 2039, 10, :o0, 59186197, 24
-        tz.transition 2040, 3, :o1, 59189725, 24
-        tz.transition 2040, 10, :o0, 59194933, 24
-        tz.transition 2041, 3, :o1, 59198629, 24
-        tz.transition 2041, 10, :o0, 59203669, 24
-        tz.transition 2042, 3, :o1, 59207365, 24
-        tz.transition 2042, 10, :o0, 59212405, 24
-        tz.transition 2043, 3, :o1, 59216101, 24
-        tz.transition 2043, 10, :o0, 59221141, 24
-        tz.transition 2044, 3, :o1, 59224837, 24
-        tz.transition 2044, 10, :o0, 59230045, 24
-        tz.transition 2045, 3, :o1, 59233573, 24
-        tz.transition 2045, 10, :o0, 59238781, 24
-        tz.transition 2046, 3, :o1, 59242309, 24
-        tz.transition 2046, 10, :o0, 59247517, 24
-        tz.transition 2047, 3, :o1, 59251213, 24
-        tz.transition 2047, 10, :o0, 59256253, 24
-        tz.transition 2048, 3, :o1, 59259949, 24
-        tz.transition 2048, 10, :o0, 59264989, 24
-        tz.transition 2049, 3, :o1, 59268685, 24
-        tz.transition 2049, 10, :o0, 59273893, 24
-        tz.transition 2050, 3, :o1, 59277421, 24
-        tz.transition 2050, 10, :o0, 59282629, 24
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/W__m__SU.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/W__m__SU.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/W__m__SU.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/W__m__SU.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module W__m__SU
-      include TimezoneDefinition
-      
-      linked_timezone 'W-SU', 'Europe/Moscow'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Zulu.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Zulu.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Zulu.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/definitions/Zulu.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Zulu
-      include TimezoneDefinition
-      
-      linked_timezone 'Zulu', 'Etc/UTC'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/countries.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/countries.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/countries.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/countries.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,889 +0,0 @@
-require 'tzinfo/country_index_definition'
-
-module TZInfo
-  module Indexes
-    module Countries
-      include CountryIndexDefinition
-
-      country 'AD', 'Andorra' do |c|
-        c.timezone 'Europe/Andorra', 85, 2, 91, 60
-      end
-      country 'AE', 'United Arab Emirates' do |c|
-        c.timezone 'Asia/Dubai', 253, 10, 553, 10
-      end
-      country 'AF', 'Afghanistan' do |c|
-        c.timezone 'Asia/Kabul', 2071, 60, 346, 5
-      end
-      country 'AG', 'Antigua & Barbuda' do |c|
-        c.timezone 'America/Antigua', 341, 20, -309, 5
-      end
-      country 'AI', 'Anguilla' do |c|
-        c.timezone 'America/Anguilla', 91, 5, -946, 15
-      end
-      country 'AL', 'Albania' do |c|
-        c.timezone 'Europe/Tirane', 124, 3, 119, 6
-      end
-      country 'AM', 'Armenia' do |c|
-        c.timezone 'Asia/Yerevan', 2411, 60, 89, 2
-      end
-      country 'AN', 'Netherlands Antilles' do |c|
-        c.timezone 'America/Curacao', 731, 60, -69, 1
-      end
-      country 'AO', 'Angola' do |c|
-        c.timezone 'Africa/Luanda', -44, 5, 397, 30
-      end
-      country 'AQ', 'Antarctica' do |c|
-        c.timezone 'Antarctica/McMurdo', -467, 6, 833, 5, 'McMurdo Station, Ross Island'
-        c.timezone 'Antarctica/South_Pole', -90, 1, 0, 1, 'Amundsen-Scott Station, South Pole'
-        c.timezone 'Antarctica/Rothera', -2027, 30, -1022, 15, 'Rothera Station, Adelaide Island'
-        c.timezone 'Antarctica/Palmer', -324, 5, -641, 10, 'Palmer Station, Anvers Island'
-        c.timezone 'Antarctica/Mawson', -338, 5, 3773, 60, 'Mawson Station, Holme Bay'
-        c.timezone 'Antarctica/Davis', -823, 12, 2339, 30, 'Davis Station, Vestfold Hills'
-        c.timezone 'Antarctica/Casey', -3977, 60, 6631, 60, 'Casey Station, Bailey Peninsula'
-        c.timezone 'Antarctica/Vostok', -392, 5, 1069, 10, 'Vostok Station, S Magnetic Pole'
-        c.timezone 'Antarctica/DumontDUrville', -200, 3, 8401, 60, 'Dumont-d\'Urville Base, Terre Adelie'
-        c.timezone 'Antarctica/Syowa', -124211, 1800, 3959, 100, 'Syowa Station, E Ongul I'
-      end
-      country 'AR', 'Argentina' do |c|
-        c.timezone 'America/Argentina/Buenos_Aires', -173, 5, -1169, 20, 'Buenos Aires (BA, CF)'
-        c.timezone 'America/Argentina/Cordoba', -157, 5, -3851, 60, 'most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)'
-        c.timezone 'America/Argentina/Jujuy', -1451, 60, -653, 10, 'Jujuy (JY)'
-        c.timezone 'America/Argentina/Tucuman', -1609, 60, -3913, 60, 'Tucuman (TM)'
-        c.timezone 'America/Argentina/Catamarca', -427, 15, -3947, 60, 'Catamarca (CT), Chubut (CH)'
-        c.timezone 'America/Argentina/La_Rioja', -883, 30, -1337, 20, 'La Rioja (LR)'
-        c.timezone 'America/Argentina/San_Juan', -473, 15, -4111, 60, 'San Juan (SJ)'
-        c.timezone 'America/Argentina/Mendoza', -1973, 60, -4129, 60, 'Mendoza (MZ)'
-        c.timezone 'America/Argentina/Rio_Gallegos', -1549, 30, -4153, 60, 'Santa Cruz (SC)'
-        c.timezone 'America/Argentina/Ushuaia', -274, 5, -683, 10, 'Tierra del Fuego (TF)'
-      end
-      country 'AS', 'Samoa (American)' do |c|
-        c.timezone 'Pacific/Pago_Pago', -214, 15, -1707, 10
-      end
-      country 'AT', 'Austria' do |c|
-        c.timezone 'Europe/Vienna', 2893, 60, 49, 3
-      end
-      country 'AU', 'Australia' do |c|
-        c.timezone 'Australia/Lord_Howe', -631, 20, 1909, 12, 'Lord Howe Island'
-        c.timezone 'Australia/Hobart', -2573, 60, 8839, 60, 'Tasmania - most locations'
-        c.timezone 'Australia/Currie', -599, 15, 2158, 15, 'Tasmania - King Island'
-        c.timezone 'Australia/Melbourne', -2269, 60, 4349, 30, 'Victoria'
-        c.timezone 'Australia/Sydney', -508, 15, 9073, 60, 'New South Wales - most locations'
-        c.timezone 'Australia/Broken_Hill', -639, 20, 2829, 20, 'New South Wales - Yancowinna'
-        c.timezone 'Australia/Brisbane', -412, 15, 4591, 30, 'Queensland - most locations'
-        c.timezone 'Australia/Lindeman', -304, 15, 149, 1, 'Queensland - Holiday Islands'
-        c.timezone 'Australia/Adelaide', -419, 12, 1663, 12, 'South Australia'
-        c.timezone 'Australia/Darwin', -187, 15, 785, 6, 'Northern Territory'
-        c.timezone 'Australia/Perth', -639, 20, 2317, 20, 'Western Australia'
-      end
-      country 'AW', 'Aruba' do |c|
-        c.timezone 'America/Aruba', 25, 2, -2069, 30
-      end
-      country 'AX', 'Aaland Islands' do |c|
-        c.timezone 'Europe/Mariehamn', 601, 10, 399, 20
-      end
-      country 'AZ', 'Azerbaijan' do |c|
-        c.timezone 'Asia/Baku', 2423, 60, 997, 20
-      end
-      country 'BA', 'Bosnia & Herzegovina' do |c|
-        c.timezone 'Europe/Sarajevo', 658, 15, 221, 12
-      end
-      country 'BB', 'Barbados' do |c|
-        c.timezone 'America/Barbados', 131, 10, -3577, 60
-      end
-      country 'BD', 'Bangladesh' do |c|
-        c.timezone 'Asia/Dhaka', 1423, 60, 1085, 12
-      end
-      country 'BE', 'Belgium' do |c|
-        c.timezone 'Europe/Brussels', 305, 6, 13, 3
-      end
-      country 'BF', 'Burkina Faso' do |c|
-        c.timezone 'Africa/Ouagadougou', 371, 30, -91, 60
-      end
-      country 'BG', 'Bulgaria' do |c|
-        c.timezone 'Europe/Sofia', 2561, 60, 1399, 60
-      end
-      country 'BH', 'Bahrain' do |c|
-        c.timezone 'Asia/Bahrain', 1583, 60, 607, 12
-      end
-      country 'BI', 'Burundi' do |c|
-        c.timezone 'Africa/Bujumbura', -203, 60, 881, 30
-      end
-      country 'BJ', 'Benin' do |c|
-        c.timezone 'Africa/Porto-Novo', 389, 60, 157, 60
-      end
-      country 'BM', 'Bermuda' do |c|
-        c.timezone 'Atlantic/Bermuda', 1937, 60, -1943, 30
-      end
-      country 'BN', 'Brunei' do |c|
-        c.timezone 'Asia/Brunei', 74, 15, 1379, 12
-      end
-      country 'BO', 'Bolivia' do |c|
-        c.timezone 'America/La_Paz', -33, 2, -1363, 20
-      end
-      country 'BR', 'Brazil' do |c|
-        c.timezone 'America/Noronha', -77, 20, -389, 12, 'Atlantic islands'
-        c.timezone 'America/Belem', -29, 20, -2909, 60, 'Amapa, E Para'
-        c.timezone 'America/Fortaleza', -223, 60, -77, 2, 'NE Brazil (MA, PI, CE, RN, PB)'
-        c.timezone 'America/Recife', -161, 20, -349, 10, 'Pernambuco'
-        c.timezone 'America/Araguaina', -36, 5, -241, 5, 'Tocantins'
-        c.timezone 'America/Maceio', -29, 3, -2143, 60, 'Alagoas, Sergipe'
-        c.timezone 'America/Bahia', -779, 60, -2311, 60, 'Bahia'
-        c.timezone 'America/Sao_Paulo', -353, 15, -2797, 60, 'S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)'
-        c.timezone 'America/Campo_Grande', -409, 20, -3277, 60, 'Mato Grosso do Sul'
-        c.timezone 'America/Cuiaba', -187, 12, -673, 12, 'Mato Grosso'
-        c.timezone 'America/Porto_Velho', -263, 30, -639, 10, 'W Para, Rondonia'
-        c.timezone 'America/Boa_Vista', 169, 60, -182, 3, 'Roraima'
-        c.timezone 'America/Manaus', -47, 15, -3601, 60, 'E Amazonas'
-        c.timezone 'America/Eirunepe', -20, 3, -1048, 15, 'W Amazonas'
-        c.timezone 'America/Rio_Branco', -299, 30, -339, 5, 'Acre'
-      end
-      country 'BS', 'Bahamas' do |c|
-        c.timezone 'America/Nassau', 301, 12, -1547, 20
-      end
-      country 'BT', 'Bhutan' do |c|
-        c.timezone 'Asia/Thimphu', 412, 15, 1793, 20
-      end
-      country 'BV', 'Bouvet Island'
-      country 'BW', 'Botswana' do |c|
-        c.timezone 'Africa/Gaborone', -103, 4, 311, 12
-      end
-      country 'BY', 'Belarus' do |c|
-        c.timezone 'Europe/Minsk', 539, 10, 827, 30
-      end
-      country 'BZ', 'Belize' do |c|
-        c.timezone 'America/Belize', 35, 2, -441, 5
-      end
-      country 'CA', 'Canada' do |c|
-        c.timezone 'America/St_Johns', 1427, 30, -3163, 60, 'Newfoundland Time, including SE Labrador'
-        c.timezone 'America/Halifax', 893, 20, -318, 5, 'Atlantic Time - Nova Scotia (most places), PEI'
-        c.timezone 'America/Glace_Bay', 231, 5, -1199, 20, 'Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971'
-        c.timezone 'America/Moncton', 461, 10, -3887, 60, 'Atlantic Time - New Brunswick'
-        c.timezone 'America/Goose_Bay', 160, 3, -725, 12, 'Atlantic Time - Labrador - most locations'
-        c.timezone 'America/Blanc-Sablon', 617, 12, -3427, 60, 'Atlantic Standard Time - Quebec - Lower North Shore'
-        c.timezone 'America/Montreal', 2731, 60, -2207, 30, 'Eastern Time - Quebec - most locations'
-        c.timezone 'America/Toronto', 873, 20, -4763, 60, 'Eastern Time - Ontario - most locations'
-        c.timezone 'America/Nipigon', 2941, 60, -1324, 15, 'Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973'
-        c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern Time - Thunder Bay, Ontario'
-        c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern Time - Pangnirtung, Nunavut'
-        c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern Time - east Nunavut'
-        c.timezone 'America/Atikokan', 175531, 3600, -54973, 600, 'Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut'
-        c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central Time - central Nunavut'
-        c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central Time - Manitoba & west Ontario'
-        c.timezone 'America/Rainy_River', 2923, 60, -2837, 30, 'Central Time - Rainy River & Fort Frances, Ontario'
-        c.timezone 'America/Cambridge_Bay', 1381, 20, -1261, 12, 'Central Time - west Nunavut'
-        c.timezone 'America/Regina', 252, 5, -2093, 20, 'Central Standard Time - Saskatchewan - most locations'
-        c.timezone 'America/Swift_Current', 3017, 60, -647, 6, 'Central Standard Time - Saskatchewan - midwest'
-        c.timezone 'America/Edmonton', 1071, 20, -1702, 15, 'Mountain Time - Alberta, east British Columbia & west Saskatchewan'
-        c.timezone 'America/Yellowknife', 1249, 20, -2287, 20, 'Mountain Time - central Northwest Territories'
-        c.timezone 'America/Inuvik', 246059, 3600, -8023, 60, 'Mountain Time - west Northwest Territories'
-        c.timezone 'America/Dawson_Creek', 1793, 30, -3607, 30, 'Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia'
-        c.timezone 'America/Vancouver', 739, 15, -7387, 60, 'Pacific Time - west British Columbia'
-        c.timezone 'America/Whitehorse', 3643, 60, -2701, 20, 'Pacific Time - south Yukon'
-        c.timezone 'America/Dawson', 961, 15, -1673, 12, 'Pacific Time - north Yukon'
-      end
-      country 'CC', 'Cocos (Keeling) Islands' do |c|
-        c.timezone 'Indian/Cocos', -73, 6, 1163, 12
-      end
-      country 'CD', 'Congo (Dem. Rep.)' do |c|
-        c.timezone 'Africa/Kinshasa', -43, 10, 153, 10, 'west Dem. Rep. of Congo'
-        c.timezone 'Africa/Lubumbashi', -35, 3, 412, 15, 'east Dem. Rep. of Congo'
-      end
-      country 'CF', 'Central African Rep.' do |c|
-        c.timezone 'Africa/Bangui', 131, 30, 223, 12
-      end
-      country 'CG', 'Congo (Rep.)' do |c|
-        c.timezone 'Africa/Brazzaville', -64, 15, 917, 60
-      end
-      country 'CH', 'Switzerland' do |c|
-        c.timezone 'Europe/Zurich', 2843, 60, 128, 15
-      end
-      country 'CI', 'Cote d\'Ivoire' do |c|
-        c.timezone 'Africa/Abidjan', 319, 60, -121, 30
-      end
-      country 'CK', 'Cook Islands' do |c|
-        c.timezone 'Pacific/Rarotonga', -637, 30, -4793, 30
-      end
-      country 'CL', 'Chile' do |c|
-        c.timezone 'America/Santiago', -669, 20, -212, 3, 'most locations'
-        c.timezone 'Pacific/Easter', -163, 6, -2189, 20, 'Easter Island & Sala y Gomez'
-      end
-      country 'CM', 'Cameroon' do |c|
-        c.timezone 'Africa/Douala', 81, 20, 97, 10
-      end
-      country 'CN', 'China' do |c|
-        c.timezone 'Asia/Shanghai', 937, 30, 1822, 15, 'east China - Beijing, Guangdong, Shanghai, etc.'
-        c.timezone 'Asia/Harbin', 183, 4, 7601, 60, 'Heilongjiang (except Mohe), Jilin'
-        c.timezone 'Asia/Chongqing', 887, 30, 1279, 12, 'central China - Sichuan, Yunnan, Guangxi, Shaanxi, Guizhou, etc.'
-        c.timezone 'Asia/Urumqi', 219, 5, 1051, 12, 'most of Tibet & Xinjiang'
-        c.timezone 'Asia/Kashgar', 2369, 60, 4559, 60, 'west Tibet & Xinjiang'
-      end
-      country 'CO', 'Colombia' do |c|
-        c.timezone 'America/Bogota', 23, 5, -889, 12
-      end
-      country 'CR', 'Costa Rica' do |c|
-        c.timezone 'America/Costa_Rica', 149, 15, -1009, 12
-      end
-      country 'CU', 'Cuba' do |c|
-        c.timezone 'America/Havana', 347, 15, -2471, 30
-      end
-      country 'CV', 'Cape Verde' do |c|
-        c.timezone 'Atlantic/Cape_Verde', 179, 12, -1411, 60
-      end
-      country 'CX', 'Christmas Island' do |c|
-        c.timezone 'Indian/Christmas', -125, 12, 6343, 60
-      end
-      country 'CY', 'Cyprus' do |c|
-        c.timezone 'Asia/Nicosia', 211, 6, 1001, 30
-      end
-      country 'CZ', 'Czech Republic' do |c|
-        c.timezone 'Europe/Prague', 601, 12, 433, 30
-      end
-      country 'DE', 'Germany' do |c|
-        c.timezone 'Europe/Berlin', 105, 2, 401, 30
-      end
-      country 'DJ', 'Djibouti' do |c|
-        c.timezone 'Africa/Djibouti', 58, 5, 863, 20
-      end
-      country 'DK', 'Denmark' do |c|
-        c.timezone 'Europe/Copenhagen', 167, 3, 151, 12
-      end
-      country 'DM', 'Dominica' do |c|
-        c.timezone 'America/Dominica', 153, 10, -307, 5
-      end
-      country 'DO', 'Dominican Republic' do |c|
-        c.timezone 'America/Santo_Domingo', 277, 15, -699, 10
-      end
-      country 'DZ', 'Algeria' do |c|
-        c.timezone 'Africa/Algiers', 2207, 60, 61, 20
-      end
-      country 'EC', 'Ecuador' do |c|
-        c.timezone 'America/Guayaquil', -13, 6, -479, 6, 'mainland'
-        c.timezone 'Pacific/Galapagos', -9, 10, -448, 5, 'Galapagos Islands'
-      end
-      country 'EE', 'Estonia' do |c|
-        c.timezone 'Europe/Tallinn', 713, 12, 99, 4
-      end
-      country 'EG', 'Egypt' do |c|
-        c.timezone 'Africa/Cairo', 601, 20, 125, 4
-      end
-      country 'EH', 'Western Sahara' do |c|
-        c.timezone 'Africa/El_Aaiun', 543, 20, -66, 5
-      end
-      country 'ER', 'Eritrea' do |c|
-        c.timezone 'Africa/Asmera', 46, 3, 2333, 60
-      end
-      country 'ES', 'Spain' do |c|
-        c.timezone 'Europe/Madrid', 202, 5, -221, 60, 'mainland'
-        c.timezone 'Africa/Ceuta', 2153, 60, -319, 60, 'Ceuta & Melilla'
-        c.timezone 'Atlantic/Canary', 281, 10, -77, 5, 'Canary Islands'
-      end
-      country 'ET', 'Ethiopia' do |c|
-        c.timezone 'Africa/Addis_Ababa', 271, 30, 387, 10
-      end
-      country 'FI', 'Finland' do |c|
-        c.timezone 'Europe/Helsinki', 361, 6, 749, 30
-      end
-      country 'FJ', 'Fiji' do |c|
-        c.timezone 'Pacific/Fiji', -272, 15, 2141, 12
-      end
-      country 'FK', 'Falkland Islands' do |c|
-        c.timezone 'Atlantic/Stanley', -517, 10, -1157, 20
-      end
-      country 'FM', 'Micronesia' do |c|
-        c.timezone 'Pacific/Truk', 89, 12, 9107, 60, 'Truk (Chuuk) and Yap'
-        c.timezone 'Pacific/Ponape', 209, 30, 9493, 60, 'Ponape (Pohnpei)'
-        c.timezone 'Pacific/Kosrae', 319, 60, 9779, 60, 'Kosrae'
-      end
-      country 'FO', 'Faeroe Islands' do |c|
-        c.timezone 'Atlantic/Faeroe', 3721, 60, -203, 30
-      end
-      country 'FR', 'France' do |c|
-        c.timezone 'Europe/Paris', 733, 15, 7, 3
-      end
-      country 'GA', 'Gabon' do |c|
-        c.timezone 'Africa/Libreville', 23, 60, 189, 20
-      end
-      country 'GB', 'Britain (UK)' do |c|
-        c.timezone 'Europe/London', 2059, 40, -5, 16
-      end
-      country 'GD', 'Grenada' do |c|
-        c.timezone 'America/Grenada', 241, 20, -247, 4
-      end
-      country 'GE', 'Georgia' do |c|
-        c.timezone 'Asia/Tbilisi', 2503, 60, 2689, 60
-      end
-      country 'GF', 'French Guiana' do |c|
-        c.timezone 'America/Cayenne', 74, 15, -157, 3
-      end
-      country 'GG', 'Guernsey' do |c|
-        c.timezone 'Europe/Guernsey', 989, 20, -38, 15
-      end
-      country 'GH', 'Ghana' do |c|
-        c.timezone 'Africa/Accra', 111, 20, -13, 60
-      end
-      country 'GI', 'Gibraltar' do |c|
-        c.timezone 'Europe/Gibraltar', 542, 15, -107, 20
-      end
-      country 'GL', 'Greenland' do |c|
-        c.timezone 'America/Godthab', 3851, 60, -776, 15, 'most locations'
-        c.timezone 'America/Danmarkshavn', 2303, 30, -56, 3, 'east coast, north of Scoresbysund'
-        c.timezone 'America/Scoresbysund', 4229, 60, -659, 30, 'Scoresbysund / Ittoqqortoormiit'
-        c.timezone 'America/Thule', 2297, 30, -4127, 60, 'Thule / Pituffik'
-      end
-      country 'GM', 'Gambia' do |c|
-        c.timezone 'Africa/Banjul', 202, 15, -333, 20
-      end
-      country 'GN', 'Guinea' do |c|
-        c.timezone 'Africa/Conakry', 571, 60, -823, 60
-      end
-      country 'GP', 'Guadeloupe' do |c|
-        c.timezone 'America/Guadeloupe', 487, 30, -923, 15
-      end
-      country 'GQ', 'Equatorial Guinea' do |c|
-        c.timezone 'Africa/Malabo', 15, 4, 527, 60
-      end
-      country 'GR', 'Greece' do |c|
-        c.timezone 'Europe/Athens', 1139, 30, 1423, 60
-      end
-      country 'GS', 'South Georgia & the South Sandwich Islands' do |c|
-        c.timezone 'Atlantic/South_Georgia', -814, 15, -548, 15
-      end
-      country 'GT', 'Guatemala' do |c|
-        c.timezone 'America/Guatemala', 439, 30, -5431, 60
-      end
-      country 'GU', 'Guam' do |c|
-        c.timezone 'Pacific/Guam', 202, 15, 579, 4
-      end
-      country 'GW', 'Guinea-Bissau' do |c|
-        c.timezone 'Africa/Bissau', 237, 20, -187, 12
-      end
-      country 'GY', 'Guyana' do |c|
-        c.timezone 'America/Guyana', 34, 5, -349, 6
-      end
-      country 'HK', 'Hong Kong' do |c|
-        c.timezone 'Asia/Hong_Kong', 1337, 60, 2283, 20
-      end
-      country 'HM', 'Heard Island & McDonald Islands'
-      country 'HN', 'Honduras' do |c|
-        c.timezone 'America/Tegucigalpa', 141, 10, -5233, 60
-      end
-      country 'HR', 'Croatia' do |c|
-        c.timezone 'Europe/Zagreb', 229, 5, 479, 30
-      end
-      country 'HT', 'Haiti' do |c|
-        c.timezone 'America/Port-au-Prince', 278, 15, -217, 3
-      end
-      country 'HU', 'Hungary' do |c|
-        c.timezone 'Europe/Budapest', 95, 2, 229, 12
-      end
-      country 'ID', 'Indonesia' do |c|
-        c.timezone 'Asia/Jakarta', -37, 6, 534, 5, 'Java & Sumatra'
-        c.timezone 'Asia/Pontianak', -1, 30, 328, 3, 'west & central Borneo'
-        c.timezone 'Asia/Makassar', -307, 60, 597, 5, 'east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor'
-        c.timezone 'Asia/Jayapura', -38, 15, 1407, 10, 'Irian Jaya & the Moluccas'
-      end
-      country 'IE', 'Ireland' do |c|
-        c.timezone 'Europe/Dublin', 160, 3, -25, 4
-      end
-      country 'IL', 'Israel' do |c|
-        c.timezone 'Asia/Jerusalem', 953, 30, 1057, 30
-      end
-      country 'IM', 'Isle of Man' do |c|
-        c.timezone 'Europe/Isle_of_Man', 1083, 20, -67, 15
-      end
-      country 'IN', 'India' do |c|
-        c.timezone 'Asia/Calcutta', 338, 15, 2651, 30
-      end
-      country 'IO', 'British Indian Ocean Territory' do |c|
-        c.timezone 'Indian/Chagos', -22, 3, 869, 12
-      end
-      country 'IQ', 'Iraq' do |c|
-        c.timezone 'Asia/Baghdad', 667, 20, 533, 12
-      end
-      country 'IR', 'Iran' do |c|
-        c.timezone 'Asia/Tehran', 107, 3, 1543, 30
-      end
-      country 'IS', 'Iceland' do |c|
-        c.timezone 'Atlantic/Reykjavik', 1283, 20, -437, 20
-      end
-      country 'IT', 'Italy' do |c|
-        c.timezone 'Europe/Rome', 419, 10, 749, 60
-      end
-      country 'JE', 'Jersey' do |c|
-        c.timezone 'Europe/Jersey', 246, 5, -157, 60
-      end
-      country 'JM', 'Jamaica' do |c|
-        c.timezone 'America/Jamaica', 18, 1, -384, 5
-      end
-      country 'JO', 'Jordan' do |c|
-        c.timezone 'Asia/Amman', 639, 20, 539, 15
-      end
-      country 'JP', 'Japan' do |c|
-        c.timezone 'Asia/Tokyo', 32089, 900, 503081, 3600
-      end
-      country 'KE', 'Kenya' do |c|
-        c.timezone 'Africa/Nairobi', -77, 60, 2209, 60
-      end
-      country 'KG', 'Kyrgyzstan' do |c|
-        c.timezone 'Asia/Bishkek', 429, 10, 373, 5
-      end
-      country 'KH', 'Cambodia' do |c|
-        c.timezone 'Asia/Phnom_Penh', 231, 20, 1259, 12
-      end
-      country 'KI', 'Kiribati' do |c|
-        c.timezone 'Pacific/Tarawa', 17, 12, 173, 1, 'Gilbert Islands'
-        c.timezone 'Pacific/Enderbury', -47, 15, -2053, 12, 'Phoenix Islands'
-        c.timezone 'Pacific/Kiritimati', 28, 15, -472, 3, 'Line Islands'
-      end
-      country 'KM', 'Comoros' do |c|
-        c.timezone 'Indian/Comoro', -701, 60, 649, 15
-      end
-      country 'KN', 'St Kitts & Nevis' do |c|
-        c.timezone 'America/St_Kitts', 173, 10, -3763, 60
-      end
-      country 'KP', 'Korea (North)' do |c|
-        c.timezone 'Asia/Pyongyang', 2341, 60, 503, 4
-      end
-      country 'KR', 'Korea (South)' do |c|
-        c.timezone 'Asia/Seoul', 751, 20, 3809, 30
-      end
-      country 'KW', 'Kuwait' do |c|
-        c.timezone 'Asia/Kuwait', 88, 3, 2879, 60
-      end
-      country 'KY', 'Cayman Islands' do |c|
-        c.timezone 'America/Cayman', 193, 10, -4883, 60
-      end
-      country 'KZ', 'Kazakhstan' do |c|
-        c.timezone 'Asia/Almaty', 173, 4, 1539, 20, 'most locations'
-        c.timezone 'Asia/Qyzylorda', 224, 5, 982, 15, 'Qyzylorda (Kyzylorda, Kzyl-Orda)'
-        c.timezone 'Asia/Aqtobe', 3017, 60, 343, 6, 'Aqtobe (Aktobe)'
-        c.timezone 'Asia/Aqtau', 2671, 60, 754, 15, 'Atyrau (Atirau, Gur\'yev), Mangghystau (Mankistau)'
-        c.timezone 'Asia/Oral', 3073, 60, 1027, 20, 'West Kazakhstan'
-      end
-      country 'LA', 'Laos' do |c|
-        c.timezone 'Asia/Vientiane', 539, 30, 513, 5
-      end
-      country 'LB', 'Lebanon' do |c|
-        c.timezone 'Asia/Beirut', 2033, 60, 71, 2
-      end
-      country 'LC', 'St Lucia' do |c|
-        c.timezone 'America/St_Lucia', 841, 60, -61, 1
-      end
-      country 'LI', 'Liechtenstein' do |c|
-        c.timezone 'Europe/Vaduz', 943, 20, 571, 60
-      end
-      country 'LK', 'Sri Lanka' do |c|
-        c.timezone 'Asia/Colombo', 104, 15, 1597, 20
-      end
-      country 'LR', 'Liberia' do |c|
-        c.timezone 'Africa/Monrovia', 63, 10, -647, 60
-      end
-      country 'LS', 'Lesotho' do |c|
-        c.timezone 'Africa/Maseru', -442, 15, 55, 2
-      end
-      country 'LT', 'Lithuania' do |c|
-        c.timezone 'Europe/Vilnius', 3281, 60, 1519, 60
-      end
-      country 'LU', 'Luxembourg' do |c|
-        c.timezone 'Europe/Luxembourg', 248, 5, 123, 20
-      end
-      country 'LV', 'Latvia' do |c|
-        c.timezone 'Europe/Riga', 1139, 20, 241, 10
-      end
-      country 'LY', 'Libya' do |c|
-        c.timezone 'Africa/Tripoli', 329, 10, 791, 60
-      end
-      country 'MA', 'Morocco' do |c|
-        c.timezone 'Africa/Casablanca', 673, 20, -91, 12
-      end
-      country 'MC', 'Monaco' do |c|
-        c.timezone 'Europe/Monaco', 437, 10, 443, 60
-      end
-      country 'MD', 'Moldova' do |c|
-        c.timezone 'Europe/Chisinau', 47, 1, 173, 6
-      end
-      country 'ME', 'Montenegro' do |c|
-        c.timezone 'Europe/Podgorica', 2567, 60, 292, 15
-      end
-      country 'MG', 'Madagascar' do |c|
-        c.timezone 'Indian/Antananarivo', -227, 12, 2851, 60
-      end
-      country 'MH', 'Marshall Islands' do |c|
-        c.timezone 'Pacific/Majuro', 143, 20, 856, 5, 'most locations'
-        c.timezone 'Pacific/Kwajalein', 109, 12, 502, 3, 'Kwajalein'
-      end
-      country 'MK', 'Macedonia' do |c|
-        c.timezone 'Europe/Skopje', 2519, 60, 643, 30
-      end
-      country 'ML', 'Mali' do |c|
-        c.timezone 'Africa/Bamako', 253, 20, -8, 1
-      end
-      country 'MM', 'Myanmar (Burma)' do |c|
-        c.timezone 'Asia/Rangoon', 1007, 60, 577, 6
-      end
-      country 'MN', 'Mongolia' do |c|
-        c.timezone 'Asia/Ulaanbaatar', 575, 12, 6413, 60, 'most locations'
-        c.timezone 'Asia/Hovd', 2881, 60, 1833, 20, 'Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan'
-        c.timezone 'Asia/Choibalsan', 721, 15, 229, 2, 'Dornod, Sukhbaatar'
-      end
-      country 'MO', 'Macau' do |c|
-        c.timezone 'Asia/Macau', 667, 30, 1363, 12
-      end
-      country 'MP', 'Northern Mariana Islands' do |c|
-        c.timezone 'Pacific/Saipan', 76, 5, 583, 4
-      end
-      country 'MQ', 'Martinique' do |c|
-        c.timezone 'America/Martinique', 73, 5, -733, 12
-      end
-      country 'MR', 'Mauritania' do |c|
-        c.timezone 'Africa/Nouakchott', 181, 10, -319, 20
-      end
-      country 'MS', 'Montserrat' do |c|
-        c.timezone 'America/Montserrat', 1003, 60, -3733, 60
-      end
-      country 'MT', 'Malta' do |c|
-        c.timezone 'Europe/Malta', 359, 10, 871, 60
-      end
-      country 'MU', 'Mauritius' do |c|
-        c.timezone 'Indian/Mauritius', -121, 6, 115, 2
-      end
-      country 'MV', 'Maldives' do |c|
-        c.timezone 'Indian/Maldives', 25, 6, 147, 2
-      end
-      country 'MW', 'Malawi' do |c|
-        c.timezone 'Africa/Blantyre', -947, 60, 35, 1
-      end
-      country 'MX', 'Mexico' do |c|
-        c.timezone 'America/Mexico_City', 97, 5, -1983, 20, 'Central Time - most locations'
-        c.timezone 'America/Cancun', 253, 12, -2603, 30, 'Central Time - Quintana Roo'
-        c.timezone 'America/Merida', 629, 30, -5377, 60, 'Central Time - Campeche, Yucatan'
-        c.timezone 'America/Monterrey', 77, 3, -6019, 60, 'Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas'
-        c.timezone 'America/Mazatlan', 1393, 60, -1277, 12, 'Mountain Time - S Baja, Nayarit, Sinaloa'
-        c.timezone 'America/Chihuahua', 859, 30, -1273, 12, 'Mountain Time - Chihuahua'
-        c.timezone 'America/Hermosillo', 436, 15, -3329, 30, 'Mountain Standard Time - Sonora'
-        c.timezone 'America/Tijuana', 488, 15, -7021, 60, 'Pacific Time'
-      end
-      country 'MY', 'Malaysia' do |c|
-        c.timezone 'Asia/Kuala_Lumpur', 19, 6, 1017, 10, 'peninsular Malaysia'
-        c.timezone 'Asia/Kuching', 31, 20, 331, 3, 'Sabah & Sarawak'
-      end
-      country 'MZ', 'Mozambique' do |c|
-        c.timezone 'Africa/Maputo', -779, 30, 391, 12
-      end
-      country 'NA', 'Namibia' do |c|
-        c.timezone 'Africa/Windhoek', -677, 30, 171, 10
-      end
-      country 'NC', 'New Caledonia' do |c|
-        c.timezone 'Pacific/Noumea', -334, 15, 331, 2
-      end
-      country 'NE', 'Niger' do |c|
-        c.timezone 'Africa/Niamey', 811, 60, 127, 60
-      end
-      country 'NF', 'Norfolk Island' do |c|
-        c.timezone 'Pacific/Norfolk', -581, 20, 5039, 30
-      end
-      country 'NG', 'Nigeria' do |c|
-        c.timezone 'Africa/Lagos', 129, 20, 17, 5
-      end
-      country 'NI', 'Nicaragua' do |c|
-        c.timezone 'America/Managua', 243, 20, -5177, 60
-      end
-      country 'NL', 'Netherlands' do |c|
-        c.timezone 'Europe/Amsterdam', 1571, 30, 49, 10
-      end
-      country 'NO', 'Norway' do |c|
-        c.timezone 'Europe/Oslo', 719, 12, 43, 4
-      end
-      country 'NP', 'Nepal' do |c|
-        c.timezone 'Asia/Katmandu', 1663, 60, 5119, 60
-      end
-      country 'NR', 'Nauru' do |c|
-        c.timezone 'Pacific/Nauru', -31, 60, 2003, 12
-      end
-      country 'NU', 'Niue' do |c|
-        c.timezone 'Pacific/Niue', -1141, 60, 2039, 12
-      end
-      country 'NZ', 'New Zealand' do |c|
-        c.timezone 'Pacific/Auckland', -553, 15, 5243, 30, 'most locations'
-        c.timezone 'Pacific/Chatham', -879, 20, -3531, 20, 'Chatham Islands'
-      end
-      country 'OM', 'Oman' do |c|
-        c.timezone 'Asia/Muscat', 118, 5, 703, 12
-      end
-      country 'PA', 'Panama' do |c|
-        c.timezone 'America/Panama', 269, 30, -1193, 15
-      end
-      country 'PE', 'Peru' do |c|
-        c.timezone 'America/Lima', -241, 20, -1541, 20
-      end
-      country 'PF', 'French Polynesia' do |c|
-        c.timezone 'Pacific/Tahiti', -263, 15, -4487, 30, 'Society Islands'
-        c.timezone 'Pacific/Marquesas', -9, 1, -279, 2, 'Marquesas Islands'
-        c.timezone 'Pacific/Gambier', -347, 15, -2699, 20, 'Gambier Islands'
-      end
-      country 'PG', 'Papua New Guinea' do |c|
-        c.timezone 'Pacific/Port_Moresby', -19, 2, 883, 6
-      end
-      country 'PH', 'Philippines' do |c|
-        c.timezone 'Asia/Manila', 175, 12, 121, 1
-      end
-      country 'PK', 'Pakistan' do |c|
-        c.timezone 'Asia/Karachi', 373, 15, 1341, 20
-      end
-      country 'PL', 'Poland' do |c|
-        c.timezone 'Europe/Warsaw', 209, 4, 21, 1
-      end
-      country 'PM', 'St Pierre & Miquelon' do |c|
-        c.timezone 'America/Miquelon', 941, 20, -169, 3
-      end
-      country 'PN', 'Pitcairn' do |c|
-        c.timezone 'Pacific/Pitcairn', -376, 15, -1561, 12
-      end
-      country 'PR', 'Puerto Rico' do |c|
-        c.timezone 'America/Puerto_Rico', 11081, 600, -118991, 1800
-      end
-      country 'PS', 'Palestine' do |c|
-        c.timezone 'Asia/Gaza', 63, 2, 517, 15
-      end
-      country 'PT', 'Portugal' do |c|
-        c.timezone 'Europe/Lisbon', 2323, 60, -137, 15, 'mainland'
-        c.timezone 'Atlantic/Madeira', 979, 30, -169, 10, 'Madeira Islands'
-        c.timezone 'Atlantic/Azores', 566, 15, -77, 3, 'Azores'
-      end
-      country 'PW', 'Palau' do |c|
-        c.timezone 'Pacific/Palau', 22, 3, 8069, 60
-      end
-      country 'PY', 'Paraguay' do |c|
-        c.timezone 'America/Asuncion', -379, 15, -173, 3
-      end
-      country 'QA', 'Qatar' do |c|
-        c.timezone 'Asia/Qatar', 1517, 60, 773, 15
-      end
-      country 'RE', 'Reunion' do |c|
-        c.timezone 'Indian/Reunion', -313, 15, 832, 15
-      end
-      country 'RO', 'Romania' do |c|
-        c.timezone 'Europe/Bucharest', 1333, 30, 261, 10
-      end
-      country 'RS', 'Serbia' do |c|
-        c.timezone 'Europe/Belgrade', 269, 6, 41, 2
-      end
-      country 'RU', 'Russia' do |c|
-        c.timezone 'Europe/Kaliningrad', 3283, 60, 41, 2, 'Moscow-01 - Kaliningrad'
-        c.timezone 'Europe/Moscow', 223, 4, 451, 12, 'Moscow+00 - west Russia'
-        c.timezone 'Europe/Volgograd', 731, 15, 533, 12, 'Moscow+00 - Caspian Sea'
-        c.timezone 'Europe/Samara', 266, 5, 1003, 20, 'Moscow+01 - Samara, Udmurtia'
-        c.timezone 'Asia/Yekaterinburg', 1137, 20, 303, 5, 'Moscow+02 - Urals'
-        c.timezone 'Asia/Omsk', 55, 1, 367, 5, 'Moscow+03 - west Siberia'
-        c.timezone 'Asia/Novosibirsk', 1651, 30, 995, 12, 'Moscow+03 - Novosibirsk'
-        c.timezone 'Asia/Krasnoyarsk', 3361, 60, 557, 6, 'Moscow+04 - Yenisei River'
-        c.timezone 'Asia/Irkutsk', 784, 15, 313, 3, 'Moscow+05 - Lake Baikal'
-        c.timezone 'Asia/Yakutsk', 62, 1, 389, 3, 'Moscow+06 - Lena River'
-        c.timezone 'Asia/Vladivostok', 259, 6, 1979, 15, 'Moscow+07 - Amur River'
-        c.timezone 'Asia/Sakhalin', 1409, 30, 1427, 10, 'Moscow+07 - Sakhalin Island'
-        c.timezone 'Asia/Magadan', 1787, 30, 754, 5, 'Moscow+08 - Magadan'
-        c.timezone 'Asia/Kamchatka', 3181, 60, 3173, 20, 'Moscow+09 - Kamchatka'
-        c.timezone 'Asia/Anadyr', 259, 4, 10649, 60, 'Moscow+10 - Bering Sea'
-      end
-      country 'RW', 'Rwanda' do |c|
-        c.timezone 'Africa/Kigali', -39, 20, 451, 15
-      end
-      country 'SA', 'Saudi Arabia' do |c|
-        c.timezone 'Asia/Riyadh', 739, 30, 2803, 60
-      end
-      country 'SB', 'Solomon Islands' do |c|
-        c.timezone 'Pacific/Guadalcanal', -143, 15, 801, 5
-      end
-      country 'SC', 'Seychelles' do |c|
-        c.timezone 'Indian/Mahe', -14, 3, 832, 15
-      end
-      country 'SD', 'Sudan' do |c|
-        c.timezone 'Africa/Khartoum', 78, 5, 488, 15
-      end
-      country 'SE', 'Sweden' do |c|
-        c.timezone 'Europe/Stockholm', 178, 3, 361, 20
-      end
-      country 'SG', 'Singapore' do |c|
-        c.timezone 'Asia/Singapore', 77, 60, 2077, 20
-      end
-      country 'SH', 'St Helena' do |c|
-        c.timezone 'Atlantic/St_Helena', -191, 12, -57, 10
-      end
-      country 'SI', 'Slovenia' do |c|
-        c.timezone 'Europe/Ljubljana', 921, 20, 871, 60
-      end
-      country 'SJ', 'Svalbard & Jan Mayen' do |c|
-        c.timezone 'Arctic/Longyearbyen', 78, 1, 16, 1, 'Svalbard'
-        c.timezone 'Atlantic/Jan_Mayen', 4259, 60, -97, 12, 'Jan Mayen'
-      end
-      country 'SK', 'Slovakia' do |c|
-        c.timezone 'Europe/Bratislava', 963, 20, 1027, 60
-      end
-      country 'SL', 'Sierra Leone' do |c|
-        c.timezone 'Africa/Freetown', 17, 2, -53, 4
-      end
-      country 'SM', 'San Marino' do |c|
-        c.timezone 'Europe/San_Marino', 527, 12, 187, 15
-      end
-      country 'SN', 'Senegal' do |c|
-        c.timezone 'Africa/Dakar', 44, 3, -523, 30
-      end
-      country 'SO', 'Somalia' do |c|
-        c.timezone 'Africa/Mogadishu', 31, 15, 1361, 30
-      end
-      country 'SR', 'Suriname' do |c|
-        c.timezone 'America/Paramaribo', 35, 6, -331, 6
-      end
-      country 'ST', 'Sao Tome & Principe' do |c|
-        c.timezone 'Africa/Sao_Tome', 1, 3, 101, 15
-      end
-      country 'SV', 'El Salvador' do |c|
-        c.timezone 'America/El_Salvador', 137, 10, -446, 5
-      end
-      country 'SY', 'Syria' do |c|
-        c.timezone 'Asia/Damascus', 67, 2, 363, 10
-      end
-      country 'SZ', 'Swaziland' do |c|
-        c.timezone 'Africa/Mbabane', -263, 10, 311, 10
-      end
-      country 'TC', 'Turks & Caicos Is' do |c|
-        c.timezone 'America/Grand_Turk', 322, 15, -1067, 15
-      end
-      country 'TD', 'Chad' do |c|
-        c.timezone 'Africa/Ndjamena', 727, 60, 301, 20
-      end
-      country 'TF', 'French Southern & Antarctic Lands' do |c|
-        c.timezone 'Indian/Kerguelen', -17767, 360, 28087, 400
-      end
-      country 'TG', 'Togo' do |c|
-        c.timezone 'Africa/Lome', 92, 15, 73, 60
-      end
-      country 'TH', 'Thailand' do |c|
-        c.timezone 'Asia/Bangkok', 55, 4, 6031, 60
-      end
-      country 'TJ', 'Tajikistan' do |c|
-        c.timezone 'Asia/Dushanbe', 463, 12, 344, 5
-      end
-      country 'TK', 'Tokelau' do |c|
-        c.timezone 'Pacific/Fakaofo', -281, 30, -5137, 30
-      end
-      country 'TL', 'East Timor' do |c|
-        c.timezone 'Asia/Dili', -171, 20, 1507, 12
-      end
-      country 'TM', 'Turkmenistan' do |c|
-        c.timezone 'Asia/Ashgabat', 759, 20, 3503, 60
-      end
-      country 'TN', 'Tunisia' do |c|
-        c.timezone 'Africa/Tunis', 184, 5, 611, 60
-      end
-      country 'TO', 'Tonga' do |c|
-        c.timezone 'Pacific/Tongatapu', -127, 6, 1051, 6
-      end
-      country 'TR', 'Turkey' do |c|
-        c.timezone 'Europe/Istanbul', 2461, 60, 869, 30
-      end
-      country 'TT', 'Trinidad & Tobago' do |c|
-        c.timezone 'America/Port_of_Spain', 213, 20, -3691, 60
-      end
-      country 'TV', 'Tuvalu' do |c|
-        c.timezone 'Pacific/Funafuti', -511, 60, 10753, 60
-      end
-      country 'TW', 'Taiwan' do |c|
-        c.timezone 'Asia/Taipei', 501, 20, 243, 2
-      end
-      country 'TZ', 'Tanzania' do |c|
-        c.timezone 'Africa/Dar_es_Salaam', -34, 5, 2357, 60
-      end
-      country 'UA', 'Ukraine' do |c|
-        c.timezone 'Europe/Kiev', 1513, 30, 1831, 60, 'most locations'
-        c.timezone 'Europe/Uzhgorod', 2917, 60, 223, 10, 'Ruthenia'
-        c.timezone 'Europe/Zaporozhye', 287, 6, 211, 6, 'Zaporozh\'ye, E Lugansk'
-        c.timezone 'Europe/Simferopol', 899, 20, 341, 10, 'central Crimea'
-      end
-      country 'UG', 'Uganda' do |c|
-        c.timezone 'Africa/Kampala', 19, 60, 389, 12
-      end
-      country 'UM', 'US minor outlying islands' do |c|
-        c.timezone 'Pacific/Johnston', 17, 1, -337, 2, 'Johnston Atoll'
-        c.timezone 'Pacific/Midway', 1693, 60, -5321, 30, 'Midway Islands'
-        c.timezone 'Pacific/Wake', 1157, 60, 9997, 60, 'Wake Island'
-      end
-      country 'US', 'United States' do |c|
-        c.timezone 'America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time'
-        c.timezone 'America/Detroit', 152393, 3600, -19931, 240, 'Eastern Time - Michigan - most locations'
-        c.timezone 'America/Kentucky/Louisville', 9181, 240, -154367, 1800, 'Eastern Time - Kentucky - Louisville area'
-        c.timezone 'America/Kentucky/Monticello', 132587, 3600, -101819, 1200, 'Eastern Time - Kentucky - Wayne County'
-        c.timezone 'America/Indiana/Indianapolis', 23861, 600, -310169, 3600, 'Eastern Time - Indiana - most locations'
-        c.timezone 'America/Indiana/Marengo', 17269, 450, -310841, 3600, 'Eastern Time - Indiana - Crawford County'
-        c.timezone 'America/Indiana/Knox', 9911, 240, -693, 8, 'Eastern Time - Indiana - Starke County'
-        c.timezone 'America/Indiana/Vevay', 34873, 900, -153121, 1800, 'Eastern Time - Indiana - Switzerland County'
-        c.timezone 'America/Chicago', 837, 20, -1753, 20, 'Central Time'
-        c.timezone 'America/Indiana/Vincennes', 69619, 1800, -315103, 3600, 'Central Time - Indiana - Daviess, Dubois, Knox, Martin, Perry & Pulaski Counties'
-        c.timezone 'America/Indiana/Petersburg', 138571, 3600, -314203, 3600, 'Central Time - Indiana - Pike County'
-        c.timezone 'America/Menominee', 40597, 900, -105137, 1200, 'Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties'
-        c.timezone 'America/North_Dakota/Center', 169619, 3600, -121559, 1200, 'Central Time - North Dakota - Oliver County'
-        c.timezone 'America/North_Dakota/New_Salem', 9369, 200, -121693, 1200, 'Central Time - North Dakota - Morton County (except Mandan area)'
-        c.timezone 'America/Denver', 47687, 1200, -125981, 1200, 'Mountain Time'
-        c.timezone 'America/Boise', 157009, 3600, -46481, 400, 'Mountain Time - south Idaho & east Oregon'
-        c.timezone 'America/Shiprock', 33107, 900, -391271, 3600, 'Mountain Time - Navajo'
-        c.timezone 'America/Phoenix', 20069, 600, -16811, 150, 'Mountain Standard Time - Arizona'
-        c.timezone 'America/Los_Angeles', 30647, 900, -212837, 1800, 'Pacific Time'
-        c.timezone 'America/Anchorage', 44077, 720, -539641, 3600, 'Alaska Time'
-        c.timezone 'America/Juneau', 209887, 3600, -483911, 3600, 'Alaska Time - Alaska panhandle'
-        c.timezone 'America/Yakutat', 214369, 3600, -251509, 1800, 'Alaska Time - Alaska panhandle neck'
-        c.timezone 'America/Nome', 58051, 900, -595463, 3600, 'Alaska Time - west Alaska'
-        c.timezone 'America/Adak', 1297, 25, -635969, 3600, 'Aleutian Islands'
-        c.timezone 'Pacific/Honolulu', 15341, 720, -18943, 120, 'Hawaii'
-      end
-      country 'UY', 'Uruguay' do |c|
-        c.timezone 'America/Montevideo', -2093, 60, -3371, 60
-      end
-      country 'UZ', 'Uzbekistan' do |c|
-        c.timezone 'Asia/Samarkand', 119, 3, 334, 5, 'west Uzbekistan'
-        c.timezone 'Asia/Tashkent', 124, 3, 693, 10, 'east Uzbekistan'
-      end
-      country 'VA', 'Vatican City' do |c|
-        c.timezone 'Europe/Vatican', 419, 10, 249, 20
-      end
-      country 'VC', 'St Vincent' do |c|
-        c.timezone 'America/St_Vincent', 263, 20, -1837, 30
-      end
-      country 'VE', 'Venezuela' do |c|
-        c.timezone 'America/Caracas', 21, 2, -1004, 15
-      end
-      country 'VG', 'Virgin Islands (UK)' do |c|
-        c.timezone 'America/Tortola', 369, 20, -3877, 60
-      end
-      country 'VI', 'Virgin Islands (US)' do |c|
-        c.timezone 'America/St_Thomas', 367, 20, -974, 15
-      end
-      country 'VN', 'Vietnam' do |c|
-        c.timezone 'Asia/Saigon', 43, 4, 320, 3
-      end
-      country 'VU', 'Vanuatu' do |c|
-        c.timezone 'Pacific/Efate', -53, 3, 2021, 12
-      end
-      country 'WF', 'Wallis & Futuna' do |c|
-        c.timezone 'Pacific/Wallis', -133, 10, -1057, 6
-      end
-      country 'WS', 'Samoa (western)' do |c|
-        c.timezone 'Pacific/Apia', -83, 6, -2576, 15
-      end
-      country 'YE', 'Yemen' do |c|
-        c.timezone 'Asia/Aden', 51, 4, 226, 5
-      end
-      country 'YT', 'Mayotte' do |c|
-        c.timezone 'Indian/Mayotte', -767, 60, 1357, 30
-      end
-      country 'ZA', 'South Africa' do |c|
-        c.timezone 'Africa/Johannesburg', -105, 4, 28, 1
-      end
-      country 'ZM', 'Zambia' do |c|
-        c.timezone 'Africa/Lusaka', -185, 12, 1697, 60
-      end
-      country 'ZW', 'Zimbabwe' do |c|
-        c.timezone 'Africa/Harare', -107, 6, 621, 20
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/timezones.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/timezones.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/timezones.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/indexes/timezones.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,561 +0,0 @@
-require 'tzinfo/timezone_index_definition'
-
-module TZInfo
-  module Indexes
-    module Timezones
-      include TimezoneIndexDefinition
-
-      timezone 'Africa/Abidjan'
-      timezone 'Africa/Accra'
-      timezone 'Africa/Addis_Ababa'
-      timezone 'Africa/Algiers'
-      timezone 'Africa/Asmera'
-      timezone 'Africa/Bamako'
-      timezone 'Africa/Bangui'
-      timezone 'Africa/Banjul'
-      timezone 'Africa/Bissau'
-      timezone 'Africa/Blantyre'
-      timezone 'Africa/Brazzaville'
-      timezone 'Africa/Bujumbura'
-      timezone 'Africa/Cairo'
-      timezone 'Africa/Casablanca'
-      timezone 'Africa/Ceuta'
-      timezone 'Africa/Conakry'
-      timezone 'Africa/Dakar'
-      timezone 'Africa/Dar_es_Salaam'
-      timezone 'Africa/Djibouti'
-      timezone 'Africa/Douala'
-      timezone 'Africa/El_Aaiun'
-      timezone 'Africa/Freetown'
-      timezone 'Africa/Gaborone'
-      timezone 'Africa/Harare'
-      timezone 'Africa/Johannesburg'
-      timezone 'Africa/Kampala'
-      timezone 'Africa/Khartoum'
-      timezone 'Africa/Kigali'
-      timezone 'Africa/Kinshasa'
-      timezone 'Africa/Lagos'
-      timezone 'Africa/Libreville'
-      timezone 'Africa/Lome'
-      timezone 'Africa/Luanda'
-      timezone 'Africa/Lubumbashi'
-      timezone 'Africa/Lusaka'
-      timezone 'Africa/Malabo'
-      timezone 'Africa/Maputo'
-      timezone 'Africa/Maseru'
-      timezone 'Africa/Mbabane'
-      timezone 'Africa/Mogadishu'
-      timezone 'Africa/Monrovia'
-      timezone 'Africa/Nairobi'
-      timezone 'Africa/Ndjamena'
-      timezone 'Africa/Niamey'
-      timezone 'Africa/Nouakchott'
-      timezone 'Africa/Ouagadougou'
-      timezone 'Africa/Porto-Novo'
-      timezone 'Africa/Sao_Tome'
-      linked_timezone 'Africa/Timbuktu'
-      timezone 'Africa/Tripoli'
-      timezone 'Africa/Tunis'
-      timezone 'Africa/Windhoek'
-      timezone 'America/Adak'
-      timezone 'America/Anchorage'
-      timezone 'America/Anguilla'
-      timezone 'America/Antigua'
-      timezone 'America/Araguaina'
-      timezone 'America/Argentina/Buenos_Aires'
-      timezone 'America/Argentina/Catamarca'
-      linked_timezone 'America/Argentina/ComodRivadavia'
-      timezone 'America/Argentina/Cordoba'
-      timezone 'America/Argentina/Jujuy'
-      timezone 'America/Argentina/La_Rioja'
-      timezone 'America/Argentina/Mendoza'
-      timezone 'America/Argentina/Rio_Gallegos'
-      timezone 'America/Argentina/San_Juan'
-      timezone 'America/Argentina/Tucuman'
-      timezone 'America/Argentina/Ushuaia'
-      timezone 'America/Aruba'
-      timezone 'America/Asuncion'
-      timezone 'America/Atikokan'
-      linked_timezone 'America/Atka'
-      timezone 'America/Bahia'
-      timezone 'America/Barbados'
-      timezone 'America/Belem'
-      timezone 'America/Belize'
-      timezone 'America/Blanc-Sablon'
-      timezone 'America/Boa_Vista'
-      timezone 'America/Bogota'
-      timezone 'America/Boise'
-      linked_timezone 'America/Buenos_Aires'
-      timezone 'America/Cambridge_Bay'
-      timezone 'America/Campo_Grande'
-      timezone 'America/Cancun'
-      timezone 'America/Caracas'
-      linked_timezone 'America/Catamarca'
-      timezone 'America/Cayenne'
-      timezone 'America/Cayman'
-      timezone 'America/Chicago'
-      timezone 'America/Chihuahua'
-      linked_timezone 'America/Coral_Harbour'
-      linked_timezone 'America/Cordoba'
-      timezone 'America/Costa_Rica'
-      timezone 'America/Cuiaba'
-      timezone 'America/Curacao'
-      timezone 'America/Danmarkshavn'
-      timezone 'America/Dawson'
-      timezone 'America/Dawson_Creek'
-      timezone 'America/Denver'
-      timezone 'America/Detroit'
-      timezone 'America/Dominica'
-      timezone 'America/Edmonton'
-      timezone 'America/Eirunepe'
-      timezone 'America/El_Salvador'
-      linked_timezone 'America/Ensenada'
-      linked_timezone 'America/Fort_Wayne'
-      timezone 'America/Fortaleza'
-      timezone 'America/Glace_Bay'
-      timezone 'America/Godthab'
-      timezone 'America/Goose_Bay'
-      timezone 'America/Grand_Turk'
-      timezone 'America/Grenada'
-      timezone 'America/Guadeloupe'
-      timezone 'America/Guatemala'
-      timezone 'America/Guayaquil'
-      timezone 'America/Guyana'
-      timezone 'America/Halifax'
-      timezone 'America/Havana'
-      timezone 'America/Hermosillo'
-      timezone 'America/Indiana/Indianapolis'
-      timezone 'America/Indiana/Knox'
-      timezone 'America/Indiana/Marengo'
-      timezone 'America/Indiana/Petersburg'
-      timezone 'America/Indiana/Vevay'
-      timezone 'America/Indiana/Vincennes'
-      linked_timezone 'America/Indianapolis'
-      timezone 'America/Inuvik'
-      timezone 'America/Iqaluit'
-      timezone 'America/Jamaica'
-      linked_timezone 'America/Jujuy'
-      timezone 'America/Juneau'
-      timezone 'America/Kentucky/Louisville'
-      timezone 'America/Kentucky/Monticello'
-      linked_timezone 'America/Knox_IN'
-      timezone 'America/La_Paz'
-      timezone 'America/Lima'
-      timezone 'America/Los_Angeles'
-      linked_timezone 'America/Louisville'
-      timezone 'America/Maceio'
-      timezone 'America/Managua'
-      timezone 'America/Manaus'
-      timezone 'America/Martinique'
-      timezone 'America/Mazatlan'
-      linked_timezone 'America/Mendoza'
-      timezone 'America/Menominee'
-      timezone 'America/Merida'
-      timezone 'America/Mexico_City'
-      timezone 'America/Miquelon'
-      timezone 'America/Moncton'
-      timezone 'America/Monterrey'
-      timezone 'America/Montevideo'
-      timezone 'America/Montreal'
-      timezone 'America/Montserrat'
-      timezone 'America/Nassau'
-      timezone 'America/New_York'
-      timezone 'America/Nipigon'
-      timezone 'America/Nome'
-      timezone 'America/Noronha'
-      timezone 'America/North_Dakota/Center'
-      timezone 'America/North_Dakota/New_Salem'
-      timezone 'America/Panama'
-      timezone 'America/Pangnirtung'
-      timezone 'America/Paramaribo'
-      timezone 'America/Phoenix'
-      timezone 'America/Port-au-Prince'
-      timezone 'America/Port_of_Spain'
-      linked_timezone 'America/Porto_Acre'
-      timezone 'America/Porto_Velho'
-      timezone 'America/Puerto_Rico'
-      timezone 'America/Rainy_River'
-      timezone 'America/Rankin_Inlet'
-      timezone 'America/Recife'
-      timezone 'America/Regina'
-      timezone 'America/Rio_Branco'
-      linked_timezone 'America/Rosario'
-      timezone 'America/Santiago'
-      timezone 'America/Santo_Domingo'
-      timezone 'America/Sao_Paulo'
-      timezone 'America/Scoresbysund'
-      linked_timezone 'America/Shiprock'
-      timezone 'America/St_Johns'
-      timezone 'America/St_Kitts'
-      timezone 'America/St_Lucia'
-      timezone 'America/St_Thomas'
-      timezone 'America/St_Vincent'
-      timezone 'America/Swift_Current'
-      timezone 'America/Tegucigalpa'
-      timezone 'America/Thule'
-      timezone 'America/Thunder_Bay'
-      timezone 'America/Tijuana'
-      timezone 'America/Toronto'
-      timezone 'America/Tortola'
-      timezone 'America/Vancouver'
-      linked_timezone 'America/Virgin'
-      timezone 'America/Whitehorse'
-      timezone 'America/Winnipeg'
-      timezone 'America/Yakutat'
-      timezone 'America/Yellowknife'
-      timezone 'Antarctica/Casey'
-      timezone 'Antarctica/Davis'
-      timezone 'Antarctica/DumontDUrville'
-      timezone 'Antarctica/Mawson'
-      timezone 'Antarctica/McMurdo'
-      timezone 'Antarctica/Palmer'
-      timezone 'Antarctica/Rothera'
-      linked_timezone 'Antarctica/South_Pole'
-      timezone 'Antarctica/Syowa'
-      timezone 'Antarctica/Vostok'
-      linked_timezone 'Arctic/Longyearbyen'
-      timezone 'Asia/Aden'
-      timezone 'Asia/Almaty'
-      timezone 'Asia/Amman'
-      timezone 'Asia/Anadyr'
-      timezone 'Asia/Aqtau'
-      timezone 'Asia/Aqtobe'
-      timezone 'Asia/Ashgabat'
-      linked_timezone 'Asia/Ashkhabad'
-      timezone 'Asia/Baghdad'
-      timezone 'Asia/Bahrain'
-      timezone 'Asia/Baku'
-      timezone 'Asia/Bangkok'
-      timezone 'Asia/Beirut'
-      timezone 'Asia/Bishkek'
-      timezone 'Asia/Brunei'
-      timezone 'Asia/Calcutta'
-      timezone 'Asia/Choibalsan'
-      timezone 'Asia/Chongqing'
-      linked_timezone 'Asia/Chungking'
-      timezone 'Asia/Colombo'
-      linked_timezone 'Asia/Dacca'
-      timezone 'Asia/Damascus'
-      timezone 'Asia/Dhaka'
-      timezone 'Asia/Dili'
-      timezone 'Asia/Dubai'
-      timezone 'Asia/Dushanbe'
-      timezone 'Asia/Gaza'
-      timezone 'Asia/Harbin'
-      timezone 'Asia/Hong_Kong'
-      timezone 'Asia/Hovd'
-      timezone 'Asia/Irkutsk'
-      linked_timezone 'Asia/Istanbul'
-      timezone 'Asia/Jakarta'
-      timezone 'Asia/Jayapura'
-      timezone 'Asia/Jerusalem'
-      timezone 'Asia/Kabul'
-      timezone 'Asia/Kamchatka'
-      timezone 'Asia/Karachi'
-      timezone 'Asia/Kashgar'
-      timezone 'Asia/Katmandu'
-      timezone 'Asia/Krasnoyarsk'
-      timezone 'Asia/Kuala_Lumpur'
-      timezone 'Asia/Kuching'
-      timezone 'Asia/Kuwait'
-      linked_timezone 'Asia/Macao'
-      timezone 'Asia/Macau'
-      timezone 'Asia/Magadan'
-      timezone 'Asia/Makassar'
-      timezone 'Asia/Manila'
-      timezone 'Asia/Muscat'
-      timezone 'Asia/Nicosia'
-      timezone 'Asia/Novosibirsk'
-      timezone 'Asia/Omsk'
-      timezone 'Asia/Oral'
-      timezone 'Asia/Phnom_Penh'
-      timezone 'Asia/Pontianak'
-      timezone 'Asia/Pyongyang'
-      timezone 'Asia/Qatar'
-      timezone 'Asia/Qyzylorda'
-      timezone 'Asia/Rangoon'
-      timezone 'Asia/Riyadh'
-      timezone 'Asia/Riyadh87'
-      timezone 'Asia/Riyadh88'
-      timezone 'Asia/Riyadh89'
-      timezone 'Asia/Saigon'
-      timezone 'Asia/Sakhalin'
-      timezone 'Asia/Samarkand'
-      timezone 'Asia/Seoul'
-      timezone 'Asia/Shanghai'
-      timezone 'Asia/Singapore'
-      timezone 'Asia/Taipei'
-      timezone 'Asia/Tashkent'
-      timezone 'Asia/Tbilisi'
-      timezone 'Asia/Tehran'
-      linked_timezone 'Asia/Tel_Aviv'
-      linked_timezone 'Asia/Thimbu'
-      timezone 'Asia/Thimphu'
-      timezone 'Asia/Tokyo'
-      linked_timezone 'Asia/Ujung_Pandang'
-      timezone 'Asia/Ulaanbaatar'
-      linked_timezone 'Asia/Ulan_Bator'
-      timezone 'Asia/Urumqi'
-      timezone 'Asia/Vientiane'
-      timezone 'Asia/Vladivostok'
-      timezone 'Asia/Yakutsk'
-      timezone 'Asia/Yekaterinburg'
-      timezone 'Asia/Yerevan'
-      timezone 'Atlantic/Azores'
-      timezone 'Atlantic/Bermuda'
-      timezone 'Atlantic/Canary'
-      timezone 'Atlantic/Cape_Verde'
-      timezone 'Atlantic/Faeroe'
-      linked_timezone 'Atlantic/Jan_Mayen'
-      timezone 'Atlantic/Madeira'
-      timezone 'Atlantic/Reykjavik'
-      timezone 'Atlantic/South_Georgia'
-      timezone 'Atlantic/St_Helena'
-      timezone 'Atlantic/Stanley'
-      linked_timezone 'Australia/ACT'
-      timezone 'Australia/Adelaide'
-      timezone 'Australia/Brisbane'
-      timezone 'Australia/Broken_Hill'
-      linked_timezone 'Australia/Canberra'
-      timezone 'Australia/Currie'
-      timezone 'Australia/Darwin'
-      timezone 'Australia/Hobart'
-      linked_timezone 'Australia/LHI'
-      timezone 'Australia/Lindeman'
-      timezone 'Australia/Lord_Howe'
-      timezone 'Australia/Melbourne'
-      linked_timezone 'Australia/NSW'
-      linked_timezone 'Australia/North'
-      timezone 'Australia/Perth'
-      linked_timezone 'Australia/Queensland'
-      linked_timezone 'Australia/South'
-      timezone 'Australia/Sydney'
-      linked_timezone 'Australia/Tasmania'
-      linked_timezone 'Australia/Victoria'
-      linked_timezone 'Australia/West'
-      linked_timezone 'Australia/Yancowinna'
-      linked_timezone 'Brazil/Acre'
-      linked_timezone 'Brazil/DeNoronha'
-      linked_timezone 'Brazil/East'
-      linked_timezone 'Brazil/West'
-      timezone 'CET'
-      timezone 'CST6CDT'
-      linked_timezone 'Canada/Atlantic'
-      linked_timezone 'Canada/Central'
-      linked_timezone 'Canada/East-Saskatchewan'
-      linked_timezone 'Canada/Eastern'
-      linked_timezone 'Canada/Mountain'
-      linked_timezone 'Canada/Newfoundland'
-      linked_timezone 'Canada/Pacific'
-      linked_timezone 'Canada/Saskatchewan'
-      linked_timezone 'Canada/Yukon'
-      linked_timezone 'Chile/Continental'
-      linked_timezone 'Chile/EasterIsland'
-      linked_timezone 'Cuba'
-      timezone 'EET'
-      timezone 'EST'
-      timezone 'EST5EDT'
-      linked_timezone 'Egypt'
-      linked_timezone 'Eire'
-      timezone 'Etc/GMT'
-      linked_timezone 'Etc/GMT+0'
-      timezone 'Etc/GMT+1'
-      timezone 'Etc/GMT+10'
-      timezone 'Etc/GMT+11'
-      timezone 'Etc/GMT+12'
-      timezone 'Etc/GMT+2'
-      timezone 'Etc/GMT+3'
-      timezone 'Etc/GMT+4'
-      timezone 'Etc/GMT+5'
-      timezone 'Etc/GMT+6'
-      timezone 'Etc/GMT+7'
-      timezone 'Etc/GMT+8'
-      timezone 'Etc/GMT+9'
-      linked_timezone 'Etc/GMT-0'
-      timezone 'Etc/GMT-1'
-      timezone 'Etc/GMT-10'
-      timezone 'Etc/GMT-11'
-      timezone 'Etc/GMT-12'
-      timezone 'Etc/GMT-13'
-      timezone 'Etc/GMT-14'
-      timezone 'Etc/GMT-2'
-      timezone 'Etc/GMT-3'
-      timezone 'Etc/GMT-4'
-      timezone 'Etc/GMT-5'
-      timezone 'Etc/GMT-6'
-      timezone 'Etc/GMT-7'
-      timezone 'Etc/GMT-8'
-      timezone 'Etc/GMT-9'
-      linked_timezone 'Etc/GMT0'
-      linked_timezone 'Etc/Greenwich'
-      timezone 'Etc/UCT'
-      timezone 'Etc/UTC'
-      linked_timezone 'Etc/Universal'
-      linked_timezone 'Etc/Zulu'
-      timezone 'Europe/Amsterdam'
-      timezone 'Europe/Andorra'
-      timezone 'Europe/Athens'
-      linked_timezone 'Europe/Belfast'
-      timezone 'Europe/Belgrade'
-      timezone 'Europe/Berlin'
-      linked_timezone 'Europe/Bratislava'
-      timezone 'Europe/Brussels'
-      timezone 'Europe/Bucharest'
-      timezone 'Europe/Budapest'
-      timezone 'Europe/Chisinau'
-      timezone 'Europe/Copenhagen'
-      timezone 'Europe/Dublin'
-      timezone 'Europe/Gibraltar'
-      linked_timezone 'Europe/Guernsey'
-      timezone 'Europe/Helsinki'
-      linked_timezone 'Europe/Isle_of_Man'
-      timezone 'Europe/Istanbul'
-      linked_timezone 'Europe/Jersey'
-      timezone 'Europe/Kaliningrad'
-      timezone 'Europe/Kiev'
-      timezone 'Europe/Lisbon'
-      linked_timezone 'Europe/Ljubljana'
-      timezone 'Europe/London'
-      timezone 'Europe/Luxembourg'
-      timezone 'Europe/Madrid'
-      timezone 'Europe/Malta'
-      linked_timezone 'Europe/Mariehamn'
-      timezone 'Europe/Minsk'
-      timezone 'Europe/Monaco'
-      timezone 'Europe/Moscow'
-      linked_timezone 'Europe/Nicosia'
-      timezone 'Europe/Oslo'
-      timezone 'Europe/Paris'
-      linked_timezone 'Europe/Podgorica'
-      timezone 'Europe/Prague'
-      timezone 'Europe/Riga'
-      timezone 'Europe/Rome'
-      timezone 'Europe/Samara'
-      linked_timezone 'Europe/San_Marino'
-      linked_timezone 'Europe/Sarajevo'
-      timezone 'Europe/Simferopol'
-      linked_timezone 'Europe/Skopje'
-      timezone 'Europe/Sofia'
-      timezone 'Europe/Stockholm'
-      timezone 'Europe/Tallinn'
-      timezone 'Europe/Tirane'
-      linked_timezone 'Europe/Tiraspol'
-      timezone 'Europe/Uzhgorod'
-      timezone 'Europe/Vaduz'
-      linked_timezone 'Europe/Vatican'
-      timezone 'Europe/Vienna'
-      timezone 'Europe/Vilnius'
-      timezone 'Europe/Volgograd'
-      timezone 'Europe/Warsaw'
-      linked_timezone 'Europe/Zagreb'
-      timezone 'Europe/Zaporozhye'
-      timezone 'Europe/Zurich'
-      linked_timezone 'GB'
-      linked_timezone 'GB-Eire'
-      linked_timezone 'GMT'
-      linked_timezone 'GMT+0'
-      linked_timezone 'GMT-0'
-      linked_timezone 'GMT0'
-      linked_timezone 'Greenwich'
-      timezone 'HST'
-      linked_timezone 'Hongkong'
-      linked_timezone 'Iceland'
-      timezone 'Indian/Antananarivo'
-      timezone 'Indian/Chagos'
-      timezone 'Indian/Christmas'
-      timezone 'Indian/Cocos'
-      timezone 'Indian/Comoro'
-      timezone 'Indian/Kerguelen'
-      timezone 'Indian/Mahe'
-      timezone 'Indian/Maldives'
-      timezone 'Indian/Mauritius'
-      timezone 'Indian/Mayotte'
-      timezone 'Indian/Reunion'
-      linked_timezone 'Iran'
-      linked_timezone 'Israel'
-      linked_timezone 'Jamaica'
-      linked_timezone 'Japan'
-      linked_timezone 'Kwajalein'
-      linked_timezone 'Libya'
-      timezone 'MET'
-      timezone 'MST'
-      timezone 'MST7MDT'
-      linked_timezone 'Mexico/BajaNorte'
-      linked_timezone 'Mexico/BajaSur'
-      linked_timezone 'Mexico/General'
-      linked_timezone 'Mideast/Riyadh87'
-      linked_timezone 'Mideast/Riyadh88'
-      linked_timezone 'Mideast/Riyadh89'
-      linked_timezone 'NZ'
-      linked_timezone 'NZ-CHAT'
-      linked_timezone 'Navajo'
-      linked_timezone 'PRC'
-      timezone 'PST8PDT'
-      timezone 'Pacific/Apia'
-      timezone 'Pacific/Auckland'
-      timezone 'Pacific/Chatham'
-      timezone 'Pacific/Easter'
-      timezone 'Pacific/Efate'
-      timezone 'Pacific/Enderbury'
-      timezone 'Pacific/Fakaofo'
-      timezone 'Pacific/Fiji'
-      timezone 'Pacific/Funafuti'
-      timezone 'Pacific/Galapagos'
-      timezone 'Pacific/Gambier'
-      timezone 'Pacific/Guadalcanal'
-      timezone 'Pacific/Guam'
-      timezone 'Pacific/Honolulu'
-      timezone 'Pacific/Johnston'
-      timezone 'Pacific/Kiritimati'
-      timezone 'Pacific/Kosrae'
-      timezone 'Pacific/Kwajalein'
-      timezone 'Pacific/Majuro'
-      timezone 'Pacific/Marquesas'
-      timezone 'Pacific/Midway'
-      timezone 'Pacific/Nauru'
-      timezone 'Pacific/Niue'
-      timezone 'Pacific/Norfolk'
-      timezone 'Pacific/Noumea'
-      timezone 'Pacific/Pago_Pago'
-      timezone 'Pacific/Palau'
-      timezone 'Pacific/Pitcairn'
-      timezone 'Pacific/Ponape'
-      timezone 'Pacific/Port_Moresby'
-      timezone 'Pacific/Rarotonga'
-      timezone 'Pacific/Saipan'
-      linked_timezone 'Pacific/Samoa'
-      timezone 'Pacific/Tahiti'
-      timezone 'Pacific/Tarawa'
-      timezone 'Pacific/Tongatapu'
-      timezone 'Pacific/Truk'
-      timezone 'Pacific/Wake'
-      timezone 'Pacific/Wallis'
-      linked_timezone 'Pacific/Yap'
-      linked_timezone 'Poland'
-      linked_timezone 'Portugal'
-      linked_timezone 'ROC'
-      linked_timezone 'ROK'
-      linked_timezone 'Singapore'
-      linked_timezone 'Turkey'
-      linked_timezone 'UCT'
-      linked_timezone 'US/Alaska'
-      linked_timezone 'US/Aleutian'
-      linked_timezone 'US/Arizona'
-      linked_timezone 'US/Central'
-      linked_timezone 'US/East-Indiana'
-      linked_timezone 'US/Eastern'
-      linked_timezone 'US/Hawaii'
-      linked_timezone 'US/Indiana-Starke'
-      linked_timezone 'US/Michigan'
-      linked_timezone 'US/Mountain'
-      linked_timezone 'US/Pacific'
-      linked_timezone 'US/Pacific-New'
-      linked_timezone 'US/Samoa'
-      linked_timezone 'UTC'
-      linked_timezone 'Universal'
-      linked_timezone 'W-SU'
-      timezone 'WET'
-      linked_timezone 'Zulu'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/info_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/info_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/info_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/info_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,52 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/timezone'
-
-module TZInfo
-
-  # A Timezone based on a TimezoneInfo.
-  class InfoTimezone < Timezone #:nodoc:
-    
-    # Constructs a new InfoTimezone with a TimezoneInfo instance.
-    def self.new(info)      
-      tz = super()
-      tz.send(:setup, info)
-      tz
-    end
-    
-    # The identifier of the timezone, e.g. "Europe/Paris".
-    def identifier
-      @info.identifier
-    end
-    
-    protected
-      # The TimezoneInfo for this Timezone.
-      def info
-        @info
-      end
-          
-      def setup(info)
-        @info = info
-      end
-  end    
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,51 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/info_timezone'
-
-module TZInfo
-
-  class LinkedTimezone < InfoTimezone #:nodoc:
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in utc is ignored (it is treated as a UTC time).        
-    #
-    # If no TimezonePeriod could be found, PeriodNotFound is raised.
-    def period_for_utc(utc)
-      @linked_timezone.period_for_utc(utc)
-    end
-    
-    # Returns the set of TimezonePeriod instances that are valid for the given
-    # local time as an array. If you just want a single period, use 
-    # period_for_local instead and specify how abiguities should be resolved.
-    # Raises PeriodNotFound if no periods are found for the given time.
-    def periods_for_local(local)
-      @linked_timezone.periods_for_local(local)
-    end
-    
-    protected
-      def setup(info)
-        super(info)
-        @linked_timezone = Timezone.get(info.link_to_identifier)
-      end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/linked_timezone_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,44 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/timezone_info'
-
-module TZInfo
-  # Represents a linked timezone defined in a data module.
-  class LinkedTimezoneInfo < TimezoneInfo #:nodoc:
-        
-    # The zone that provides the data (that this zone is an alias for).
-    attr_reader :link_to_identifier
-    
-    # Constructs a new TimezoneInfo with an identifier and the identifier
-    # of the zone linked to.
-    def initialize(identifier, link_to_identifier)
-      super(identifier)
-      @link_to_identifier = link_to_identifier      
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@identifier,#@link_to_identifier>"
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/offset_rationals.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/offset_rationals.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/offset_rationals.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/offset_rationals.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,95 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-module TZInfo
-  
-  # Provides a method for getting Rationals for a timezone offset in seconds.
-  # Pre-reduced rationals are returned for all the half-hour intervals between
-  # -14 and +14 hours to avoid having to call gcd at runtime.  
-  module OffsetRationals #:nodoc:
-    @@rational_cache = {
-      -50400 => Rational.new!(-7,12), 
-      -48600 => Rational.new!(-9,16),
-      -46800 => Rational.new!(-13,24),
-      -45000 => Rational.new!(-25,48),
-      -43200 => Rational.new!(-1,2),
-      -41400 => Rational.new!(-23,48),
-      -39600 => Rational.new!(-11,24),
-      -37800 => Rational.new!(-7,16),
-      -36000 => Rational.new!(-5,12),
-      -34200 => Rational.new!(-19,48),
-      -32400 => Rational.new!(-3,8),
-      -30600 => Rational.new!(-17,48),
-      -28800 => Rational.new!(-1,3),
-      -27000 => Rational.new!(-5,16),
-      -25200 => Rational.new!(-7,24),
-      -23400 => Rational.new!(-13,48),
-      -21600 => Rational.new!(-1,4),
-      -19800 => Rational.new!(-11,48),
-      -18000 => Rational.new!(-5,24),
-      -16200 => Rational.new!(-3,16),
-      -14400 => Rational.new!(-1,6),
-      -12600 => Rational.new!(-7,48),
-      -10800 => Rational.new!(-1,8),
-       -9000 => Rational.new!(-5,48),
-       -7200 => Rational.new!(-1,12),
-       -5400 => Rational.new!(-1,16),
-       -3600 => Rational.new!(-1,24),
-       -1800 => Rational.new!(-1,48),
-           0 => Rational.new!(0,1),
-        1800 => Rational.new!(1,48),
-        3600 => Rational.new!(1,24),
-        5400 => Rational.new!(1,16),
-        7200 => Rational.new!(1,12),
-        9000 => Rational.new!(5,48),
-       10800 => Rational.new!(1,8),
-       12600 => Rational.new!(7,48),
-       14400 => Rational.new!(1,6),
-       16200 => Rational.new!(3,16),
-       18000 => Rational.new!(5,24),
-       19800 => Rational.new!(11,48),
-       21600 => Rational.new!(1,4),
-       23400 => Rational.new!(13,48),
-       25200 => Rational.new!(7,24),
-       27000 => Rational.new!(5,16),
-       28800 => Rational.new!(1,3),
-       30600 => Rational.new!(17,48),
-       32400 => Rational.new!(3,8),
-       34200 => Rational.new!(19,48),
-       36000 => Rational.new!(5,12),
-       37800 => Rational.new!(7,16),
-       39600 => Rational.new!(11,24),
-       41400 => Rational.new!(23,48),
-       43200 => Rational.new!(1,2),
-       45000 => Rational.new!(25,48),
-       46800 => Rational.new!(13,24),  
-       48600 => Rational.new!(9,16),            
-       50400 => Rational.new!(7,12)}
-    
-    # Returns a Rational expressing the fraction of a day that offset in 
-    # seconds represents (i.e. equivalent to Rational(offset, 86400)). 
-    def rational_for_offset(offset)
-      @@rational_cache[offset] || Rational(offset, 86400)      
-    end
-    module_function :rational_for_offset
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/time_or_datetime.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/time_or_datetime.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/time_or_datetime.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/time_or_datetime.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,292 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'date'
-require 'time'
-require 'tzinfo/offset_rationals'
-
-module TZInfo
-  # Used by TZInfo internally to represent either a Time, DateTime or integer
-  # timestamp (seconds since 1970-01-01 00:00:00).
-  class TimeOrDateTime #:nodoc:
-    include Comparable
-    
-    # Constructs a new TimeOrDateTime. timeOrDateTime can be a Time, DateTime
-    # or an integer. If using a Time or DateTime, any time zone information is 
-    # ignored.
-    def initialize(timeOrDateTime)
-      @time = nil
-      @datetime = nil
-      @timestamp = nil
-      
-      if timeOrDateTime.is_a?(Time)
-        @time = timeOrDateTime        
-        @time = Time.utc(@time.year, @time.mon, @time.mday, @time.hour, @time.min, @time.sec) unless @time.zone == 'UTC'        
-        @orig = @time
-      elsif timeOrDateTime.is_a?(DateTime)
-        @datetime = timeOrDateTime
-        @datetime = @datetime.new_offset(0) unless @datetime.offset == 0
-        @orig = @datetime
-      else
-        @timestamp = timeOrDateTime.to_i
-        @orig = @timestamp
-      end
-    end
-    
-    # Returns the time as a Time.
-    def to_time
-      unless @time        
-        if @timestamp 
-          @time = Time.at(@timestamp).utc
-        else
-          @time = Time.utc(year, mon, mday, hour, min, sec)
-        end
-      end
-      
-      @time      
-    end
-    
-    # Returns the time as a DateTime.
-    def to_datetime
-      unless @datetime
-        @datetime = DateTime.new(year, mon, mday, hour, min, sec)
-      end
-      
-      @datetime
-    end
-    
-    # Returns the time as an integer timestamp.
-    def to_i
-      unless @timestamp
-        @timestamp = to_time.to_i
-      end
-      
-      @timestamp
-    end
-    
-    # Returns the time as the original time passed to new.
-    def to_orig
-      @orig
-    end
-    
-    # Returns a string representation of the TimeOrDateTime.
-    def to_s
-      if @orig.is_a?(Time)
-        "Time: #{@orig.to_s}"
-      elsif @orig.is_a?(DateTime)
-        "DateTime: #{@orig.to_s}"
-      else
-        "Timestamp: #{@orig.to_s}"
-      end
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #{@orig.inspect}>"
-    end
-    
-    # Returns the year.
-    def year
-      if @time
-        @time.year
-      elsif @datetime
-        @datetime.year
-      else
-        to_time.year
-      end
-    end
-    
-    # Returns the month of the year (1..12).
-    def mon
-      if @time
-        @time.mon
-      elsif @datetime
-        @datetime.mon
-      else
-        to_time.mon
-      end
-    end
-    alias :month :mon
-    
-    # Returns the day of the month (1..n).
-    def mday
-      if @time
-        @time.mday
-      elsif @datetime
-        @datetime.mday
-      else
-        to_time.mday
-      end
-    end
-    alias :day :mday
-    
-    # Returns the hour of the day (0..23).
-    def hour
-      if @time
-        @time.hour
-      elsif @datetime
-        @datetime.hour
-      else
-        to_time.hour
-      end
-    end
-    
-    # Returns the minute of the hour (0..59).
-    def min
-      if @time
-        @time.min
-      elsif @datetime
-        @datetime.min
-      else
-        to_time.min
-      end
-    end
-    
-    # Returns the second of the minute (0..60). (60 for a leap second).
-    def sec
-      if @time
-        @time.sec
-      elsif @datetime
-        @datetime.sec
-      else
-        to_time.sec
-      end
-    end
-    
-    # Compares this TimeOrDateTime with another Time, DateTime, integer
-    # timestamp or TimeOrDateTime. Returns -1, 0 or +1 depending whether the 
-    # receiver is less than, equal to, or greater than timeOrDateTime.
-    #
-    # Milliseconds and smaller units are ignored in the comparison.
-    def <=>(timeOrDateTime)
-      if timeOrDateTime.is_a?(TimeOrDateTime)            
-        orig = timeOrDateTime.to_orig
-        
-        if @orig.is_a?(DateTime) || orig.is_a?(DateTime)
-          # If either is a DateTime, assume it is there for a reason 
-          # (i.e. for range).
-          to_datetime <=> timeOrDateTime.to_datetime
-        elsif orig.is_a?(Time)
-          to_time <=> timeOrDateTime.to_time
-        else
-          to_i <=> timeOrDateTime.to_i
-        end        
-      elsif @orig.is_a?(DateTime) || timeOrDateTime.is_a?(DateTime)
-        # If either is a DateTime, assume it is there for a reason 
-        # (i.e. for range).        
-        to_datetime <=> TimeOrDateTime.wrap(timeOrDateTime).to_datetime
-      elsif timeOrDateTime.is_a?(Time)
-        to_time <=> timeOrDateTime
-      else
-        to_i <=> timeOrDateTime.to_i
-      end
-    end
-    
-    # Adds a number of seconds to the TimeOrDateTime. Returns a new 
-    # TimeOrDateTime, preserving what the original constructed type was.
-    # If the original type is a Time and the resulting calculation goes out of
-    # range for Times, then an exception will be raised by the Time class.
-    def +(seconds)
-      if seconds == 0
-        self
-      else
-        if @orig.is_a?(DateTime)
-          TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
-        else
-          # + defined for Time and integer timestamps
-          TimeOrDateTime.new(@orig + seconds)
-        end
-      end
-    end
-    
-    # Subtracts a number of seconds from the TimeOrDateTime. Returns a new 
-    # TimeOrDateTime, preserving what the original constructed type was.
-    # If the original type is a Time and the resulting calculation goes out of
-    # range for Times, then an exception will be raised by the Time class.
-    def -(seconds)
-      self + (-seconds)
-    end
-   
-    # Similar to the + operator, but for cases where adding would cause a 
-    # timestamp or time to go out of the allowed range, converts to a DateTime
-    # based TimeOrDateTime.
-    def add_with_convert(seconds)
-      if seconds == 0
-        self
-      else
-        if @orig.is_a?(DateTime)
-          TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
-        else
-          # A Time or timestamp.
-          result = to_i + seconds
-          
-          if result < 0 || result > 2147483647
-            result = TimeOrDateTime.new(to_datetime + OffsetRationals.rational_for_offset(seconds))
-          else
-            result = TimeOrDateTime.new(@orig + seconds)
-          end
-        end
-      end
-    end
-    
-    # Returns true if todt represents the same time and was originally 
-    # constructed with the same type (DateTime, Time or timestamp) as this 
-    # TimeOrDateTime.
-    def eql?(todt)
-      todt.respond_to?(:to_orig) && to_orig.eql?(todt.to_orig)      
-    end
-    
-    # Returns a hash of this TimeOrDateTime.
-    def hash
-      @orig.hash
-    end
-    
-    # If no block is given, returns a TimeOrDateTime wrapping the given 
-    # timeOrDateTime. If a block is specified, a TimeOrDateTime is constructed
-    # and passed to the block. The result of the block must be a TimeOrDateTime.
-    # to_orig will be called on the result and the result of to_orig will be
-    # returned.
-    #
-    # timeOrDateTime can be a Time, DateTime, integer timestamp or TimeOrDateTime.
-    # If a TimeOrDateTime is passed in, no new TimeOrDateTime will be constructed,
-    # the passed in value will be used.
-    def self.wrap(timeOrDateTime)      
-      t = timeOrDateTime.is_a?(TimeOrDateTime) ? timeOrDateTime : TimeOrDateTime.new(timeOrDateTime)        
-      
-      if block_given?
-        t = yield t
-        
-        if timeOrDateTime.is_a?(TimeOrDateTime)
-          t          
-        elsif timeOrDateTime.is_a?(Time)
-          t.to_time
-        elsif timeOrDateTime.is_a?(DateTime)
-          t.to_datetime
-        else
-          t.to_i
-        end        
-      else
-        t
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,508 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'date'
-require 'tzinfo/country'
-require 'tzinfo/time_or_datetime'
-require 'tzinfo/timezone_period'
-
-module TZInfo
-  # Indicate a specified time in a local timezone has more than one
-  # possible time in UTC. This happens when switching from daylight savings time 
-  # to normal time where the clocks are rolled back. Thrown by period_for_local
-  # and local_to_utc when using an ambiguous time and not specifying any 
-  # means to resolve the ambiguity.
-  class AmbiguousTime < StandardError
-  end
-  
-  # Thrown to indicate that no TimezonePeriod matching a given time could be found.
-  class PeriodNotFound < StandardError
-  end
-  
-  # Thrown by Timezone#get if the identifier given is not valid.
-  class InvalidTimezoneIdentifier < StandardError
-  end
-  
-  # Thrown if an attempt is made to use a timezone created with Timezone.new(nil).
-  class UnknownTimezone < StandardError
-  end
-  
-  # Timezone is the base class of all timezones. It provides a factory method
-  # get to access timezones by identifier. Once a specific Timezone has been
-  # retrieved, DateTimes, Times and timestamps can be converted between the UTC 
-  # and the local time for the zone. For example:
-  #
-  #   tz = TZInfo::Timezone.get('America/New_York')
-  #   puts tz.utc_to_local(DateTime.new(2005,8,29,15,35,0)).to_s
-  #   puts tz.local_to_utc(Time.utc(2005,8,29,11,35,0)).to_s
-  #   puts tz.utc_to_local(1125315300).to_s
-  #
-  # Each time conversion method returns an object of the same type it was 
-  # passed.
-  #
-  # The timezone information all comes from the tz database
-  # (see http://www.twinsun.com/tz/tz-link.htm)
-  class Timezone
-    include Comparable
-    
-    # Cache of loaded zones by identifier to avoid using require if a zone
-    # has already been loaded.
-    @@loaded_zones = {}
-    
-    # Whether the timezones index has been loaded yet.
-    @@index_loaded = false
-    
-    # Returns a timezone by its identifier (e.g. "Europe/London", 
-    # "America/Chicago" or "UTC").
-    #
-    # Raises InvalidTimezoneIdentifier if the timezone couldn't be found.
-    def self.get(identifier)
-      instance = @@loaded_zones[identifier]
-      unless instance  
-        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-z0-9\+\-_]+(\/[A-z0-9\+\-_]+)*$/
-        identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
-        begin
-          # Use a temporary variable to avoid an rdoc warning
-          file = "tzinfo/definitions/#{identifier}"
-          require file
-          
-          m = Definitions
-          identifier.split(/\//).each {|part|
-            m = m.const_get(part)
-          }
-          
-          info = m.get
-          
-          # Could make Timezone subclasses register an interest in an info
-          # type. Since there are currently only two however, there isn't
-          # much point.
-          if info.kind_of?(DataTimezoneInfo)
-            instance = DataTimezone.new(info)
-          elsif info.kind_of?(LinkedTimezoneInfo)
-            instance = LinkedTimezone.new(info)
-          else
-            raise InvalidTimezoneIdentifier, "No handler for info type #{info.class}"
-          end
-          
-          @@loaded_zones[instance.identifier] = instance         
-        rescue LoadError, NameError => e
-          raise InvalidTimezoneIdentifier, e.message
-        end
-      end
-      
-      instance
-    end
-    
-    # Returns a proxy for the Timezone with the given identifier. The proxy
-    # will cause the real timezone to be loaded when an attempt is made to 
-    # find a period or convert a time. get_proxy will not validate the 
-    # identifier. If an invalid identifier is specified, no exception will be 
-    # raised until the proxy is used. 
-    def self.get_proxy(identifier)
-      TimezoneProxy.new(identifier)
-    end
-    
-    # If identifier is nil calls super(), otherwise calls get. An identfier 
-    # should always be passed in when called externally.
-    def self.new(identifier = nil)
-      if identifier        
-        get(identifier)
-      else
-        super()
-      end
-    end
-    
-    # Returns an array containing all the available Timezones.
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.all
-      get_proxies(all_identifiers)
-    end
-    
-    # Returns an array containing the identifiers of all the available 
-    # Timezones.
-    def self.all_identifiers
-      load_index
-      Indexes::Timezones.timezones
-    end
-    
-    # Returns an array containing all the available Timezones that are based
-    # on data (are not links to other Timezones).
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.all_data_zones
-      get_proxies(all_data_zone_identifiers)
-    end
-    
-    # Returns an array containing the identifiers of all the available 
-    # Timezones that are based on data (are not links to other Timezones)..
-    def self.all_data_zone_identifiers
-      load_index
-      Indexes::Timezones.data_timezones
-    end
-    
-    # Returns an array containing all the available Timezones that are links
-    # to other Timezones.
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.all_linked_zones
-      get_proxies(all_linked_zone_identifiers)      
-    end
-    
-    # Returns an array containing the identifiers of all the available 
-    # Timezones that are links to other Timezones.
-    def self.all_linked_zone_identifiers
-      load_index
-      Indexes::Timezones.linked_timezones
-    end
-    
-    # Returns all the Timezones defined for all Countries. This is not the
-    # complete set of Timezones as some are not country specific (e.g. 
-    # 'Etc/GMT').
-    # 
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.        
-    def self.all_country_zones
-      Country.all_codes.inject([]) {|zones,country|
-        zones += Country.get(country).zones
-      }
-    end
-    
-    # Returns all the zone identifiers defined for all Countries. This is not the
-    # complete set of zone identifiers as some are not country specific (e.g. 
-    # 'Etc/GMT'). You can obtain a Timezone instance for a given identifier
-    # with the get method.
-    def self.all_country_zone_identifiers
-      Country.all_codes.inject([]) {|zones,country|
-        zones += Country.get(country).zone_identifiers
-      }
-    end
-    
-    # Returns all US Timezone instances. A shortcut for 
-    # TZInfo::Country.get('US').zones.
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.us_zones
-      Country.get('US').zones
-    end
-    
-    # Returns all US zone identifiers. A shortcut for 
-    # TZInfo::Country.get('US').zone_identifiers.
-    def self.us_zone_identifiers
-      Country.get('US').zone_identifiers
-    end
-    
-    # The identifier of the timezone, e.g. "Europe/Paris".
-    def identifier
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
-    end
-    
-    # An alias for identifier.
-    def name
-      # Don't use alias, as identifier gets overridden.
-      identifier
-    end
-    
-    # Returns a friendlier version of the identifier.
-    def to_s
-      friendly_identifier
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #{identifier}>"
-    end
-    
-    # Returns a friendlier version of the identifier. Set skip_first_part to 
-    # omit the first part of the identifier (typically a region name) where
-    # there is more than one part.
-    #
-    # For example:
-    #
-    #   Timezone.get('Europe/Paris').friendly_identifier(false)          #=> "Europe - Paris"
-    #   Timezone.get('Europe/Paris').friendly_identifier(true)           #=> "Paris"
-    #   Timezone.get('America/Indiana/Knox').friendly_identifier(false)  #=> "America - Knox, Indiana"
-    #   Timezone.get('America/Indiana/Knox').friendly_identifier(true)   #=> "Knox, Indiana"           
-    def friendly_identifier(skip_first_part = false)
-      parts = identifier.split('/')
-      if parts.empty?
-        # shouldn't happen
-        identifier
-      elsif parts.length == 1        
-        parts[0]
-      else
-        if skip_first_part
-          result = ''
-        else
-          result = parts[0] + ' - '
-        end
-        
-        parts[1, parts.length - 1].reverse_each {|part|
-          part.gsub!(/_/, ' ')
-          
-          if part.index(/[a-z]/)
-            # Missing a space if a lower case followed by an upper case and the
-            # name isn't McXxxx.
-            part.gsub!(/([^M][a-z])([A-Z])/, '\1 \2')
-            part.gsub!(/([M][a-bd-z])([A-Z])/, '\1 \2')
-            
-            # Missing an apostrophe if two consecutive upper case characters.
-            part.gsub!(/([A-Z])([A-Z])/, '\1\'\2')
-          end
-          
-          result << part
-          result << ', '
-        }
-        
-        result.slice!(result.length - 2, 2)
-        result
-      end
-    end
-    
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in utc is ignored (it is treated as a UTC time).        
-    def period_for_utc(utc)            
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'      
-    end
-    
-    # Returns the set of TimezonePeriod instances that are valid for the given
-    # local time as an array. If you just want a single period, use 
-    # period_for_local instead and specify how ambiguities should be resolved.
-    # Returns an empty array if no periods are found for the given time.
-    def periods_for_local(local)
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
-    end
-    
-    # Returns the TimezonePeriod for the given local time. local can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in local is ignored (it is treated as a time in the current 
-    # timezone).
-    #
-    # Warning: There are local times that have no equivalent UTC times (e.g.
-    # in the transition from standard time to daylight savings time). There are
-    # also local times that have more than one UTC equivalent (e.g. in the
-    # transition from daylight savings time to standard time).
-    #
-    # In the first case (no equivalent UTC time), a PeriodNotFound exception
-    # will be raised.
-    #
-    # In the second case (more than one equivalent UTC time), an AmbiguousTime
-    # exception will be raised unless the optional dst parameter or block
-    # handles the ambiguity. 
-    #
-    # If the ambiguity is due to a transition from daylight savings time to
-    # standard time, the dst parameter can be used to select whether the 
-    # daylight savings time or local time is used. For example,
-    #
-    #   Timezone.get('America/New_York').period_for_local(DateTime.new(2004,10,31,1,30,0))
-    #
-    # would raise an AmbiguousTime exception.
-    #
-    # Specifying dst=true would the daylight savings period from April to 
-    # October 2004. Specifying dst=false would return the standard period
-    # from October 2004 to April 2005.
-    #
-    # If the dst parameter does not resolve the ambiguity, and a block is 
-    # specified, it is called. The block must take a single parameter - an
-    # array of the periods that need to be resolved. The block can select and
-    # return a single period or return nil or an empty array
-    # to cause an AmbiguousTime exception to be raised.
-    def period_for_local(local, dst = nil)            
-      results = periods_for_local(local)
-      
-      if results.empty?
-        raise PeriodNotFound
-      elsif results.size < 2
-        results.first
-      else
-        # ambiguous result try to resolve
-        
-        if !dst.nil?
-          matches = results.find_all {|period| period.dst? == dst}
-          results = matches if !matches.empty?            
-        end
-        
-        if results.size < 2
-          results.first
-        else
-          # still ambiguous, try the block
-                    
-          if block_given?
-            results = yield results
-          end
-          
-          if results.is_a?(TimezonePeriod)
-            results
-          elsif results && results.size == 1
-            results.first
-          else          
-            raise AmbiguousTime, "#{local} is an ambiguous local time."
-          end
-        end
-      end      
-    end
-    
-    # Converts a time in UTC to the local timezone. utc can either be
-    # a DateTime, Time or timestamp (Time.to_i). The returned time has the same
-    # type as utc. Any timezone information in utc is ignored (it is treated as 
-    # a UTC time).
-    def utc_to_local(utc)
-      TimeOrDateTime.wrap(utc) {|utc|
-        period_for_utc(utc).to_local(utc)
-      }
-    end
-    
-    # Converts a time in the local timezone to UTC. local can either be
-    # a DateTime, Time or timestamp (Time.to_i). The returned time has the same
-    # type as local. Any timezone information in local is ignored (it is treated
-    # as a local time).
-    #
-    # Warning: There are local times that have no equivalent UTC times (e.g.
-    # in the transition from standard time to daylight savings time). There are
-    # also local times that have more than one UTC equivalent (e.g. in the
-    # transition from daylight savings time to standard time).
-    #
-    # In the first case (no equivalent UTC time), a PeriodNotFound exception
-    # will be raised.
-    #
-    # In the second case (more than one equivalent UTC time), an AmbiguousTime
-    # exception will be raised unless the optional dst parameter or block
-    # handles the ambiguity. 
-    #
-    # If the ambiguity is due to a transition from daylight savings time to
-    # standard time, the dst parameter can be used to select whether the 
-    # daylight savings time or local time is used. For example,
-    #
-    #   Timezone.get('America/New_York').local_to_utc(DateTime.new(2004,10,31,1,30,0))
-    #
-    # would raise an AmbiguousTime exception.
-    #
-    # Specifying dst=true would return 2004-10-31 5:30:00. Specifying dst=false
-    # would return 2004-10-31 6:30:00.
-    #
-    # If the dst parameter does not resolve the ambiguity, and a block is 
-    # specified, it is called. The block must take a single parameter - an
-    # array of the periods that need to be resolved. The block can return a
-    # single period to use to convert the time or return nil or an empty array
-    # to cause an AmbiguousTime exception to be raised.
-    def local_to_utc(local, dst = nil)
-      TimeOrDateTime.wrap(local) {|local|
-        if block_given?
-          period = period_for_local(local, dst) {|periods| yield periods }
-        else
-          period = period_for_local(local, dst)
-        end
-        
-        period.to_utc(local)
-      }
-    end
-    
-    # Returns the current time in the timezone as a Time.
-    def now
-      utc_to_local(Time.now.utc)
-    end
-    
-    # Returns the TimezonePeriod for the current time. 
-    def current_period
-      period_for_utc(Time.now.utc)
-    end
-    
-    # Returns the current Time and TimezonePeriod as an array. The first element
-    # is the time, the second element is the period.
-    def current_period_and_time
-      utc = Time.now.utc
-      period = period_for_utc(utc)
-      [period.to_local(utc), period]
-    end
-    
-    alias :current_time_and_period :current_period_and_time
-
-    # Converts a time in UTC to local time and returns it as a string 
-    # according to the given format. The formatting is identical to 
-    # Time.strftime and DateTime.strftime, except %Z is replaced with the
-    # timezone abbreviation for the specified time (for example, EST or EDT).        
-    def strftime(format, utc = Time.now.utc)      
-      period = period_for_utc(utc)
-      local = period.to_local(utc)      
-      local = Time.at(local).utc unless local.kind_of?(Time) || local.kind_of?(DateTime)
-      abbreviation = period.abbreviation.to_s.gsub(/%/, '%%')
-      
-      format = format.gsub(/(.?)%Z/) do
-        if $1 == '%'
-          # return %%Z so the real strftime treats it as a literal %Z too
-          '%%Z'
-        else
-          "#$1#{abbreviation}"
-        end
-      end
-      
-      local.strftime(format)
-    end
-    
-    # Compares two Timezones based on their identifier. Returns -1 if tz is less
-    # than self, 0 if tz is equal to self and +1 if tz is greater than self.
-    def <=>(tz)
-      identifier <=> tz.identifier
-    end
-    
-    # Returns true if and only if the identifier of tz is equal to the 
-    # identifier of this Timezone.
-    def eql?(tz)
-      self == tz
-    end
-    
-    # Returns a hash of this Timezone.
-    def hash
-      identifier.hash
-    end
-    
-    # Dumps this Timezone for marshalling.
-    def _dump(limit)
-      identifier
-    end
-    
-    # Loads a marshalled Timezone.
-    def self._load(data)
-      Timezone.get(data)
-    end
-    
-    private
-      # Loads in the index of timezones if it hasn't already been loaded.
-      def self.load_index
-        unless @@index_loaded
-          require 'tzinfo/indexes/timezones'
-          @@index_loaded = true
-        end        
-      end
-      
-      # Returns an array of proxies corresponding to the given array of 
-      # identifiers.
-      def self.get_proxies(identifiers)
-        identifiers.collect {|identifier| get_proxy(identifier)}
-      end
-  end        
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_definition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_definition.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_definition.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_definition.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,56 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/data_timezone_info'
-require 'tzinfo/linked_timezone_info'
-
-module TZInfo
-  
-  # TimezoneDefinition is included into Timezone definition modules.
-  # TimezoneDefinition provides the methods for defining timezones.
-  module TimezoneDefinition #:nodoc:
-    # Add class methods to the includee.
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-    end
-    
-    # Class methods for inclusion.
-    module ClassMethods #:nodoc:
-      # Returns and yields a DataTimezoneInfo object to define a timezone.
-      def timezone(identifier)
-        yield @timezone = DataTimezoneInfo.new(identifier)
-      end
-      
-      # Defines a linked timezone.
-      def linked_timezone(identifier, link_to_identifier)
-        @timezone = LinkedTimezoneInfo.new(identifier, link_to_identifier)
-      end
-      
-      # Returns the last TimezoneInfo to be defined with timezone or 
-      # linked_timezone.
-      def get
-        @timezone
-      end
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_index_definition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_index_definition.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_index_definition.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_index_definition.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,72 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-module TZInfo
-  # The timezone index file includes TimezoneIndexDefinition which provides
-  # methods used to define timezones in the index.
-  module TimezoneIndexDefinition #:nodoc:
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-    end
-    
-    module ClassMethods #:nodoc:
-      # Defines a timezone based on data.
-      def timezone(identifier)
-        @timezones = [] unless @timezones
-        @data_timezones = [] unless @data_timezones
-        @timezones << identifier
-        @data_timezones << identifier
-      end
-      
-      # Defines a timezone which is a link to another timezone.
-      def linked_timezone(identifier)
-        @timezones = [] unless @timezones
-        @linked_timezones = [] unless @linked_timezones
-        @timezones << identifier
-        @linked_timezones << identifier
-      end
-      
-      # Returns a frozen array containing the identifiers of all the timezones.
-      # Identifiers appear in the order they were defined in the index.
-      def timezones
-        @timezones = [] unless @timezones
-        @timezones.freeze
-      end
-      
-      # Returns a frozen array containing the identifiers of all data timezones.
-      # Identifiers appear in the order they were defined in the index.
-      def data_timezones
-        @data_timezones = [] unless @data_timezones
-        @data_timezones.freeze
-      end
-      
-      # Returns a frozen array containing the identifiers of all linked
-      # timezones. Identifiers appear in the order they were defined in 
-      # the index.
-      def linked_timezones
-        @linked_timezones = [] unless @linked_timezones
-        @linked_timezones.freeze
-      end      
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,40 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-module TZInfo
-  # Represents a timezone defined in a data module.
-  class TimezoneInfo #:nodoc:
-    
-    # The timezone identifier.
-    attr_reader :identifier
-    
-    # Constructs a new TimezoneInfo with an identifier.
-    def initialize(identifier)
-      @identifier = identifier
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@identifier>"
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_offset_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_offset_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_offset_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_offset_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,94 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-module TZInfo
-  # Represents an offset defined in a Timezone data file.
-  class TimezoneOffsetInfo #:nodoc:
-    # The base offset of the timezone from UTC in seconds.
-    attr_reader :utc_offset
-    
-    # The offset from standard time for the zone in seconds (i.e. non-zero if 
-    # daylight savings is being observed).
-    attr_reader :std_offset
-    
-    # The total offset of this observance from UTC in seconds 
-    # (utc_offset + std_offset).
-    attr_reader :utc_total_offset
-    
-    # The abbreviation that identifies this observance, e.g. "GMT" 
-    # (Greenwich Mean Time) or "BST" (British Summer Time) for "Europe/London". The returned identifier is a 
-    # symbol.
-    attr_reader :abbreviation
-    
-    # Constructs a new TimezoneOffsetInfo. utc_offset and std_offset are
-    # specified in seconds.
-    def initialize(utc_offset, std_offset, abbreviation)
-      @utc_offset = utc_offset
-      @std_offset = std_offset      
-      @abbreviation = abbreviation
-      
-      @utc_total_offset = @utc_offset + @std_offset
-    end
-    
-    # True if std_offset is non-zero.
-    def dst?
-      @std_offset != 0
-    end
-    
-    # Converts a UTC DateTime to local time based on the offset of this period.
-    def to_local(utc)
-      TimeOrDateTime.wrap(utc) {|utc|
-        utc + @utc_total_offset
-      }
-    end
-    
-    # Converts a local DateTime to UTC based on the offset of this period.
-    def to_utc(local)
-      TimeOrDateTime.wrap(local) {|local|
-        local - @utc_total_offset
-      }
-    end
-    
-    # Returns true if and only if toi has the same utc_offset, std_offset
-    # and abbreviation as this TimezoneOffsetInfo.
-    def ==(toi)
-      toi.respond_to?(:utc_offset) && toi.respond_to?(:std_offset) && toi.respond_to?(:abbreviation) &&
-        utc_offset == toi.utc_offset && std_offset == toi.std_offset && abbreviation == toi.abbreviation
-    end
-    
-    # Returns true if and only if toi has the same utc_offset, std_offset
-    # and abbreviation as this TimezoneOffsetInfo.
-    def eql?(toi)
-      self == toi
-    end
-    
-    # Returns a hash of this TimezoneOffsetInfo.
-    def hash
-      utc_offset.hash ^ std_offset.hash ^ abbreviation.hash
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@utc_offset,#@std_offset,#@abbreviation>"
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_period.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_period.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_period.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_period.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,200 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-# TODO: Turn this into the real TimezonePeriod.
-
-require 'tzinfo/offset_rationals'
-require 'tzinfo/time_or_datetime'
-
-module TZInfo
-  # A period of time in a timezone where the same offset from UTC applies.
-  #
-  # All the methods that take times accept instances of Time, DateTime or
-  # integer timestamps.
-  class TimezonePeriod
-    # The TimezoneTransitionInfo that defines the start of this TimezonePeriod 
-    # (may be nil if unbounded).
-    attr_reader :start_transition
-    
-    # The TimezoneTransitionInfo that defines the end of this TimezonePeriod
-    # (may be nil if unbounded).
-    attr_reader :end_transition
-    
-    # The TimezoneOffsetInfo for this period.
-    attr_reader :offset    
-    
-    # Initializes a new TimezonePeriod.
-    def initialize(start_transition, end_transition, offset = nil)
-      @start_transition = start_transition
-      @end_transition = end_transition
-      
-      if offset
-        raise ArgumentError, 'Offset specified with transitions' if @start_transition || @end_transition
-        @offset = offset
-      else
-        if @start_transition 
-          @offset = @start_transition.offset
-        elsif @end_transition
-          @offset = @end_transition.previous_offset
-        else
-          raise ArgumentError, 'No offset specified and no transitions to determine it from'
-        end
-      end
-      
-      @utc_total_offset_rational = nil      
-    end
-            
-    # Base offset of the timezone from UTC (seconds).
-    def utc_offset
-      @offset.utc_offset
-    end
-    
-    # Offset from the local time where daylight savings is in effect (seconds).
-    # E.g.: utc_offset could be -5 hours. Normally, std_offset would be 0. 
-    # During daylight savings, std_offset would typically become +1 hours.
-    def std_offset
-      @offset.std_offset
-    end
-    
-    # The identifier of this period, e.g. "GMT" (Greenwich Mean Time) or "BST"
-    # (British Summer Time) for "Europe/London". The returned identifier is a 
-    # symbol.
-    def abbreviation
-      @offset.abbreviation
-    end
-    alias :zone_identifier :abbreviation
-    
-    # Total offset from UTC (seconds). Equal to utc_offset + std_offset.
-    def utc_total_offset
-      @offset.utc_total_offset
-    end
-    
-    # Total offset from UTC (days). Result is a Rational.
-    def utc_total_offset_rational
-      unless @utc_total_offset_rational
-        @utc_total_offset_rational = OffsetRationals.rational_for_offset(utc_total_offset) 
-      end
-      @utc_total_offset_rational
-    end
-    
-    # The start time of the period in UTC as a DateTime. May be nil if unbounded.
-    def utc_start
-      @start_transition ? @start_transition.at.to_datetime : nil
-    end
-    
-    # The end time of the period in UTC as a DateTime. May be nil if unbounded.
-    def utc_end
-      @end_transition ? @end_transition.at.to_datetime : nil
-    end
-    
-    # The start time of the period in local time as a DateTime. May be nil if 
-    # unbounded.
-    def local_start
-      @start_transition ? @start_transition.local_start.to_datetime : nil
-    end
-    
-    # The end time of the period in local time as a DateTime. May be nil if 
-    # unbounded.
-    def local_end
-      @end_transition ? @end_transition.local_end.to_datetime : nil
-    end
-    
-    # true if daylight savings is in effect for this period; otherwise false.
-    def dst?
-      @offset.dst?
-    end
-    
-    # true if this period is valid for the given UTC DateTime; otherwise false.
-    def valid_for_utc?(utc)
-      utc_after_start?(utc) && utc_before_end?(utc) 
-    end
-    
-    # true if the given UTC DateTime is after the start of the period 
-    # (inclusive); otherwise false.
-    def utc_after_start?(utc)
-      !@start_transition || @start_transition.at <= utc
-    end
-    
-    # true if the given UTC DateTime is before the end of the period 
-    # (exclusive); otherwise false.
-    def utc_before_end?(utc)
-      !@end_transition || @end_transition.at > utc
-    end
-    
-    # true if this period is valid for the given local DateTime; otherwise false.
-    def valid_for_local?(local)      
-      local_after_start?(local) && local_before_end?(local) 
-    end
-    
-    # true if the given local DateTime is after the start of the period 
-    # (inclusive); otherwise false.
-    def local_after_start?(local)
-      !@start_transition || @start_transition.local_start <= local
-    end
-    
-    # true if the given local DateTime is before the end of the period 
-    # (exclusive); otherwise false.
-    def local_before_end?(local)
-      !@end_transition || @end_transition.local_end > local
-    end
-    
-    # Converts a UTC DateTime to local time based on the offset of this period.
-    def to_local(utc)
-      @offset.to_local(utc)
-    end
-    
-    # Converts a local DateTime to UTC based on the offset of this period.
-    def to_utc(local)
-      @offset.to_utc(local)
-    end
-    
-    # Returns true if this TimezonePeriod is equal to p. This compares the 
-    # start_transition, end_transition and offset using ==.
-    def ==(p)
-      p.respond_to?(:start_transition) && p.respond_to?(:end_transition) &&
-        p.respond_to?(:offset) && start_transition == p.start_transition &&
-        end_transition == p.end_transition && offset == p.offset
-    end
-    
-    # Returns true if this TimezonePeriods is equal to p. This compares the
-    # start_transition, end_transition and offset using eql?
-    def eql?(p)
-      p.respond_to?(:start_transition) && p.respond_to?(:end_transition) &&
-        p.respond_to?(:offset) && start_transition.eql?(p.start_transition) &&
-        end_transition.eql?(p.end_transition) && offset.eql?(p.offset)
-    end
-    
-    # Returns a hash of this TimezonePeriod.
-    def hash
-      result = @start_transition.hash ^ @end_transition.hash
-      result ^= @offset.hash unless @start_transition || @end_transition
-      result       
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      result = "#<#{self.class}: #{@start_transition.inspect},#{@end_transition.inspect}"
-      result << ",#{@offset.inspect}>" unless @start_transition || @end_transition
-      result + '>'
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_proxy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_proxy.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_proxy.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_proxy.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,85 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/timezone'
-
-module TZInfo
-
-  # A proxy class representing a timezone with a given identifier. TimezoneProxy
-  # inherits from Timezone and can be treated like any Timezone loaded with
-  # Timezone.get.
-  #
-  # The first time an attempt is made to access the data for the timezone, the 
-  # real Timezone is loaded. If the proxy's identifier was not valid, then an 
-  # exception will be raised at this point.  
-  class TimezoneProxy < Timezone
-    # Construct a new TimezoneProxy for the given identifier. The identifier
-    # is not checked when constructing the proxy. It will be validated on the
-    # when the real Timezone is loaded.
-    def self.new(identifier)
-      # Need to override new to undo the behaviour introduced in Timezone#new.
-      tzp = super()
-      tzp.send(:setup, identifier)
-      tzp
-    end
-        
-    # The identifier of the timezone, e.g. "Europe/Paris".
-    def identifier
-      @real_timezone ? @real_timezone.identifier : @identifier
-    end
-    
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in utc is ignored (it is treated as a UTC time).        
-    def period_for_utc(utc)            
-      real_timezone.period_for_utc(utc)            
-    end
-    
-    # Returns the set of TimezonePeriod instances that are valid for the given
-    # local time as an array. If you just want a single period, use 
-    # period_for_local instead and specify how abiguities should be resolved.
-    # Returns an empty array if no periods are found for the given time.
-    def periods_for_local(local)
-      real_timezone.periods_for_local(local)
-    end
-    
-    # Dumps this TimezoneProxy for marshalling.
-    def _dump(limit)
-      identifier
-    end
-    
-    # Loads a marshalled TimezoneProxy.
-    def self._load(data)
-      TimezoneProxy.new(data)
-    end
-    
-    private
-      def setup(identifier)
-        @identifier = identifier
-        @real_timezone = nil
-      end  
-    
-      def real_timezone
-        @real_timezone ||= Timezone.get(@identifier)
-      end     
-  end 
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_transition_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_transition_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_transition_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/timezone_transition_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,127 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'date'
-require 'tzinfo/time_or_datetime'
-
-module TZInfo
-  # Represents an offset defined in a Timezone data file.
-  class TimezoneTransitionInfo #:nodoc:
-    # The offset this transition changes to (a TimezoneOffsetInfo instance).
-    attr_reader :offset
-    
-    # The offset this transition changes from (a TimezoneOffsetInfo instance).
-    attr_reader :previous_offset
-    
-    # The numerator of the DateTime if the transition time is defined as a 
-    # DateTime, otherwise the transition time as a timestamp.
-    attr_reader :numerator_or_time
-    protected :numerator_or_time
-    
-    # Either the denominotor of the DateTime if the transition time is defined
-    # as a DateTime, otherwise nil. 
-    attr_reader :denominator
-    protected :denominator
-    
-    # Creates a new TimezoneTransitionInfo with the given offset, 
-    # previous_offset (both TimezoneOffsetInfo instances) and UTC time. 
-    # if denominator is nil, numerator_or_time is treated as a number of 
-    # seconds since the epoch. If denominator is specified numerator_or_time
-    # and denominator are used to create a DateTime as follows:
-    # 
-    #  DateTime.new0(Rational.new!(numerator_or_time, denominator), 0, Date::ITALY)
-    #
-    # For performance reasons, the numerator and denominator must be specified
-    # in their lowest form.
-    def initialize(offset, previous_offset, numerator_or_time, denominator = nil)
-      @offset = offset
-      @previous_offset = previous_offset
-      @numerator_or_time = numerator_or_time
-      @denominator = denominator
-      
-      @at = nil
-      @local_end = nil
-      @local_start = nil
-    end
-    
-    # A TimeOrDateTime instance representing the UTC time when this transition
-    # occurs.
-    def at
-      unless @at
-        unless @denominator 
-          @at = TimeOrDateTime.new(@numerator_or_time)
-        else
-          @at = TimeOrDateTime.new(DateTime.new0(Rational.new!(@numerator_or_time, @denominator), 0, Date::ITALY))
-        end
-      end
-      
-      @at
-    end
-    
-    # A TimeOrDateTime instance representing the local time when this transition
-    # causes the previous observance to end (calculated from at using 
-    # previous_offset).
-    def local_end
-      @local_end = at.add_with_convert(@previous_offset.utc_total_offset) unless @local_end      
-      @local_end
-    end
-    
-    # A TimeOrDateTime instance representing the local time when this transition
-    # causes the next observance to start (calculated from at using offset).
-    def local_start
-      @local_start = at.add_with_convert(@offset.utc_total_offset) unless @local_start
-      @local_start
-    end
-    
-    # Returns true if this TimezoneTransitionInfo is equal to the given
-    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
-    # considered to be equal by == if offset, previous_offset and at are all 
-    # equal.
-    def ==(tti)
-      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) && tti.respond_to?(:at) &&
-        offset == tti.offset && previous_offset == tti.previous_offset && at == tti.at
-    end
-    
-    # Returns true if this TimezoneTransitionInfo is equal to the given
-    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
-    # considered to be equal by eql? if offset, previous_offset, 
-    # numerator_or_time and denominator are all equal. This is stronger than ==,
-    # which just requires the at times to be equal regardless of how they were
-    # originally specified.
-    def eql?(tti)
-      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) &&
-        tti.respond_to?(:numerator_or_time) && tti.respond_to?(:denominator) &&
-        offset == tti.offset && previous_offset == tti.previous_offset &&
-        numerator_or_time == tti.numerator_or_time && denominator == tti.denominator        
-    end
-    
-    # Returns a hash of this TimezoneTransitionInfo instance.
-    def hash
-      @offset.hash ^ @previous_offset.hash ^ @numerator_or_time.hash ^ @denominator.hash
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #{at.inspect},#{@offset.inspect}>"      
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/tzdataparser.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/tzdataparser.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo/tzdataparser.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo/tzdataparser.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,1175 +0,0 @@
-#--
-# Copyright (c) 2005 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'date'
-require 'fileutils'
-
-module TZInfo
-  
-  # Parses tzdata from ftp://elsie.nci.nih.gov/pub/ and transforms it into 
-  # a set of Ruby modules that can be used through Timezone and Country.
-  # 
-  # Normally, this class wouldn't be used. It is only run to update the 
-  # timezone data and index modules.
-  class TZDataParser    
-    # Minimum year that will be considered.
-    MIN_YEAR = 1800
-    
-    # Maximum year that will be considered.
-    MAX_YEAR = 2050
-    
-    # Whether to generate zone definitions (set to false to stop zones being
-    # generated).    
-    attr_accessor :generate_zones
-    
-    # Whether to generate country definitions (set to false to stop countries
-    # being generated).
-    attr_accessor :generate_countries
-    
-    # Limit the set of zones to generate (set to an array containing zone
-    # identifiers).
-    attr_accessor :only_zones
-        
-    # Zones to exclude from generation when not using only_zones (set to an
-    # array containing zone identifiers).
-    attr_accessor :exclude_zones            
-    
-    # Initializes a new TZDataParser. input_dir must contain the extracted
-    # tzdata tarball. output_dir is the location to output the modules
-    # (in definitions and indexes directories).
-    def initialize(input_dir, output_dir)
-      super()
-      @input_dir = input_dir
-      @output_dir = output_dir      
-      @rule_sets = {}
-      @zones = {}
-      @countries = {}
-      @no_rules = TZDataNoRules.new
-      @generate_zones = true
-      @generate_countries = true
-      @only_zones = []      
-      @exclude_zones = []      
-    end
-    
-    # Reads the tzdata source and generates the classes. Takes a long time
-    # to run. Currently outputs debugging information to standard out.
-    def execute
-      Dir.foreach(@input_dir) {|file|
-        load_rules(file) if file =~ /^[^\.]+$/        
-      }  
-      
-      Dir.foreach(@input_dir) {|file|
-        load_zones(file) if file =~ /^[^\.]+$/        
-      }
-      
-      Dir.foreach(@input_dir) {|file|
-        load_links(file) if file =~ /^[^\.]+$/        
-      }
-      
-      load_countries
-      
-      if @generate_zones
-        modules = []
-        
-        if @only_zones.nil? || @only_zones.empty?
-          @zones.each_value {|zone|
-            zone.write_module(@output_dir) unless @exclude_zones.include?(zone.name)
-          }
-        else
-          @only_zones.each {|id|
-            zone = @zones[id]
-            zone.write_module(@output_dir)            
-          }          
-        end
-        
-        write_timezones_index
-      end
-      
-      if @generate_countries        
-        write_countries_index
-      end
-    end
-    
-    # Parses a month specified in the tz data and converts it to a number
-    # between 1 and 12 representing January to December.
-    def self.parse_month(month)
-      lower = month.downcase
-      if lower =~ /^jan/
-        @month = 1
-      elsif lower =~ /^feb/
-        @month = 2
-      elsif lower =~ /^mar/
-        @month = 3
-      elsif lower =~ /^apr/
-        @month = 4
-      elsif lower =~ /^may/
-        @month = 5
-      elsif lower =~ /^jun/
-        @month = 6
-      elsif lower =~ /^jul/
-        @month = 7
-      elsif lower =~ /^aug/
-        @month = 8
-      elsif lower =~ /^sep/
-        @month = 9
-      elsif lower =~ /^oct/
-        @month = 10
-      elsif lower =~ /^nov/
-        @month = 11
-      elsif lower =~ /^dec/
-        @month = 12
-      else
-        raise "Invalid month: #{month}"
-      end
-    end
-    
-    # Parses an offset string [-]h:m:s (minutes and seconds are optional). Returns
-    # the offset in seconds.
-    def self.parse_offset(offset)
-      raise "Invalid time: #{offset}" if offset !~ /^(-)?([0-9]+)(:([0-9]+)(:([0-9]+))?)?$/
-      
-      negative = !$1.nil?      
-      hour = $2.to_i
-      minute = $4.nil? ? 0 : $4.to_i
-      second = $6.nil? ? 0 : $6.to_i
-      
-      seconds = hour
-      seconds = seconds * 60
-      seconds = seconds + minute
-      seconds = seconds * 60
-      seconds = seconds + second
-      seconds = -seconds if negative
-      seconds
-    end
-    
-    # Encloses the string in single quotes and escapes any single quotes in
-    # the content.
-    def self.quote_str(str)
-      "'#{str.gsub('\'', '\\\\\'')}'"
-    end
-        
-    private
-      # Loads all the Rule definitions from the tz data and stores them in
-      # @rule_sets.
-      def load_rules(file)
-        puts 'load_rules: ' + file
-        
-        IO.foreach(@input_dir + File::SEPARATOR + file) {|line|
-          line = line.gsub(/#.*$/, '')
-          line = line.gsub(/\s+$/, '')
-        
-          if line =~ /^Rule\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)/
-            
-            name = $1    
-            
-            if @rule_sets[name].nil? 
-              @rule_sets[name] = TZDataRuleSet.new(name) 
-            end
-            
-            @rule_sets[name].add_rule(TZDataRule.new($2, $3, $4, $5, $6, $7, $8, $9))
-          end          
-        }                
-      end
-      
-      # Gets a rules object for the given reference. Might be a named rule set,
-      # a fixed offset or an empty ruleset.
-      def get_rules(ref)
-        if ref == '-'
-          @no_rules
-        elsif ref =~ /^[0-9]+:[0-9]+$/
-          TZDataFixedOffsetRules.new(TZDataParser.parse_offset(ref))
-        else
-          rule_set = @rule_sets[ref]
-          raise "Ruleset not found: #{ref}" if rule_set.nil?    
-          rule_set
-        end  
-      end
-      
-      # Loads in the Zone definitions from the tz data and stores them in @zones.
-      def load_zones(file)
-        puts 'load_zones: ' + file
-        
-        in_zone = nil
-        
-        IO.foreach(@input_dir + File::SEPARATOR + file) {|line|
-          line = line.gsub(/#.*$/, '')
-          line = line.gsub(/\s+$/, '')
-        
-          if in_zone
-            if line =~ /^\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)(\s+([0-9]+(\s+.*)?))?$/              
-              
-              in_zone.add_observance(TZDataObservance.new($1, get_rules($2), $3, $5))
-              
-              in_zone = nil if $4.nil? 
-            end
-          else
-            if line =~ /^Zone\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)(\s+([0-9]+(\s+.*)?))?$/              
-              name = $1
-              
-              if @zones[name].nil? 
-                @zones[name] = TZDataZone.new(name)
-              end                            
-              
-              @zones[name].add_observance(TZDataObservance.new($2, get_rules($3), $4, $6))
-              
-              in_zone = @zones[name] if !$5.nil?
-            end
-          end
-        }
-      end
-      
-      # Loads in the links and stores them in @zones.
-      def load_links(file)
-        puts 'load_links: ' + file
-        
-        IO.foreach(@input_dir + File::SEPARATOR + file) {|line|
-          line = line.gsub(/#.*$/, '')
-          line = line.gsub(/\s+$/, '')
-        
-          if line =~ /^Link\s+([^\s]+)\s+([^\s]+)/            
-            name = $2           
-            link_to = @zones[$1]
-            raise "Link to zone not found (#{name}->#{link_to})" if link_to.nil?
-            raise "Zone already defined: #{name}" if !@zones[name].nil?
-            @zones[name] = TZDataLink.new(name, link_to)
-          end          
-        }
-      end
-      
-      # Loads countries from iso3166.tab and zone.tab and stores the result in
-      # @countries.
-      def load_countries
-        puts 'load_countries'
-        
-        IO.foreach(@input_dir + File::SEPARATOR + 'iso3166.tab') {|line|          
-          if line =~ /^([A-Z]{2})\t(.*)$/
-            code = $1
-            name = $2
-            @countries[code] = TZDataCountry.new(code, name)
-          end
-        }
-        
-        IO.foreach(@input_dir + File::SEPARATOR + 'zone.tab') {|line|          
-          line.chomp!          
-
-          if line =~ /^([A-Z]{2})\t([^\t]+)\t([^\t]+)(\t(.*))?$/
-            code = $1
-            location_str = $2
-            zone_name = $3
-            description = $5
-
-            country = @countries[code]
-            raise "Country not found: #{code}" if country.nil?
-            
-            location = TZDataLocation.new(location_str)
-            
-            zone = @zones[zone_name]
-            raise "Zone not found: #{zone_name}" if zone.nil?                        
-            
-            description = nil if description == ''
-            
-            country.add_zone(TZDataCountryTimezone.new(zone, description, location))
-          end
-        }
-      end
-      
-      # Writes a country index file.
-      def write_countries_index
-        dir = @output_dir + File::SEPARATOR + 'indexes'      
-        FileUtils.mkdir_p(dir)
-        
-        File.open(dir + File::SEPARATOR + 'countries.rb', 'w') {|file|
-          file.binmode        
-               
-          file.puts('require \'tzinfo/country_index_definition\'')
-          file.puts('')
-          file.puts('module TZInfo')
-          file.puts('  module Indexes')
-          file.puts('    module Countries')
-          file.puts('      include CountryIndexDefinition')
-          file.puts('')
-          
-          countries = @countries.values.sort {|c1,c2| c1.code <=> c2.code}  
-          countries.each {|country| country.write_index_record(file)}
-                    
-          file.puts('    end') # end module Countries                    
-          file.puts('  end') # end module Indexes
-          file.puts('end') # end module TZInfo
-        }                      
-      end
-      
-      # Writes a timezone index file.
-      def write_timezones_index
-        dir = File.join(@output_dir, 'indexes')
-        FileUtils.mkdir_p(dir)
-        
-        File.open(File.join(dir, 'timezones.rb'), 'w') do |file|
-          file.binmode
-          
-          file.puts('require \'tzinfo/timezone_index_definition\'')
-          file.puts('')
-          file.puts('module TZInfo')
-          file.puts('  module Indexes')
-          file.puts('    module Timezones')
-          file.puts('      include TimezoneIndexDefinition')
-          file.puts('')
-          
-          zones = @zones.values.sort {|t1,t2| t1.name <=> t2.name}
-          zones.each {|zone| zone.write_index_record(file)}
-          
-          file.puts('    end') # end module Timezones
-          file.puts('  end') # end module Indexes
-          file.puts('end') # end module TZInfo
-        end
-        
-      end
-  end
-  
-  # Base class for all rule sets.
-  class TZDataRules #:nodoc:
-    # Name of the rule set, e.g. EU.
-    attr_reader :name
-    
-    def initialize(name)
-      @name = name
-    end
-    
-    def count
-      0
-    end
-  end
-  
-  # Empty rule set with a fixed daylight savings (std) offset.
-  class TZDataFixedOffsetRules < TZDataRules #:nodoc:
-    attr_reader :offset
-    
-    def initialize(offset)
-      super(offset.to_s)
-      @offset = offset
-    end        
-  end
-  
-  # An empty set of rules.
-  class TZDataNoRules < TZDataRules #:nodoc:
-    def initialize
-      super('-')
-    end
-  end
-  
-  # A rule set (as defined by Rule name in the tz data).
-  class TZDataRuleSet < TZDataRules #:nodoc:       
-    attr_reader :rules
-    
-    def initialize(name)
-      super
-      @rules = []
-    end
-    
-    # Adds a new rule to the set.
-    def add_rule(rule)
-      @rules << rule
-    end
-    
-    def count
-      @rules.length
-    end
-    
-    def each
-      @rules.each {|rule| yield rule}
-    end
-  end    
-  
-  # A rule in a RuleSet (a single Rule line in the tz data).
-  class TZDataRule #:nodoc:
-    attr_reader :from
-    attr_reader :to
-    attr_reader :type
-    attr_reader :in_month
-    attr_reader :on_day
-    attr_reader :at_time
-    attr_reader :save
-    attr_reader :letter
-    
-    def initialize(from, to, type, in_month, on_day, at_time, save, letter)
-      @from = parse_from(from)
-      @to = parse_to(to)
-      
-      # replace a to of :only with the from year
-      raise 'to cannot be only if from is minimum' if @to == :only && @from == :min
-      @to = @from if @to == :only      
-      
-      @type = parse_type(type)
-      @in_month = TZDataParser.parse_month(in_month)
-      @on_day = TZDataDayOfMonth.new(on_day)
-      @at_time = TZDataTime.new(at_time)
-      @save = TZDataParser.parse_offset(save)
-      @letter = parse_letter(letter)
-    end
-    
-    def activate(year)
-      # The following test ignores yearistype at present (currently unused in
-      # the data. parse_type currently excepts on encountering a year type.
-      if (@from == :min || @from <= year) && (@to == :max || @to >= year)                        
-        TZDataActivatedRule.new(self, year)
-      else
-        nil
-      end
-    end
-    
-    def at_utc_time(year, utc_offset, std_offset)
-      @at_time.to_utc(utc_offset, std_offset,
-        year, @in_month, @on_day.to_absolute(year, @in_month))
-    end
-    
-    private
-      def parse_from(from)
-        lower = from.downcase
-        if lower =~ /^min/
-          :min
-        elsif lower =~ /^[0-9]+$/
-          lower.to_i
-        else
-          raise "Invalid from: #{from}"
-        end
-      end
-      
-      def parse_to(to)
-        lower = to.downcase
-        if lower =~ /^max/
-          :max
-        elsif lower =~ /^o/
-          :only
-        elsif lower =~ /^[0-9]+$/
-          lower.to_i
-        else
-          raise "Invalid to: #{to}"
-        end
-      end
-      
-      def parse_type(type)
-        raise "Unsupported rule type: #{type}" if type != '-'
-        nil
-      end        
-      
-      def parse_letter(letter)
-        if letter == '-'
-          nil
-        else
-          letter
-        end
-      end
-  end
-  
-  # Base class for Zones and Links.
-  class TZDataDefinition #:nodoc:
-    attr_reader :name
-    attr_reader :name_elements
-    attr_reader :path_elements
-    
-    def initialize(name)
-      @name = name
-      
-      # + and - aren't allowed in class names
-      @name_elements = name.gsub(/-/, '__m__').gsub(/\+/, '__p__').split(/\//)
-      @path_elements = @name_elements.clone
-      @path_elements.pop
-    end        
-    
-    # Creates necessary directories, the file, writes the class header and footer
-    # and yields to a block to write the content.    
-    def create_file(output_dir)        
-      dir = output_dir + File::SEPARATOR + 'definitions' + File::SEPARATOR + @path_elements.join(File::SEPARATOR)      
-      FileUtils.mkdir_p(dir)
-      
-      File.open(output_dir + File::SEPARATOR + 'definitions' + File::SEPARATOR + @name_elements.join(File::SEPARATOR) + '.rb', 'w') {|file|
-        file.binmode
-        
-        def file.indent(by)
-          if @tz_indent
-            @tz_indent += by
-          else
-            @tz_indent = by
-          end
-        end
-        
-        def file.puts(s)
-          super("#{' ' * (@tz_indent || 0)}#{s}")
-        end
-        
-        file.puts('require \'tzinfo/timezone_definition\'')
-        file.puts('')        
-        
-        file.puts('module TZInfo')
-        file.indent(2)
-        file.puts('module Definitions')
-        file.indent(2)                
-        
-        @name_elements.each do |part| 
-          file.puts("module #{part}")
-          file.indent(2)
-        end
-        
-        file.puts('include TimezoneDefinition')
-        file.puts('')
-        
-        yield file
-                        
-        @name_elements.each do
-          file.indent(-2)  
-          file.puts('end')          
-        end
-        file.indent(-2)
-        file.puts('end') # end module Definitions
-        file.indent(-2)        
-        file.puts('end') # end module TZInfo
-      }
-    end    
-  end
-  
-  # A tz data Link.
-  class TZDataLink < TZDataDefinition #:nodoc:
-    attr_reader :link_to
-    
-    def initialize(name, link_to)
-      super(name)
-      @link_to = link_to
-    end
-                
-    # Writes a module for this link.
-    def write_module(output_dir)
-      puts "writing link #{name}"
-            
-      create_file(output_dir) {|file|
-        file.puts("linked_timezone #{TZDataParser.quote_str(@name)}, #{TZDataParser.quote_str(@link_to.name)}")        
-      }
-    end
-    
-    # Writes an index record for this link.    
-    def write_index_record(file)
-      file.puts("      linked_timezone #{TZDataParser.quote_str(@name)}")
-    end
-  end
-  
-  # A tz data Zone. Each line from the tz data is loaded as a TZDataObservance.
-  class TZDataZone < TZDataDefinition #:nodoc:    
-    attr_reader :observances
-    
-    def initialize(name)
-      super
-      @observances = []
-    end
-    
-    def add_observance(observance)      
-      @observances << observance
-    end                
-    
-    # Writes the module for the zone. Iterates all the periods and asks them
-    # to write all periods in the timezone.
-    def write_module(output_dir) 
-      puts "writing zone #{name}"
-      
-      create_file(output_dir) {|file|        
-        
-        file.puts("timezone #{TZDataParser.quote_str(@name)} do |tz|")
-        file.indent(2)
-              
-        transitions = find_transitions
-        transitions.output_module(file)
-        
-        file.indent(-2)
-        file.puts('end')
-      }      
-    end
-    
-    # Writes an index record for this zone.    
-    def write_index_record(file)
-      file.puts("      timezone #{TZDataParser.quote_str(@name)}")
-    end
-    
-    private
-      def find_transitions
-        transitions = TZDataTransitions.new
-        
-        # algorithm from zic.c outzone
-        
-        start_time = nil
-        until_time = nil
-        
-        
-        @observances.each_with_index {|observance, i|
-          std_offset = 0
-          use_start = i > 0
-          use_until = i < @observances.length - 1
-          utc_offset = observance.utc_offset
-          start_zone_id = nil
-          start_utc_offset = observance.utc_offset
-          start_std_offset = 0
-          
-          if observance.rule_set.count == 0
-            std_offset = observance.std_offset
-            start_zone_id = observance.format.expand(std_offset, nil)
-            
-            if use_start
-              transitions << TZDataTransition.new(start_time, utc_offset, std_offset, start_zone_id)
-              use_start = false
-            else
-              # zic algorithm only outputs this if std_offset is non-zero
-              # to get the initial LMT range, we output this regardless
-              transitions << TZDataTransition.new(nil, utc_offset, std_offset, start_zone_id)
-            end  
-          else
-            (TZDataParser::MIN_YEAR..TZDataParser::MAX_YEAR).each {|year|
-              if use_until && year > observance.valid_until.year
-                break
-              end
-              
-              activated_rules = []
-              
-              observance.rule_set.each {|rule|
-                activated_rule = rule.activate(year)
-                activated_rules << activated_rule unless activated_rule.nil?
-              }
-              
-              while true 
-                # turn until_time into UTC using the current utc_offset and std_offset
-                until_time = observance.valid_until.to_utc(utc_offset, std_offset) if use_until
-                
-                earliest = nil
-
-                activated_rules.each {|activated_rule| 
-                  # recalculate the time using the current std_offset
-                  activated_rule.calculate_time(utc_offset, std_offset) 
-                  earliest = activated_rule if earliest.nil? || activated_rule.at < earliest.at                   
-                }
-                
-                break if earliest.nil?                
-                activated_rules.delete(earliest)                               
-                break if use_until && earliest.at >= until_time                
-                std_offset = earliest.rule.save                   
-                use_start = false if use_start && earliest.at == start_time
-                
-                if use_start
-                  if earliest.at < start_time
-                    start_utc_offset = observance.utc_offset
-                    start_std_offset = std_offset
-                    start_zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)                    
-                    next
-                  end
-                  
-                  if start_zone_id.nil? && start_utc_offset + start_std_offset == observance.utc_offset + std_offset
-                    start_zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)
-                  end
-                end
-                
-                zone_id = observance.format.expand(earliest.rule.save, earliest.rule.letter)
-                transitions << TZDataTransition.new(earliest.at, observance.utc_offset, earliest.rule.save, zone_id)
-              end              
-            }
-          end
-        
-          if use_start
-            start_zone_id = observance.format.expand(nil, nil) if start_zone_id.nil? && observance.format.fixed?            
-            raise 'Could not determine time zone abbreviation to use just after until time' if start_zone_id.nil?            
-            transitions << TZDataTransition.new(start_time, start_utc_offset, start_std_offset, start_zone_id)
-          end
-                    
-          start_time = observance.valid_until.to_utc(utc_offset, std_offset) if use_until 
-        }
-        
-        transitions
-      end
-  end
-  
-  # A observance within a zone (a line within the zone definition).
-  class TZDataObservance #:nodoc:
-    attr_reader :utc_offset
-    attr_reader :rule_set
-    attr_reader :format
-    attr_reader :valid_until
-    
-    def initialize(utc_offset, rule_set, format, valid_until)
-      @utc_offset = TZDataParser.parse_offset(utc_offset)
-      @rule_set = rule_set      
-      @format = TZDataFormat.new(format)
-      @valid_until = valid_until.nil? ? nil : TZDataUntil.new(valid_until)      
-    end 
-    
-    def std_offset
-      if @rule_set.kind_of?(TZDataFixedOffsetRules)
-        @rule_set.offset
-      else
-        0
-      end
-    end
-  end
-  
-  # Collection of TZDataTransition instances used when building a zone class.
-  class TZDataTransitions #:nodoc:
-    
-    def initialize
-      @transitions = []
-    end
-    
-    def << (transition)
-      @transitions << transition
-    end 
-    
-    def output_module(file)
-      optimize
-      
-      # Try and end on a transition to std if one happens in the last year.
-      if @transitions.length > 1 && 
-          @transitions.last.std_offset != 0 &&
-          @transitions[@transitions.length - 2].std_offset == 0 &&
-          @transitions[@transitions.length - 2].at_utc.year == TZDataParser::MAX_YEAR
-        
-        transitions = @transitions[0..@transitions.length - 2]
-      else
-        transitions = @transitions
-      end
-      
-      process_offsets(file)
-      file.puts('')
-      
-      transitions.each do |t|        
-        t.write(file)
-      end            
-    end
-    
-    private
-      def optimize
-        @transitions.sort!
-        
-        # Optimization logic from zic.c writezone.
-        
-        from_i = 0
-        to_i = 0
-        
-        while from_i < @transitions.length
-          if to_i > 1 && 
-              !@transitions[from_i].at_utc.nil?  &&
-              !@transitions[to_i - 1].at_utc.nil? &&
-              @transitions[from_i].at_utc + Rational(@transitions[to_i - 1].total_offset, 86400) <=
-              @transitions[to_i - 1].at_utc + Rational(@transitions[to_i - 2].total_offset, 86400)
-                      
-            @transitions[to_i - 1] = @transitions[from_i].clone_with_at(@transitions[to_i - 1].at_utc)             
-            from_i += 1
-            next
-          end
-          
-          # Shuffle transitions up, eliminating any redundant transitions 
-          # along the way.
-          if to_i == 0 ||
-              @transitions[to_i - 1].utc_offset != @transitions[from_i].utc_offset ||
-              @transitions[to_i - 1].std_offset != @transitions[from_i].std_offset ||
-              @transitions[to_i - 1].zone_id != @transitions[from_i].zone_id
-                      
-            @transitions[to_i] = @transitions[from_i]
-            to_i += 1            
-          end
-          
-          from_i += 1
-        end                
-        
-        if to_i > 0
-          @transitions = @transitions[0..to_i - 1]
-        else
-          @transitions = []
-        end                
-      end
-      
-      def quote_zone_id(zone_id)     
-        if zone_id =~ %r{[\-+']}
-          ":#{TZDataParser.quote_str(zone_id)}"          
-        else
-          ":#{zone_id}"
-        end
-      end  
-      
-      def process_offsets(file)
-        # A bit of a hack at the moment. The offset used to be output with
-        # each period (pair of transitions). They are now separated from the
-        # transition data. The code should probably be changed at some point to
-        # setup the offsets at an earlier stage.   
-        
-        # Assume that when this is called, the first transition is the Local
-        # Mean Time initial rule or a transition with no time that defines the
-        # offset for the entire zone.
-        
-        offsets = []
-        
-        # Find the first std offset. Timezones always start in std.
-        @transitions.each do |t|
-          if t.std_offset == 0
-            offset = {:utc_offset => t.utc_offset, 
-              :std_offset => t.std_offset,
-              :zone_id => t.zone_id,
-              :name => 'o0'}
-              
-            offsets << offset
-            break
-          end
-        end
-        
-        @transitions.each do |t|
-          offset = offsets.find do |o| 
-            o[:utc_offset] == t.utc_offset &&
-              o[:std_offset] == t.std_offset &&
-              o[:zone_id] == t.zone_id
-          end
-        
-          unless offset
-            offset = {:utc_offset => t.utc_offset, 
-              :std_offset => t.std_offset,
-              :zone_id => t.zone_id,
-              :name => "o#{offsets.length}"}
-                                       
-            offsets << offset
-          end
-          
-          t.offset_name = offset[:name]
-        end
-        
-        offsets.each do |offset|
-          file.puts("tz.offset :#{offset[:name]}, #{offset[:utc_offset]}, #{offset[:std_offset]}, #{quote_zone_id(offset[:zone_id])}")
-        end
-        
-      end
-  end
-  
-  # A transition that will be used to write the periods in a zone class.
-  class TZDataTransition #:nodoc:
-    include Comparable
-    
-    attr_reader :at_utc
-    attr_reader :utc_offset
-    attr_reader :std_offset
-    attr_reader :zone_id
-    attr_accessor :offset_name
-    
-    def initialize(at_utc, utc_offset, std_offset, zone_id)
-      @at_utc = at_utc
-      @utc_offset = utc_offset
-      @std_offset = std_offset
-      @zone_id = zone_id
-      @offset_name = nil
-    end
-    
-    def to_s
-      "At #{at_utc} UTC switch to UTC offset #{@utc_offset} with std offset #{@std_offset}, zone id #{@zone_id}"
-    end
-    
-    def <=>(transition)
-      if @at_utc == transition.at_utc
-        0
-      elsif @at_utc.nil?
-        -1
-      elsif transition.nil?
-        1
-      else       
-        @at_utc - transition.at_utc
-      end
-    end
-    
-    def total_offset
-      @utc_offset + @std_offset
-    end
-    
-    def clone_with_at(at_utc)
-      TZDataTransition.new(at_utc, @utc_offset, @std_offset, @zone_id)
-    end
-        
-    def write(file)        
-      if @at_utc
-        file.puts "tz.transition #{@at_utc.year}, #{@at_utc.mon}, :#{@offset_name}, #{datetime_constructor(@at_utc)}" 
-      end        
-    end
-     
-    private
-      def datetime_constructor(datetime)      
-        if (1970..2037).include?(datetime.year)
-          "#{Time.utc(datetime.year, datetime.mon, datetime.mday, datetime.hour, datetime.min, datetime.sec).to_i}"
-        else
-          "#{datetime.ajd.numerator}, #{datetime.ajd.denominator}"                    
-        end
-      end
-  end
-   
-  # An instance of a rule for a year.
-  class TZDataActivatedRule #:nodoc:
-    attr_reader :rule
-    attr_reader :year
-    attr_reader :at
-    
-    def initialize(rule, year)
-      @rule = rule
-      @year = year
-      @at = nil
-    end
-    
-    def calculate_time(utc_offset, std_offset)
-      @at = @rule.at_utc_time(@year, utc_offset, std_offset)
-    end
-  end
-  
-  # A tz data time definition - an hour, minute, second and reference. Reference
-  # is either :utc, :standard or :wall_clock.
-  class TZDataTime #:nodoc:
-    attr_reader :hour
-    attr_reader :minute
-    attr_reader :second
-    attr_reader :ref
-    
-    def initialize(spec)
-      raise "Invalid time: #{spec}" if spec !~ /^([0-9]+)(:([0-9]+)(:([0-9]+))?)?([wguzs])?$/
-      
-      @hour = $1.to_i
-      @minute = $3.nil? ? 0 : $3.to_i
-      @second = $5.nil? ? 0 : $5.to_i
-      
-      if $6 == 's'
-        @ref = :standard
-      elsif $6 == 'g' || $6 == 'u' || $6 == 'z'
-        @ref = :utc
-      else
-        @ref = :wall_clock
-      end
-    end
-    
-    # Converts the time to UTC given a utc_offset and std_offset.
-    def to_utc(utc_offset, std_offset, year, month, day)      
-      result = DateTime.new(year, month, day, @hour, @minute, @second)
-      offset = 0
-      offset = offset + utc_offset if @ref == :standard || @ref == :wall_clock            
-      offset = offset + std_offset if @ref == :wall_clock       
-      result - Rational(offset, 86400)            
-    end
-  end
-    
-  # A tz data day of the month reference. Can either be an absolute day,
-  # a last week day or a week day >= or <= than a specific day of month.
-  class TZDataDayOfMonth #:nodoc:
-    attr_reader :type
-    attr_reader :day_of_month
-    attr_reader :day_of_week
-    attr_reader :operator
-    
-    def initialize(spec)
-      raise "Invalid on: #{spec}" if spec !~ /^([0-9]+)|(last([A-z]+))|(([A-z]+)([<>]=)([0-9]+))$/
-      
-      if $1
-        @type = :absolute
-        @day_of_month = $1.to_i
-      elsif $3
-        @type = :last
-        @day_of_week = parse_day_of_week($3)
-      else
-        @type = :comparison
-        @day_of_week = parse_day_of_week($5)
-        @operator = parse_operator($6)
-        @day_of_month = $7.to_i
-      end
-    end
-    
-    # Returns the absolute day of month for the given year and month.
-    def to_absolute(year, month)
-      case @type
-        when :last
-          last_day_in_month = (Date.new(year, month, 1) >> 1) - 1          
-          offset = last_day_in_month.wday - @day_of_week
-          offset = offset + 7 if offset < 0
-          (last_day_in_month - offset).day
-        when :comparison
-          pivot = Date.new(year, month, @day_of_month)         
-          offset = @day_of_week - pivot.wday
-          offset = -offset if @operator == :less_equal
-          offset = offset + 7 if offset < 0
-          offset = -offset if @operator == :less_equal          
-          result = pivot + offset
-          if result.month != pivot.month
-            puts self.inspect
-            puts year
-            puts month
-          end
-          raise 'No suitable date found' if result.month != pivot.month
-          result.day          
-        else #absolute
-          @day_of_month
-      end
-    end
-    
-    private
-      def parse_day_of_week(day_of_week)
-        lower = day_of_week.downcase
-        if lower =~ /^mon/
-          1
-        elsif lower =~ /^tue/
-          2
-        elsif lower =~ /^wed/
-          3
-        elsif lower =~ /^thu/
-          4
-        elsif lower =~ /^fri/
-          5
-        elsif lower =~ /^sat/
-          6
-        elsif lower =~ /^sun/
-          0
-        else
-          raise "Invalid day of week: #{day_of_week}"
-        end
-      end
-      
-      def parse_operator(operator)
-        if operator == '>='
-          :greater_equal
-        elsif operator == '<='
-          :less_equal
-        else
-          raise "Invalid operator: #{operator}"
-        end
-      end
-  end   
-  
-  # A tz data Zone until reference.
-  class TZDataUntil #:nodoc:
-    attr_reader :year
-    attr_reader :month
-    attr_reader :day
-    attr_reader :time
-    
-    def initialize(spec)      
-      parts = spec.split(/\s+/)      
-      raise "Invalid until: #{spec}" if parts.length < 1
-      
-      @year = parts[0].to_i
-      @month = parts.length > 1 ? TZDataParser.parse_month(parts[1]) : 1
-      @day = TZDataDayOfMonth.new(parts.length > 2 ? parts[2] : '1')
-      @time = TZDataTime.new(parts.length > 3 ? parts[3] : '00:00')
-    end
-    
-    # Converts the reference to a UTC DateTime.
-    def to_utc(utc_offset, std_offset)
-      @time.to_utc(utc_offset, std_offset, @year, @month, @day.to_absolute(@year, @month))            
-    end
-  end
-  
-  # A tz data Zone format string. Either alternate standard/daylight-savings,
-  # substitution (%s) format or a fixed string.
-  class TZDataFormat #:nodoc:        
-    def initialize(spec)
-      if spec =~ /([A-z]+)\/([A-z]+)/
-        @type = :alternate
-        @standard_abbrev = $1
-        @daylight_abbrev = $2
-      elsif spec =~ /%s/
-        @type = :subst
-        @abbrev = spec
-      else
-        @type = :fixed
-        @abbrev = spec
-      end
-    end
-    
-    # Expands given the current daylight savings offset and Rule string.
-    def expand(std_offset, rule_string)
-      if @type == :alternate
-        if std_offset == 0
-          @standard_abbrev
-        else
-          @daylight_abbrev
-        end
-      elsif @type == :subst
-        sprintf(@abbrev, rule_string)
-      else
-        @abbrev
-      end        
-    end
-    
-    # True if a string from the rule is required to expand this format.
-    def requires_rule_string?
-      @type == :subst
-    end
-    
-    # Is a fixed format string.
-    def fixed?
-      @type == :fixed
-    end
-  end
-  
-  # A location (latitude + longitude)
-  class TZDataLocation #:nodoc:
-    attr_reader :latitude
-    attr_reader :longitude
-    
-    # Constructs a new TZDataLocation from a string in ISO 6709 
-    # sign-degrees-minutes-seconds format, either +-DDMM+-DDDMM 
-    # or +-DDMMSS+-DDDMMSS, first latitude (+ is north), 
-    # then longitude (+ is east).
-    def initialize(coordinates)
-      if coordinates !~ /^([+\-])([0-9]{2})([0-9]{2})([0-9]{2})?([+\-])([0-9]{3})([0-9]{2})([0-9]{2})?$/
-        raise "Invalid coordinates: #{coordinates}"
-      end
-      
-      @latitude = Rational($2.to_i) + Rational($3.to_i, 60)
-      @latitude += Rational($4.to_i, 3600) unless $4.nil?
-      @latitude = -@latitude if $1 == '-'
-      
-      @longitude = Rational($6.to_i) + Rational($7.to_i, 60)
-      @longitude += Rational($8.to_i, 3600) unless $8.nil?
-      @longitude = -@longitude if $5 == '-'
-    end
-  end  
-  
-  TZDataCountryTimezone = Struct.new(:timezone, :description, :location)  
-  
-  # An ISO 3166 country.
-  class TZDataCountry #:nodoc:
-    attr_reader :code
-    attr_reader :name
-    attr_reader :zones
-    
-    def initialize(code, name)
-      @code = code
-      @name = name
-      @zones = []
-    end
-    
-    # Adds a TZDataCountryTimezone
-    def add_zone(zone)      
-      @zones << zone      
-    end  
-    
-    def write_index_record(file)
-      s = "      country #{TZDataParser.quote_str(@code)}, #{TZDataParser.quote_str(@name)}"      
-      s << ' do |c|' if @zones.length > 0
-      
-      file.puts s
-      
-      @zones.each do |zone|
-        file.puts "        c.timezone #{TZDataParser.quote_str(zone.timezone.name)}, #{zone.location.latitude.numerator}, #{zone.location.latitude.denominator}, #{zone.location.longitude.numerator}, #{zone.location.longitude.denominator}#{zone.description.nil? ? '' : ', ' + TZDataParser.quote_str(zone.description)}" 
-      end
-      
-      file.puts '      end' if @zones.length > 0
-    end
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/lib/tzinfo.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/lib/tzinfo.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-# Add the directory containing this file to the start of the load path if it
-# isn't there already.
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'tzinfo/timezone'
-require 'tzinfo/country'
-require 'tzinfo/tzdataparser'
-require 'tzinfo/timezone_proxy'
-require 'tzinfo/data_timezone'
-require 'tzinfo/linked_timezone'
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,152 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/country'
-
-include TZInfo
-
-class TCCountry < Test::Unit::TestCase
-  def test_get_valid
-    c = Country.get('GB')
-    
-    assert_not_nil(c)
-    assert_equal('GB', c.code)
-  end
-    
-  def test_get_not_exist
-    assert_raise(InvalidCountryCode) {
-      Country.get('ZZ')
-    }
-  end
-  
-  def test_get_invalid
-    assert_raise(InvalidCountryCode) {
-      Country.get('../Countries/GB')
-    }
-  end
-  
-  def test_get_nil
-    assert_raise(InvalidCountryCode) {
-      Country.get(nil)
-    }
-  end
-  
-  def test_get_case    
-    assert_raise(InvalidCountryCode) {
-      Country.get('gb')
-    }
-  end
-    
-  def test_new_nil
-    assert_raise(InvalidCountryCode) {
-      c = Country.new(nil)
-    }        
-  end
-  
-  def test_new_arg
-    c = Country.new('GB')
-    assert_same(Country.get('GB'), c)    
-  end
-  
-  def test_new_arg_not_exist    
-    assert_raise(InvalidCountryCode) {
-      Country.new('ZZ')
-    }
-  end 
-  
-  def test_all_codes
-    all_codes = Country.all_codes
-    assert_kind_of(Array, all_codes)
-  end
-  
-  def test_all
-    all = Country.all    
-    assert_equal(Country.all_codes, all.collect {|c| c.code})
-  end
-  
-  def test_code    
-    assert_equal('US', Country.get('US').code)
-  end
-  
-  def test_name
-    assert_kind_of(String, Country.get('US').name)
-  end
-  
-  def test_to_s
-    assert_equal(Country.get('US').name, Country.get('US').to_s)
-    assert_equal(Country.get('GB').name, Country.get('GB').to_s)
-  end
-  
-  def test_zone_identifiers
-    zone_names = Country.get('US').zone_names
-    assert_kind_of(Array, zone_names)
-    assert_equal(true, zone_names.frozen?)    
-  end
-  
-  def test_zone_names
-    assert_equal(Country.get('US').zone_identifiers, Country.get('US').zone_names)
-  end
-  
-  def test_zones
-    zones = Country.get('US').zones
-    assert_kind_of(Array, zones)    
-    assert_equal(Country.get('US').zone_identifiers, zones.collect {|z| z.identifier})
-    
-    zones.each {|z| assert_kind_of(TimezoneProxy, z)}
-  end
-  
-  def test_zone_info
-    zones = Country.get('US').zone_info
-    assert_kind_of(Array, zones)
-    assert_equal(true, zones.frozen?)
-    
-    assert_equal(Country.get('US').zone_identifiers, zones.collect {|z| z.identifier})
-    assert_equal(Country.get('US').zone_identifiers, zones.collect {|z| z.timezone.identifier})
-    
-    zones.each {|z| assert_kind_of(CountryTimezone, z)}
-  end  
-      
-  def test_compare
-    assert_equal(0, Country.get('GB') <=> Country.get('GB'))
-    assert_equal(-1, Country.get('GB') <=> Country.get('US'))
-    assert_equal(1, Country.get('US') <=> Country.get('GB'))
-    assert_equal(-1, Country.get('FR') <=> Country.get('US'))
-    assert_equal(1, Country.get('US') <=> Country.get('FR'))
-  end
-  
-  def test_equality
-    assert_equal(true, Country.get('GB') == Country.get('GB'))
-    assert_equal(false, Country.get('GB') == Country.get('US'))
-    assert_nil(Country.get('GB') == Object.new)
-  end
-  
-  def test_eql
-    assert_equal(true, Country.get('GB').eql?(Country.get('GB')))
-    assert_equal(false, Country.get('GB').eql?(Country.get('US')))
-    assert_nil(Country.get('GB').eql?(Object.new))
-  end
-  
-  def test_hash
-    assert_equal('GB'.hash, Country.get('GB').hash)
-    assert_equal('US'.hash, Country.get('US').hash)
-  end
-  
-  def test_marshal
-    c = Country.get('US')
-    
-    # Should get back the same instance because load calls Country.get.
-    assert_same(c, Marshal.load(Marshal.dump(c)))
-  end
-  
-  def test_reload
-    # If country gets reloaded for some reason, it needs to force a reload of
-    # the country index.
-    
-    c = Country.get('US')
-    assert_equal('US', Country.get('US').code)
-    
-    load 'tzinfo/country.rb'
-    
-    c = Country.get('US')
-    assert_equal('US', Country.get('US').code)
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country_index_definition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country_index_definition.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country_index_definition.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country_index_definition.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,71 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/country_index_definition'
-require 'tzinfo/country_info'
-
-include TZInfo
-
-class TCCountryIndexDefinition < Test::Unit::TestCase
-
-  module CountriesTest1     
-    include CountryIndexDefinition
-    
-    country 'ZZ', 'Country One' do |c|
-      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
-      c.timezone 'Test/Zone/1', 3, 2, 41,20
-    end
-    
-    country 'AA', 'Aland' do |c|
-      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
-      c.timezone 'Test/Zone/3', 71,30, 358, 15
-      c.timezone 'Test/Zone/2', 41, 20, 211, 30
-    end
-    
-    country 'TE', 'Three'    
-  end
-  
-  module CountriesTest2
-    include CountryIndexDefinition
-    
-    country 'CO', 'First Country' do |c|
-      raise 'Not a CountryInfo' unless c.kind_of?(CountryInfo)
-    end
-  end
-  
-  def test_module_1
-    hash = CountriesTest1.countries
-    assert_equal(3, hash.length)
-    assert_equal(true, hash.frozen?)
-    
-    zz = hash['ZZ']
-    aa = hash['AA']
-    te = hash['TE']
-    
-    assert_equal('ZZ', zz.code)
-    assert_equal('Country One', zz.name)
-    assert_equal(1, zz.zones.length)
-    assert_equal('Test/Zone/1', zz.zones[0].identifier)
-    
-    assert_equal('AA', aa.code)
-    assert_equal('Aland', aa.name)
-    assert_equal(2, aa.zones.length)
-    assert_equal('Test/Zone/3', aa.zones[0].identifier)
-    assert_equal('Test/Zone/2', aa.zones[1].identifier)
-    
-    assert_equal('TE', te.code)
-    assert_equal('Three', te.name)
-    assert_equal(0, te.zones.length)    
-  end
-  
-  def test_module_2
-    hash = CountriesTest2.countries
-    assert_equal(1, hash.length)
-    assert_equal(true, hash.frozen?)
-    
-    co = hash['CO']
-    
-    assert_equal('CO', co.code)
-    assert_equal('First Country', co.name)
-    assert_equal(0, co.zones.length)
-  end  
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,72 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/country_timezone'
-
-include TZInfo
-
-class TCCountryInfo < Test::Unit::TestCase
-  
-  def test_code
-    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
-    assert_equal('ZZ', ci.code)
-  end
-  
-  def test_name
-    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
-    assert_equal('Zzz', ci.name)
-  end
-  
-  def test_zone_identifiers_empty
-    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
-    assert(ci.zone_identifiers.empty?)
-    assert(ci.zone_identifiers.frozen?)
-  end
-  
-  def test_zone_identifiers_no_block
-    ci = CountryInfo.new('ZZ', 'Zzz')
-    assert(ci.zone_identifiers.empty?)
-    assert(ci.zone_identifiers.frozen?)
-  end
-  
-  def test_zone_identifiers
-    ci = CountryInfo.new('ZZ', 'Zzz') do |c|
-      assert_same(ci, c)
-      c.timezone('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B')
-      c.timezone('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A')
-      c.timezone('ZZ/TimezoneC', -10, 3, -20, 7, 'C')
-      c.timezone('ZZ/TimezoneD', -10, 3, -20, 7)
-    end
-    
-    assert_equal(['ZZ/TimezoneB', 'ZZ/TimezoneA', 'ZZ/TimezoneC', 'ZZ/TimezoneD'], ci.zone_identifiers)
-    assert(ci.zone_identifiers.frozen?)
-  end
-  
-  def test_zones_empty
-    ci = CountryInfo.new('ZZ', 'Zzz') {|c| }
-    assert(ci.zones.empty?)
-    assert(ci.zones.frozen?)
-  end
-  
-  def test_zones_no_block
-    ci = CountryInfo.new('ZZ', 'Zzz')
-    assert(ci.zones.empty?)
-    assert(ci.zones.frozen?)
-  end
-  
-  def test_zones
-    ci = CountryInfo.new('ZZ', 'Zzz') do |c|
-      assert_same(ci, c)
-      c.timezone('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B')
-      c.timezone('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A')
-      c.timezone('ZZ/TimezoneC', -10, 3, -20, 7, 'C')
-      c.timezone('ZZ/TimezoneD', -10, 3, -20, 7)
-    end
-    
-    assert_equal([CountryTimezone.new('ZZ/TimezoneB', 1, 2, 1, 2, 'Timezone B'),
-      CountryTimezone.new('ZZ/TimezoneA', 1, 4, 1, 4, 'Timezone A'),
-      CountryTimezone.new('ZZ/TimezoneC', -10, 3, -20, 7, 'C'),
-      CountryTimezone.new('ZZ/TimezoneD', -10, 3, -20, 7)],
-      ci.zones)
-    assert(ci.zones.frozen?)
-  end    
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_country_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_country_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,121 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/country_timezone'
-
-include TZInfo
-
-class TCCountryTimezone < Test::Unit::TestCase
-  def test_identifier
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)    
-    assert_equal('Europe/London', ct.identifier)
-  end    
-  
-  def test_latitude
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    assert_equal(Rational(2059, 40), ct.latitude)
-  end
-  
-  def test_longitude
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    assert_equal(Rational(-5, 16), ct.longitude)
-  end
-  
-  def test_description_omit
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    assert_nil(ct.description)
-  end
-  
-  def test_description_nil
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, nil)
-    assert_nil(ct.description)
-  end
-  
-  def test_description
-    ct = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
-    assert_equal('Eastern Time', ct.description)
-  end
-  
-  def test_timezone    
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    assert_kind_of(TimezoneProxy, ct.timezone)
-    assert_equal('Europe/London', ct.timezone.identifier)
-  end
-  
-  def test_description_or_friendly_idenfier_no_description
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    assert_equal('London', ct.description_or_friendly_identifier)
-  end
-  
-  def test_description_or_friendly_idenfier_description
-    ct = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
-    assert_equal('Eastern Time', ct.description_or_friendly_identifier)
-  end
-  
-  def test_equality_1
-    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct2 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct3 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, 'Description')
-    ct4 = CountryTimezone.new('Europe/LondonB', 2059, 40, -5, 16)
-    ct5 = CountryTimezone.new('Europe/London', 2060, 40, -5, 16)
-    ct6 = CountryTimezone.new('Europe/London', 2059, 40, -6, 16)
-    
-    assert_equal(true, ct1 == ct1)
-    assert_equal(true, ct1 == ct2)
-    assert_equal(false, ct1 == ct3)
-    assert_equal(false, ct1 == ct4)
-    assert_equal(false, ct1 == ct5)
-    assert_equal(false, ct1 == ct6)
-  end
-  
-  def test_equality_2
-    ct1 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
-    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
-    
-    assert_equal(true, ct1 == ct1)
-    assert_equal(false, ct1 == ct2)    
-  end
-  
-  def test_equality_non_country_timezone
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    
-    assert_equal(false, ct == Object.new)
-  end
-  
-  def test_eql_1
-    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct2 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct3 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16, 'Description')
-    ct4 = CountryTimezone.new('Europe/LondonB', 2059, 40, -5, 16)
-    ct5 = CountryTimezone.new('Europe/London', 2060, 40, -5, 16)
-    ct6 = CountryTimezone.new('Europe/London', 2059, 40, -6, 16)
-    
-    assert_equal(true, ct1.eql?(ct1))
-    assert_equal(true, ct1.eql?(ct2))
-    assert_equal(false, ct1.eql?(ct3))
-    assert_equal(false, ct1.eql?(ct4))
-    assert_equal(false, ct1.eql?(ct5))
-    assert_equal(false, ct1.eql?(ct6))
-  end
-  
-  def test_eql_2
-    ct1 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
-    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time2')
-    
-    assert_equal(true, ct1.eql?(ct1))
-    assert_equal(false, ct1.eql?(ct2))    
-  end
-  
-  def test_eql_non_country_timezone
-    ct = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    
-    assert_equal(false, ct.eql?(Object.new))
-  end
-  
-  def test_hash
-    ct1 = CountryTimezone.new('Europe/London', 2059, 40, -5, 16)
-    ct2 = CountryTimezone.new('America/New_York', 48857, 1200, -266423, 3600, 'Eastern Time')
-    
-    assert_equal('Europe/London'.hash ^ 2059.hash ^ 40.hash ^ -5.hash ^ 16.hash ^ nil.hash, ct1.hash)
-    assert_equal('America/New_York'.hash ^ 48857.hash ^ 1200.hash ^ -266423.hash ^ 3600.hash ^ 'Eastern Time'.hash, ct2.hash)
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_data_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_data_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_data_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_data_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,69 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/data_timezone'
-require 'tzinfo/timezone_info'
-
-include TZInfo
-
-class TCDataTimezone < Test::Unit::TestCase
-  
-  class TestTimezoneInfo < TimezoneInfo
-    attr_reader :utc
-    attr_reader :local
-    
-    def initialize(identifier, utc_period, local_periods)
-      super(identifier)
-      @utc_period = utc_period
-      @local_periods = local_periods || []
-    end
-    
-    def period_for_utc(utc)
-      @utc = utc
-      @utc_period     
-    end
-    
-    def periods_for_local(local)
-      @local = local      
-      @local_periods
-    end
-  end    
-
-  def test_identifier
-    tz = DataTimezone.new(TestTimezoneInfo.new('Test/Zone', nil, []))
-    assert_equal('Test/Zone', tz.identifier)
-  end
-  
-  def test_period_for_utc
-    # Don't need actual TimezonePeriods. DataTimezone isn't supposed to do
-    # anything with them apart from return them.
-    period = Object.new 
-    tti = TestTimezoneInfo.new('Test/Zone', period, [])
-    tz = DataTimezone.new(tti)
-    
-    t = Time.utc(2006, 6, 27, 22, 50, 12)
-    assert_same(period, tz.period_for_utc(t))
-    assert_same(t, tti.utc)    
-  end
-  
-  def test_periods_for_local
-    # Don't need actual TimezonePeriods. DataTimezone isn't supposed to do
-    # anything with them apart from return them.
-    periods = [Object.new, Object.new] 
-    tti = TestTimezoneInfo.new('Test/Zone', nil, periods)
-    tz = DataTimezone.new(tti)
-    
-    t = Time.utc(2006, 6, 27, 22, 50, 12)
-    assert_same(periods, tz.periods_for_local(t))
-    assert_same(t, tti.local)  
-  end
-  
-  def test_periods_for_local_not_found
-    periods = []
-    tti = TestTimezoneInfo.new('Test/Zone', nil, periods)
-    tz = DataTimezone.new(tti)
-    
-    t = Time.utc(2006, 6, 27, 22, 50, 12)
-    assert_same(periods, tz.periods_for_local(t))
-    assert_same(t, tti.local)
-  end    
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_data_timezone_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_data_timezone_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_data_timezone_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_data_timezone_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,282 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/data_timezone_info'
-require 'tzinfo/timezone_offset_info'
-require 'tzinfo/timezone_period'
-require 'tzinfo/timezone_transition_info'
-
-include TZInfo
-
-class TCDataTimezoneInfo < Test::Unit::TestCase
-  
-  def test_identifier
-    dti = DataTimezoneInfo.new('Test/Zone')
-    assert_equal('Test/Zone', dti.identifier)
-  end
-
-  def test_offset
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    assert_nothing_raised { dti.offset :o1, -18000, 3600, :TEST }
-  end
-  
-  def test_offset_already_defined
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, 3600, 0, :TEST
-    dti.offset :o2, 1800, 0, :TEST2
-    
-    assert_raise(ArgumentError) { dti.offset :o1, 3600, 3600, :TESTD }
-  end
-  
-  def test_transition_time
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    assert_nothing_raised { dti.transition 2006, 6, :o1, 1149368400 }
-  end
-  
-  def test_transition_datetime
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    assert_nothing_raised { dti.transition 2006, 6, :o1, 19631123, 8 }
-  end
-  
-  def test_transition_invalid_offset
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    dti.transition 2006, 6, :o1, 1149368400
-    
-    assert_raise(ArgumentError) { dti.transition 2006, 6, :o2, 1149454800 }    
-  end
-  
-  def test_transition_no_offsets
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    assert_raise(ArgumentError) { dti.transition 2006, 6, :o1, 1149368400 }
-  end
-  
-  def test_transition_invalid_order_month
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    dti.transition 2006, 6, :o1, 1149368400
-    
-    assert_raise(ArgumentError) { dti.transition 2006, 5, :o2, 1146690000 }
-  end
-  
-  def test_transition_invalid_order_year
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -18000, 3600, :TEST
-    
-    dti.transition 2006, 6, :o1, 1149368400
-    
-    assert_raise(ArgumentError) { dti.transition 2005, 7, :o2, 1120424400 }
-  end   
-  
-  def test_period_for_utc
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900,    0, :TESTLMT
-    dti.offset :o2, -18000, 3600, :TESTD
-    dti.offset :o3, -18000,    0, :TESTS
-    dti.offset :o4, -21600, 3600, :TESTD
-    
-    dti.transition 2000,  4, :o2, Time.utc(2000, 4,1,1,0,0).to_i
-    dti.transition 2000, 10, :o3, Time.utc(2000,10,1,1,0,0).to_i
-    dti.transition 2001,  3, :o2, 58847269, 24                    # (2001, 3,1,1,0,0)
-    dti.transition 2001,  4, :o4, Time.utc(2001, 4,1,1,0,0).to_i
-    dti.transition 2001, 10, :o3, Time.utc(2001,10,1,1,0,0).to_i
-    dti.transition 2002, 10, :o3, Time.utc(2002,10,1,1,0,0).to_i
-    dti.transition 2003,  2, :o2, Time.utc(2003, 2,1,1,0,0).to_i
-    dti.transition 2003,  3, :o3, Time.utc(2003, 3,1,1,0,0).to_i
-    
-    o1 = TimezoneOffsetInfo.new(-17900, 0,    :TESTLMT)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :TESTD)
-    o3 = TimezoneOffsetInfo.new(-18000, 0,    :TESTS)
-    o4 = TimezoneOffsetInfo.new(-21600, 3600, :TESTD)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000, 4,1,1,0,0).to_i)
-    t2 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2000,10,1,1,0,0).to_i)
-    t3 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2001, 3,1,1,0,0).to_i)
-    t4 = TimezoneTransitionInfo.new(o4, o2, Time.utc(2001, 4,1,1,0,0).to_i)
-    t5 = TimezoneTransitionInfo.new(o3, o4, Time.utc(2001,10,1,1,0,0).to_i)
-    t6 = TimezoneTransitionInfo.new(o3, o3, Time.utc(2002,10,1,1,0,0).to_i)
-    t7 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2003, 2,1,1,0,0).to_i)
-    t8 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2003, 3,1,1,0,0).to_i)     
-    
-    assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(DateTime.new(1960, 1,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(DateTime.new(1999,12,1,0, 0, 0)))
-    assert_equal(TimezonePeriod.new(nil, t1), dti.period_for_utc(Time.utc(    2000, 4,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t1, t2),  dti.period_for_utc(DateTime.new(2000, 4,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t1, t2),  dti.period_for_utc(Time.utc(    2000,10,1,0,59,59).to_i))      
-    assert_equal(TimezonePeriod.new(t2, t3),  dti.period_for_utc(Time.utc(    2000,10,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t2, t3),  dti.period_for_utc(Time.utc(    2001, 3,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t3, t4),  dti.period_for_utc(Time.utc(    2001, 3,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t3, t4),  dti.period_for_utc(Time.utc(    2001, 4,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t4, t5),  dti.period_for_utc(Time.utc(    2001, 4,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t4, t5),  dti.period_for_utc(Time.utc(    2001,10,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t5, t6),  dti.period_for_utc(Time.utc(    2001,10,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t5, t6),  dti.period_for_utc(Time.utc(    2002, 2,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t5, t6),  dti.period_for_utc(Time.utc(    2002,10,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t6, t7),  dti.period_for_utc(Time.utc(    2002,10,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t6, t7),  dti.period_for_utc(Time.utc(    2003, 2,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t7, t8),  dti.period_for_utc(Time.utc(    2003, 2,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t7, t8),  dti.period_for_utc(Time.utc(    2003, 3,1,0,59,59)))
-    assert_equal(TimezonePeriod.new(t8, nil), dti.period_for_utc(Time.utc(    2003, 3,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t8, nil), dti.period_for_utc(Time.utc(    2004, 1,1,1, 0, 0)))
-    assert_equal(TimezonePeriod.new(t8, nil), dti.period_for_utc(DateTime.new(2050, 1,1,1, 0, 0)))        
-  end
-    
-  def test_period_for_utc_no_transitions
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900, 0, :TESTLMT
-    dti.offset :o2, -18000, 0, :TEST
-    
-    o1 = TimezoneOffsetInfo.new(-17900, 0, :TESTLMT)
-    
-    assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(DateTime.new(2005,1,1,0,0,0)))
-    assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(Time.utc(2005,1,1,0,0,0)))
-    assert_equal(TimezonePeriod.new(nil, nil, o1), dti.period_for_utc(Time.utc(2005,1,1,0,0,0).to_i))       
-  end
-    
-  def test_period_for_utc_no_offsets
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    assert_raise(NoOffsetsDefined) { dti.period_for_utc(DateTime.new(2005,1,1,0,0,0)) }
-    assert_raise(NoOffsetsDefined) { dti.period_for_utc(Time.utc(2005,1,1,0,0,0)) }
-    assert_raise(NoOffsetsDefined) { dti.period_for_utc(Time.utc(2005,1,1,0,0,0).to_i) }
-  end
-  
-  def test_periods_for_local
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900,    0, :TESTLMT
-    dti.offset :o2, -18000, 3600, :TESTD
-    dti.offset :o3, -18000,    0, :TESTS
-    dti.offset :o4, -21600, 3600, :TESTD
-    
-    dti.transition 2000,  4, :o2, 58839277, 24                   # 2000,4,2,1,0,0
-    dti.transition 2000, 10, :o3, Time.utc(2000,10,2,1,0,0).to_i
-    dti.transition 2001,  3, :o2, Time.utc(2001, 3,2,1,0,0).to_i
-    dti.transition 2001,  4, :o4, Time.utc(2001, 4,2,1,0,0).to_i
-    dti.transition 2001, 10, :o3, Time.utc(2001,10,2,1,0,0).to_i
-    dti.transition 2002, 10, :o3, 58861189, 24                   # 2002,10,2,1,0,0
-    dti.transition 2003,  2, :o2, Time.utc(2003, 2,2,1,0,0).to_i
-    
-    o1 = TimezoneOffsetInfo.new(-17900,    0, :TESTLMT)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :TESTD)
-    o3 = TimezoneOffsetInfo.new(-18000,    0, :TESTS)
-    o4 = TimezoneOffsetInfo.new(-21600, 3600, :TESTD)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000, 4,2,1,0,0).to_i)
-    t2 = TimezoneTransitionInfo.new(o3, o2, Time.utc(2000,10,2,1,0,0).to_i)
-    t3 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2001, 3,2,1,0,0).to_i)
-    t4 = TimezoneTransitionInfo.new(o4, o2, Time.utc(2001, 4,2,1,0,0).to_i)
-    t5 = TimezoneTransitionInfo.new(o3, o4, Time.utc(2001,10,2,1,0,0).to_i)
-    t6 = TimezoneTransitionInfo.new(o3, o3, Time.utc(2002,10,2,1,0,0).to_i)
-    t7 = TimezoneTransitionInfo.new(o2, o3, Time.utc(2003, 2,2,1,0,0).to_i)
-    
-    
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(DateTime.new(1960, 1, 1, 1, 0, 0)))
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(DateTime.new(1999,12, 1, 0, 0, 0)))
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(Time.utc(    2000, 1, 1,10, 0, 0)))
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(Time.utc(    2000, 4, 1,20, 1,39)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2000, 4, 1,20, 1,40)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2000, 4, 1,20,59,59)))
-    assert_equal([TimezonePeriod.new(t1,  t2)], dti.periods_for_local(Time.utc(    2000, 4, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t1,  t2)], dti.periods_for_local(DateTime.new(2000,10, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t1,  t2),
-                  TimezonePeriod.new(t2,  t3)], dti.periods_for_local(Time.utc(    2000,10, 1,20, 0, 0).to_i))   
-    assert_equal([TimezonePeriod.new(t1,  t2),
-                  TimezonePeriod.new(t2,  t3)], dti.periods_for_local(DateTime.new(2000,10, 1,20,59,59)))
-    assert_equal([TimezonePeriod.new(t2,  t3)], dti.periods_for_local(Time.utc(    2000,10, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t2,  t3)], dti.periods_for_local(Time.utc(    2001, 3, 1,19,59,59)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2001, 3, 1,20, 0, 0)))
-    assert_equal([],                            dti.periods_for_local(DateTime.new(2001, 3, 1,20, 30, 0)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2001, 3, 1,20,59,59).to_i))
-    assert_equal([TimezonePeriod.new(t3,  t4)], dti.periods_for_local(Time.utc(    2001, 3, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t3,  t4)], dti.periods_for_local(Time.utc(    2001, 4, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t3,  t4),
-                  TimezonePeriod.new(t4,  t5)], dti.periods_for_local(DateTime.new(2001, 4, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t3,  t4),
-                  TimezonePeriod.new(t4,  t5)], dti.periods_for_local(Time.utc(    2001, 4, 1,20,59,59)))                  
-    assert_equal([TimezonePeriod.new(t4,  t5)], dti.periods_for_local(Time.utc(    2001, 4, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t4,  t5)], dti.periods_for_local(Time.utc(    2001,10, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t5,  t6)], dti.periods_for_local(Time.utc(    2001,10, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t5,  t6)], dti.periods_for_local(Time.utc(    2002, 2, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t5,  t6)], dti.periods_for_local(Time.utc(    2002,10, 1,19,59,59)))
-    assert_equal([TimezonePeriod.new(t6,  t7)], dti.periods_for_local(Time.utc(    2002,10, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t6,  t7)], dti.periods_for_local(Time.utc(    2003, 2, 1,19,59,59)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2003, 2, 1,20, 0, 0)))
-    assert_equal([],                            dti.periods_for_local(Time.utc(    2003, 2, 1,20,59,59)))
-    assert_equal([TimezonePeriod.new(t7, nil)], dti.periods_for_local(Time.utc(    2003, 2, 1,21, 0, 0)))
-    assert_equal([TimezonePeriod.new(t7, nil)], dti.periods_for_local(Time.utc(    2004, 2, 1,20, 0, 0)))
-    assert_equal([TimezonePeriod.new(t7, nil)], dti.periods_for_local(DateTime.new(2040, 2, 1,20, 0, 0)))
-  end
-      
-  def test_periods_for_local_warsaw
-    dti = DataTimezoneInfo.new('Test/Europe/Warsaw')
-    dti.offset :o1, 5040,    0, :LMT
-    dti.offset :o2, 5040,    0, :WMT
-    dti.offset :o3, 3600,    0, :CET
-    dti.offset :o4, 3600, 3600, :CEST
-    
-    dti.transition 1879, 12, :o2, 288925853, 120  # 1879,12,31,22,36,0
-    dti.transition 1915,  8, :o3, 290485733, 120  # 1915, 8, 4,22,36,0
-    dti.transition 1916,  4, :o4,  29051813,  12  # 1916, 4,30,22, 0,0
-    
-    o1 = TimezoneOffsetInfo.new(5040,    0, :LMT)
-    o2 = TimezoneOffsetInfo.new(5040,    0, :WMT)
-    o3 = TimezoneOffsetInfo.new(3600,    0, :CET)
-    o4 = TimezoneOffsetInfo.new(3600, 3600, :CEST)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 288925853, 120)
-    t2 = TimezoneTransitionInfo.new(o3, o2, 290485733, 120)
-    t3 = TimezoneTransitionInfo.new(o4, o3,  29051813,  12)
-    
-    assert_equal([TimezonePeriod.new(t1, t2),
-                  TimezonePeriod.new(t2, t3)], dti.periods_for_local(DateTime.new(1915,8,4,23,40,0)))      
-  end
-    
-  def test_periods_for_local_boundary
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -3600, 0, :TESTD
-    dti.offset :o2, -3600, 0, :TESTS
-    
-    dti.transition 2000, 7, :o2, Time.utc(2000,7,1,0,0,0).to_i
-    
-    o1 = TimezoneOffsetInfo.new(-3600, 0, :TESTD)
-    o2 = TimezoneOffsetInfo.new(-3600, 0, :TESTS)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, Time.utc(2000,7,1,0,0,0).to_i)
-                
-    # 2000-07-01 00:00:00 UTC is 2000-06-30 23:00:00 UTC-1
-    # hence to find periods for local times between 2000-06-30 23:00:00
-    # and 2000-07-01 00:00:00 a search has to be carried out in the next half
-    # year to the one containing the date we are looking for
-    
-    assert_equal([TimezonePeriod.new(nil, t1)], dti.periods_for_local(Time.utc(2000,6,30,22,59,59)))
-    assert_equal([TimezonePeriod.new(t1, nil)], dti.periods_for_local(Time.utc(2000,6,30,23, 0, 0)))
-    assert_equal([TimezonePeriod.new(t1, nil)], dti.periods_for_local(Time.utc(2000,7, 1, 0, 0, 0)))    
-  end
-    
-  def test_periods_for_local_no_transitions
-    dti = DataTimezoneInfo.new('Test/Zone')
-    dti.offset :o1, -17900, 0, :TESTLMT
-    dti.offset :o2, -18000, 0, :TEST
-    
-    o1 = TimezoneOffsetInfo.new(-17900, 0, :TESTLMT)
-    
-    assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(DateTime.new(2005,1,1,0,0,0)))
-    assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(Time.utc(2005,1,1,0,0,0)))
-    assert_equal([TimezonePeriod.new(nil, nil, o1)], dti.periods_for_local(Time.utc(2005,1,1,0,0,0).to_i))       
-  end
-    
-  def test_periods_for_local_no_offsets
-    dti = DataTimezoneInfo.new('Test/Zone')
-    
-    assert_raise(NoOffsetsDefined) { dti.periods_for_local(DateTime.new(2005,1,1,0,0,0)) }
-    assert_raise(NoOffsetsDefined) { dti.periods_for_local(Time.utc(2005,1,1,0,0,0)) }
-    assert_raise(NoOffsetsDefined) { dti.periods_for_local(Time.utc(2005,1,1,0,0,0).to_i) }
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_info_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_info_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_info_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_info_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,37 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/info_timezone'
-require 'tzinfo/timezone_info'
-
-include TZInfo
-
-class TCInfoTimezone < Test::Unit::TestCase
-  
-  class TestInfoTimezone < InfoTimezone
-    attr_reader :setup_info
-    
-    protected
-      def setup(info)
-        super(info)
-        @setup_info = info
-      end     
-  end
-  
-  def test_identifier
-    tz = InfoTimezone.new(TimezoneInfo.new('Test/Identifier'))
-    assert_equal('Test/Identifier', tz.identifier)
-  end
-  
-  def test_info
-    i = TimezoneInfo.new('Test/Identifier')
-    tz = InfoTimezone.new(i)
-    assert_same(i, tz.send(:info))
-  end
-  
-  def test_setup
-    i = TimezoneInfo.new('Test/Identifier')
-    tz = TestInfoTimezone.new(i)
-    assert_same(i, tz.setup_info)
-  end
-end
-
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_linked_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_linked_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_linked_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_linked_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,97 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/linked_timezone'
-require 'tzinfo/linked_timezone_info'
-
-include TZInfo
-
-class TCLinkedTimezone < Test::Unit::TestCase
-  
-  class TestTimezone < Timezone
-    attr_reader :utc_period
-    attr_reader :local_periods
-    attr_reader :utc
-    attr_reader :local    
-    
-    def self.new(identifier, no_local_periods = false)
-      tz = super()
-      tz.send(:setup, identifier, no_local_periods)
-      tz
-    end
-    
-    def identifier
-      @identifier
-    end
-    
-    def period_for_utc(utc)
-      @utc = utc
-      @utc_period
-    end
-    
-    def periods_for_local(local)
-      @local = local
-      raise PeriodNotFound if @no_local_periods
-      @local_periods
-    end
-    
-    private
-      def setup(identifier, no_local_periods)
-        @identifier = identifier
-        @no_local_periods = no_local_periods
-        
-        # Doesn't have to be a real TimezonePeriod (nothing attempts to use it).
-        @utc_period = Object.new
-        @local_periods = [Object.new, Object.new]
-      end
-  end
-  
-  
-  def setup
-    # Redefine Timezone.get to return a fake timezone.
-    
-    def Timezone.get(identifier)
-      raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier == 'Invalid/Identifier'
-      
-      @timezones ||= {}
-      @timezones[identifier] ||= TestTimezone.new(identifier, identifier == 'Test/No/Local')        
-    end
-  end
-  
-  def teardown
-    # Re-require timezone to reset.
-    load 'tzinfo/timezone.rb'
-  end
-  
-  def test_identifier
-    tz = LinkedTimezone.new(LinkedTimezoneInfo.new('Test/Zone', 'Test/Linked'))
-    assert_equal('Test/Zone', tz.identifier)
-  end
-  
-  def test_invalid_linked_identifier
-    assert_raise(InvalidTimezoneIdentifier) { LinkedTimezone.new(LinkedTimezoneInfo.new('Test/Zone', 'Invalid/Identifier')) }
-  end
-  
-  def test_period_for_utc
-    tz = LinkedTimezone.new(LinkedTimezoneInfo.new('Test/Zone', 'Test/Linked'))
-    linked_tz = Timezone.get('Test/Linked')
-    t = Time.utc(2006, 6, 27, 23, 12, 28)
-    assert_same(linked_tz.utc_period, tz.period_for_utc(t))
-    assert_same(t, linked_tz.utc)
-  end
-  
-  def test_periods_for_local
-    tz = LinkedTimezone.new(LinkedTimezoneInfo.new('Test/Zone', 'Test/Linked'))
-    linked_tz = Timezone.get('Test/Linked')
-    t = Time.utc(2006, 6, 27, 23, 12, 28)
-    assert_same(linked_tz.local_periods, tz.periods_for_local(t))
-    assert_same(t, linked_tz.local)
-  end
-  
-  def test_periods_for_local_not_found
-    tz = LinkedTimezone.new(LinkedTimezoneInfo.new('Test/Zone', 'Test/No/Local'))
-    linked_tz = Timezone.get('Test/No/Local')
-    t = Time.utc(2006, 6, 27, 23, 12, 28)
-    assert_raise(PeriodNotFound) { tz.periods_for_local(t) }
-    assert_same(t, linked_tz.local)
-  end  
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_linked_timezone_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_linked_timezone_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_linked_timezone_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_linked_timezone_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,18 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/linked_timezone_info'
-
-include TZInfo
-
-class TCLinkedTimezoneInfo < Test::Unit::TestCase
-  
-  def test_identifier
-    lti = LinkedTimezoneInfo.new('Test/Zone', 'Test/Linked')
-    assert_equal('Test/Zone', lti.identifier)
-  end
-  
-  def test_link_to_identifier
-    lti = LinkedTimezoneInfo.new('Test/Zone', 'Test/Linked')
-    assert_equal('Test/Linked', lti.link_to_identifier)
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_offset_rationals.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_offset_rationals.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_offset_rationals.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_offset_rationals.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,25 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/offset_rationals'
-
-include TZInfo
-
-class TCOffsetRationals < Test::Unit::TestCase
-  def test_rational_for_offset
-    [0,1,2,3,4,-1,-2,-3,-4,30*60,-30*60,61*60,-61*60,14*60*60,-14*60*60,20*60*60,-20*60*60].each {|seconds|
-      assert_equal(Rational(seconds, 86400), OffsetRationals.rational_for_offset(seconds))      
-    }
-  end
-  
-  def test_rational_for_offset_constant
-    -28.upto(28) {|i|
-      seconds = i * 30 * 60
-      
-      r1 = OffsetRationals.rational_for_offset(seconds)
-      r2 = OffsetRationals.rational_for_offset(seconds)
-      
-      assert_equal(Rational(seconds, 86400), r1)
-      assert_same(r1, r2)
-    }
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_time_or_datetime.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_time_or_datetime.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_time_or_datetime.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_time_or_datetime.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,422 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/time_or_datetime'
-
-include TZInfo
-
-class TCTimeOrDateTime < Test::Unit::TestCase
-  def test_initialize_time
-    TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3))    
-  end
-  
-  def test_initialize_time_local 
-    tdt = TimeOrDateTime.new(Time.local(2006, 3, 24, 15, 32, 3))    
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), tdt.to_time)    
-    assert_equal('UTC', tdt.to_time.zone)
-  end
-  
-  def test_initialize_datetime_offset
-    tdt = TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3).new_offset(Rational(5, 24)))
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), tdt.to_datetime)
-    assert_equal(0, tdt.to_datetime.offset)
-  end
-  
-  def test_initialize_datetime
-    TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3))
-  end
-  
-  def test_initialize_int
-    TimeOrDateTime.new(1143214323)
-  end
-  
-  def test_initialize_string
-    TimeOrDateTime.new('1143214323')
-  end
-  
-  def test_to_time
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_time)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_time)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(1143214323).to_time)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new('1143214323').to_time)
-  end
-  
-  def test_to_datetime
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_datetime)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_datetime)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(1143214323).to_datetime)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new('1143214323').to_datetime)
-  end
-  
-  def test_to_i
-    assert_equal(1143214323,
-      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_i)
-    assert_equal(1143214323,
-      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_i)
-    assert_equal(1143214323,
-      TimeOrDateTime.new(1143214323).to_i)
-    assert_equal(1143214323,
-      TimeOrDateTime.new('1143214323').to_i)
-  end
-  
-  def test_to_orig
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3),
-      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_orig)
-    assert_equal(1143214323,
-      TimeOrDateTime.new(1143214323).to_orig)
-    assert_equal(1143214323,
-      TimeOrDateTime.new('1143214323').to_orig) 
-  end
-  
-  def test_to_s
-    assert_equal("Time: #{Time.utc(2006, 3, 24, 15, 32, 3).to_s}",
-      TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).to_s)
-    assert_equal("DateTime: #{DateTime.new(2006, 3, 24, 15, 32, 3)}",
-      TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).to_s)
-    assert_equal('Timestamp: 1143214323',
-      TimeOrDateTime.new(1143214323).to_s)
-    assert_equal('Timestamp: 1143214323',
-      TimeOrDateTime.new('1143214323').to_s) 
-  end
-  
-  def test_year
-    assert_equal(2006, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).year)
-    assert_equal(2006, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).year)
-    assert_equal(2006, TimeOrDateTime.new(1143214323).year)
-  end
-  
-  def test_mon
-    assert_equal(3, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).mon)
-    assert_equal(3, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).mon)
-    assert_equal(3, TimeOrDateTime.new(1143214323).mon)    
-  end
-  
-  def test_month
-    assert_equal(3, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).month)
-    assert_equal(3, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).month)
-    assert_equal(3, TimeOrDateTime.new(1143214323).month)
-  end
-  
-  def test_mday
-    assert_equal(24, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).mday)
-    assert_equal(24, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).mday)
-    assert_equal(24, TimeOrDateTime.new(1143214323).mday)
-  end
-  
-  def test_day
-    assert_equal(24, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).day)
-    assert_equal(24, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).day)
-    assert_equal(24, TimeOrDateTime.new(1143214323).day)
-  end
-  
-  def test_hour
-    assert_equal(15, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).hour)
-    assert_equal(15, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).hour)
-    assert_equal(15, TimeOrDateTime.new(1143214323).hour)
-  end
-  
-  def test_min
-    assert_equal(32, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).min)
-    assert_equal(32, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).min)
-    assert_equal(32, TimeOrDateTime.new(1143214323).min)
-  end
-  
-  def test_sec
-    assert_equal(3, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).sec)
-    assert_equal(3, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).sec)
-    assert_equal(3, TimeOrDateTime.new(1143214323).sec)
-  end
-  
-  def test_compare_timeordatetime_time
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 4)))
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2007, 3, 24, 15, 32, 3)))
-    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 2)))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2005, 3, 24, 15, 32, 3)))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 4)))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2007, 3, 24, 15, 32, 3)))
-    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 2)))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2005, 3, 24, 15, 32, 3)))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 4)))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2007, 3, 24, 15, 32, 3)))
-    assert_equal(0, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 2)))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(Time.utc(2005, 3, 24, 15, 32, 3)))
-  end
-  
-  def test_compare_timeordatetime_datetime
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 4)))
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)))
-    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 2)))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 4)))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)))
-    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 2)))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 4)))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)))
-    assert_equal(0, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 2)))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)))
-  end
-  
-  def test_compare_timeordatetime_timestamp
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214324))
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1174750323))
-    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214322))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1111678323))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214324))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1174750323))
-    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214322))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1111678323))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> TimeOrDateTime.new(1143214323))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1143214324))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1174750323))
-    assert_equal(0, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1143214323))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1143214322))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> TimeOrDateTime.new(1111678323))
-  end
-  
-  def test_compare_time
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 4))
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2007, 3, 24, 15, 32, 3))
-    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 2))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2005, 3, 24, 15, 32, 3))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 4))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2007, 3, 24, 15, 32, 3))
-    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 2))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> Time.utc(2005, 3, 24, 15, 32, 3))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> Time.utc(2006, 3, 24, 15, 32, 3))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> Time.utc(2006, 3, 24, 15, 32, 4))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> Time.utc(2007, 3, 24, 15, 32, 3))
-    assert_equal(0, TimeOrDateTime.new(1143214323) <=> Time.utc(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> Time.utc(2006, 3, 24, 15, 32, 2))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> Time.utc(2005, 3, 24, 15, 32, 3))
-  end
-  
-  def test_compare_datetime
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 4))
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2040, 3, 24, 15, 32, 3))
-    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 2))
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(1960, 3, 24, 15, 32, 3))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 4))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2040, 3, 24, 15, 32, 3))
-    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 2))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> DateTime.new(1960, 3, 24, 15, 32, 3))
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> DateTime.new(2006, 3, 24, 15, 32, 4))
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> DateTime.new(2040, 3, 24, 15, 32, 3))
-    assert_equal(0, TimeOrDateTime.new(1143214323) <=> DateTime.new(2006, 3, 24, 15, 32, 3))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> DateTime.new(2006, 3, 24, 15, 32, 2))
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> DateTime.new(1960, 3, 24, 15, 32, 3))
-  end
-  
-  def test_compare_timestamp
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1143214324)
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1174750323)
-    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1143214323)
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1143214322)
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> 1111678323)
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1143214324)
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1174750323)
-    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1143214323)
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1143214322)
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> 1111678323)
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> 1143214323)
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> 1143214323)
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> 1143214324)
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> 1174750323)
-    assert_equal(0, TimeOrDateTime.new(1143214323) <=> 1143214323)
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> 1143214322)
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> 1111678323)
-  end
-  
-  def test_compare_timestamp_str
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1143214324')
-    assert_equal(-1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1174750323')
-    assert_equal(0, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1143214323')
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1143214322')
-    assert_equal(1, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) <=> '1111678323')
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1143214324')
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1174750323')
-    assert_equal(0, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1143214323')
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1143214322')
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) <=> '1111678323')
-    assert_equal(-1, TimeOrDateTime.new(DateTime.new(1960, 3, 24, 15, 32, 3)) <=> '1143214323')
-    assert_equal(1, TimeOrDateTime.new(DateTime.new(2040, 3, 24, 15, 32, 3)) <=> '1143214323')
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> '1143214324')
-    assert_equal(-1, TimeOrDateTime.new(1143214323) <=> '1174750323')
-    assert_equal(0, TimeOrDateTime.new(1143214323) <=> '1143214323')
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> '1143214322')
-    assert_equal(1, TimeOrDateTime.new(1143214323) <=> '1111678323')
-  end
-  
-  def test_eql
-    assert_equal(true, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3))))
-    assert_equal(false, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3))))
-    assert_equal(false, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(1143214323)))
-    assert_equal(false, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new('1143214323')))
-    assert_equal(false, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 4))))
-    assert_equal(false, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).eql?(Object.new))
-    
-    assert_equal(false, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3))))
-    assert_equal(true, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3))))
-    assert_equal(false, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(1143214323)))
-    assert_equal(false, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new('1143214323')))
-    assert_equal(false, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).eql?(TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 4))))
-    assert_equal(false, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).eql?(Object.new))
-    
-    assert_equal(false, TimeOrDateTime.new(1143214323).eql?(TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3))))
-    assert_equal(false, TimeOrDateTime.new(1143214323).eql?(TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3))))
-    assert_equal(true, TimeOrDateTime.new(1143214323).eql?(TimeOrDateTime.new(1143214323)))
-    assert_equal(true, TimeOrDateTime.new(1143214323).eql?(TimeOrDateTime.new('1143214323')))
-    assert_equal(false, TimeOrDateTime.new(1143214323).eql?(TimeOrDateTime.new(1143214324)))
-    assert_equal(false, TimeOrDateTime.new(1143214323).eql?(Object.new))
-  end
-  
-  def test_hash
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3).hash, TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).hash)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3).hash, TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).hash)
-    assert_equal(1143214323.hash, TimeOrDateTime.new(1143214323).hash)
-    assert_equal(1143214323.hash, TimeOrDateTime.new('1143214323').hash)
-  end
-  
-  def test_add
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) + 0).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) + 0).to_orig)
-    assert_equal(1143214323, (TimeOrDateTime.new(1143214323) + 0).to_orig)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) + 1).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) + 1).to_orig)
-    assert_equal(1143214324, (TimeOrDateTime.new(1143214323) + 1).to_orig)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) + (-1)).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) + (-1)).to_orig)
-    assert_equal(1143214322, (TimeOrDateTime.new(1143214323) + (-1)).to_orig)
-  end
-  
-  def test_subtract     
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) - 0).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) - 0).to_orig)   
-    assert_equal(1143214323, (TimeOrDateTime.new(1143214323) - 0).to_orig)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) - 1).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) - 1).to_orig)
-    assert_equal(1143214322, (TimeOrDateTime.new(1143214323) - 1).to_orig)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)) - (-1)).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), (TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)) - (-1)).to_orig)
-    assert_equal(1143214324, (TimeOrDateTime.new(1143214323) - (-1)).to_orig)
-  end
-  
-  def test_add_with_convert
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).add_with_convert(0).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).add_with_convert(0).to_orig)
-    assert_equal(1143214323, TimeOrDateTime.new(1143214323).add_with_convert(0).to_orig)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).add_with_convert(1).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).add_with_convert(1).to_orig)
-    assert_equal(1143214324, TimeOrDateTime.new(1143214323).add_with_convert(1).to_orig)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 2), TimeOrDateTime.new(Time.utc(2006, 3, 24, 15, 32, 3)).add_with_convert(-1).to_orig)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 2), TimeOrDateTime.new(DateTime.new(2006, 3, 24, 15, 32, 3)).add_with_convert(-1).to_orig)
-    assert_equal(1143214322, TimeOrDateTime.new(1143214323).add_with_convert(-1).to_orig)
-    
-    assert_equal(DateTime.new(1969, 12, 31, 23, 59, 59), TimeOrDateTime.new(Time.utc(1970, 1, 1, 0, 0, 0)).add_with_convert(-1).to_orig)
-    assert_equal(DateTime.new(2038, 1, 19, 3, 14, 8), TimeOrDateTime.new(Time.utc(2038, 1, 19, 3, 14, 7)).add_with_convert(1).to_orig)
-  end
-  
-  def test_wrap_time
-    t = TimeOrDateTime.wrap(Time.utc(2006, 3, 24, 15, 32, 3))
-    assert_instance_of(TimeOrDateTime, t)
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), t.to_orig)
-  end
-  
-  def test_wrap_datetime
-    t = TimeOrDateTime.wrap(DateTime.new(2006, 3, 24, 15, 32, 3))
-    assert_instance_of(TimeOrDateTime, t)
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), t.to_orig)
-  end
-  
-  def test_wrap_timestamp
-    t = TimeOrDateTime.wrap(1143214323)
-    assert_instance_of(TimeOrDateTime, t)
-    assert_equal(1143214323, t.to_orig)
-  end 
-  
-  def test_wrap_timestamp_str
-    t = TimeOrDateTime.wrap('1143214323')
-    assert_instance_of(TimeOrDateTime, t)
-    assert_equal(1143214323, t.to_orig)
-  end
-
-  def test_wrap_timeordatetime
-    t = TimeOrDateTime.new(1143214323)
-    t2 = TimeOrDateTime.wrap(t)
-    assert_same(t, t2)    
-  end
-  
-  def test_wrap_block_time
-    assert_equal(Time.utc(2006, 3, 24, 15, 32, 4), TimeOrDateTime.wrap(Time.utc(2006, 3, 24, 15, 32, 3)) {|t|
-      assert_instance_of(TimeOrDateTime, t)
-      assert_equal(Time.utc(2006, 3, 24, 15, 32, 3), t.to_orig)
-      t + 1
-    })
-  end
-  
-  def test_wrap_block_datetime
-    assert_equal(DateTime.new(2006, 3, 24, 15, 32, 4), TimeOrDateTime.wrap(DateTime.new(2006, 3, 24, 15, 32, 3)) {|t|
-      assert_instance_of(TimeOrDateTime, t)
-      assert_equal(DateTime.new(2006, 3, 24, 15, 32, 3), t.to_orig)
-      t + 1
-    })
-  end
-  
-  def test_wrap_block_timestamp
-    assert_equal(1143214324, TimeOrDateTime.wrap(1143214323) {|t|
-      assert_instance_of(TimeOrDateTime, t)
-      assert_equal(1143214323, t.to_orig)
-      t + 1
-    })
-  end
-  
-  def test_wrap_block_timestamp_str
-    assert_equal(1143214324, TimeOrDateTime.wrap('1143214323') {|t|
-      assert_instance_of(TimeOrDateTime, t)
-      assert_equal(1143214323, t.to_orig)
-      t + 1
-    })
-  end
-  
-  def test_wrap_block_timeordatetime
-    t1 = TimeOrDateTime.new(1143214323)
-        
-    t2 = TimeOrDateTime.wrap(t1) {|t|
-      assert_same(t1, t)
-      t + 1           
-    }
-      
-    assert_not_nil(t2)
-    assert_instance_of(TimeOrDateTime, t2)
-    assert_equal(1143214324, t2.to_orig)
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,834 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/data_timezone'
-require 'tzinfo/linked_timezone'
-require 'tzinfo/time_or_datetime'
-require 'tzinfo/timezone'
-require 'tzinfo/timezone_offset_info'
-require 'tzinfo/timezone_period'
-require 'tzinfo/timezone_proxy'
-require 'tzinfo/timezone_transition_info'
-
-include TZInfo
-
-class TCTimezone < Test::Unit::TestCase
-
-  class BlockCalled < StandardError
-  end
-  
-  class TestTimezone < Timezone
-    def self.new(identifier, period_for_utc = nil, periods_for_local = nil, expected = nil)
-      t = super()
-      t.send(:setup, identifier, period_for_utc, periods_for_local, expected)
-      t
-    end
-    
-    def identifier
-      @identifier
-    end
-    
-    def period_for_utc(utc)
-      utc = TimeOrDateTime.wrap(utc)
-      raise "Unexpected utc #{utc} in period_for_utc" unless @expected.eql?(utc)
-      @period_for_utc
-    end
-    
-    def periods_for_local(local)            
-      local = TimeOrDateTime.wrap(local)
-      raise "Unexpected local #{local} in periods_for_local" unless @expected.eql?(local)
-      @periods_for_local.clone        
-    end
-    
-    private
-      def setup(identifier, period_for_utc, periods_for_local, expected)
-        @identifier = identifier
-        @period_for_utc = period_for_utc
-        @periods_for_local = periods_for_local || []
-        @expected = TimeOrDateTime.wrap(expected)
-      end
-  end
-  
-  def test_get_valid_1
-    tz = Timezone.get('Europe/London')
-    
-    assert_kind_of(DataTimezone, tz)
-    assert_equal('Europe/London', tz.identifier)
-  end
-  
-  def test_get_valid_2
-    tz = Timezone.get('UTC')
-    
-    assert_kind_of(LinkedTimezone, tz)    
-    assert_equal('UTC', tz.identifier)
-  end
-  
-  def test_get_valid_3
-    tz = Timezone.get('America/Argentina/Buenos_Aires')
-    
-    assert_kind_of(DataTimezone, tz)
-    assert_equal('America/Argentina/Buenos_Aires', tz.identifier)
-  end
-  
-  def test_get_same_instance
-    tz1 = Timezone.get('Europe/London')
-    tz2 = Timezone.get('Europe/London')
-    assert_same(tz1, tz2)
-  end
-  
-  def test_get_not_exist
-    assert_raise(InvalidTimezoneIdentifier) { Timezone.get('Nowhere/Special') }
-  end
-  
-  def test_get_invalid
-    assert_raise(InvalidTimezoneIdentifier) { Timezone.get('../Definitions/UTC') }
-  end
-  
-  def test_get_nil
-    assert_raise(InvalidTimezoneIdentifier) { Timezone.get(nil) }
-  end
-  
-  def test_get_plus
-    tz = Timezone.get('Etc/GMT+1')
-    
-    assert_equal('Etc/GMT+1', tz.identifier)
-  end
-  
-  def test_get_minus
-    tz = Timezone.get('Etc/GMT-1')
-    
-    assert_equal('Etc/GMT-1', tz.identifier)
-  end
-  
-  def test_get_case    
-    Timezone.get('Europe/Prague')
-    assert_raise(InvalidTimezoneIdentifier) { Timezone.get('Europe/prague') }
-  end
-  
-  def test_get_proxy_valid
-    proxy = Timezone.get_proxy('Europe/London')
-    assert_kind_of(TimezoneProxy, proxy)
-    assert_equal('Europe/London', proxy.identifier)
-  end
-  
-  def test_get_proxy_not_exist
-    proxy = Timezone.get_proxy('Not/There')
-    assert_kind_of(TimezoneProxy, proxy)
-    assert_equal('Not/There', proxy.identifier)
-  end
-  
-  def test_get_proxy_invalid
-    proxy = Timezone.get_proxy('../Invalid/Identifier')
-    assert_kind_of(TimezoneProxy, proxy)
-    assert_equal('../Invalid/Identifier', proxy.identifier)
-  end
-  
-  def test_new_no_args
-    tz = Timezone.new
-    
-    assert_raise(UnknownTimezone) { tz.identifier }
-    assert_raise(UnknownTimezone) { tz.friendly_identifier }
-    assert_raise(UnknownTimezone) { tz.utc_to_local(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.local_to_utc(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.period_for_utc(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.periods_for_local(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.period_for_local(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.now }
-    assert_raise(UnknownTimezone) { tz.current_period_and_time } 
-  end
-  
-  def test_new_nil
-    tz = Timezone.new(nil)
-    
-    assert_raise(UnknownTimezone) { tz.identifier }
-    assert_raise(UnknownTimezone) { tz.friendly_identifier }
-    assert_raise(UnknownTimezone) { tz.utc_to_local(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.local_to_utc(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.period_for_utc(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.periods_for_local(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.period_for_local(DateTime.new(2006,1,1,1,0,0)) }
-    assert_raise(UnknownTimezone) { tz.now }
-    assert_raise(UnknownTimezone) { tz.current_period_and_time } 
-  end
-  
-  def test_new_arg
-    tz = Timezone.new('Europe/London')
-    assert_same(Timezone.get('Europe/London'), tz)    
-  end
-  
-  def test_new_arg_not_exist    
-    assert_raise(InvalidTimezoneIdentifier) { Timezone.new('Nowhere/Special') }
-  end 
-  
-  def test_all
-    all = Timezone.all
-    expected = Indexes::Timezones.timezones.collect {|identifier| Timezone.get_proxy(identifier)}
-    assert_equal(expected, all)
-  end
-  
-  def test_all_identifiers
-    all = Timezone.all_identifiers
-    assert_equal(Indexes::Timezones.timezones, all)
-  end
-  
-  def test_all_data_zones
-    all_data = Timezone.all_data_zones
-    expected = Indexes::Timezones.data_timezones.collect {|identifier| Timezone.get_proxy(identifier)}
-    assert_equal(expected, all_data)
-  end
-  
-  def test_all_data_zone_identifiers
-    all_data = Timezone.all_data_zone_identifiers
-    assert_equal(Indexes::Timezones.data_timezones, all_data)
-  end
-  
-  def test_all_linked_zones
-    all_linked = Timezone.all_linked_zones
-    expected = Indexes::Timezones.linked_timezones.collect {|identifier| Timezone.get_proxy(identifier)}
-    assert_equal(expected, all_linked)
-  end
-  
-  def test_all_linked_zone_identifiers
-    all_linked = Timezone.all_linked_zone_identifiers
-    assert_equal(Indexes::Timezones.linked_timezones, all_linked)
-  end
-  
-  def test_all_country_zones
-    # Probably should relax this test - just need all the zones, don't care
-    # about order.
-    expected = Country.all.inject([]) {|expected,country|
-      expected += country.zones
-    }
-    expected.uniq!
-    
-    all_country_zones = Timezone.all_country_zones
-    assert_equal(expected, all_country_zones)
-    
-    all_country_zone_identifiers = Timezone.all_country_zone_identifiers
-    assert_equal(all_country_zone_identifiers.length, all_country_zones.length)
-    
-    all_country_zones.each {|zone|
-      assert_kind_of(TimezoneProxy, zone)
-      assert(all_country_zone_identifiers.include?(zone.identifier))
-    }            
-  end
-  
-  def test_all_country_zone_identifiers
-    # Probably should relax this test - just need all the zones, don't care
-    # about order.
-    expected = Country.all.inject([]) {|expected,country|
-      expected += country.zone_identifiers
-    }
-    expected.uniq!
-        
-    assert_equal(expected, Timezone.all_country_zone_identifiers)
-  end
-  
-  def test_us_zones   
-    # Probably should relax this test - just need all the zones, don't care
-    # about order.
-    us_zones = Timezone.us_zones
-    assert_equal(Country.get('US').zones.uniq, us_zones)
-    
-    us_zone_identifiers = Timezone.us_zone_identifiers
-    assert_equal(us_zone_identifiers.length, us_zones.length)
-    
-    us_zones.each {|zone|
-      assert_kind_of(TimezoneProxy, zone)
-      assert(us_zone_identifiers.include?(zone.identifier))
-    }
-  end
-  
-  def test_us_zone_identifiers
-    # Probably should relax this test - just need all the zones, don't care
-    # about order.        
-    assert_equal(Country.get('US').zone_identifiers.uniq, Timezone.us_zone_identifiers)
-  end    
-  
-  def test_identifier
-    assert_raise(UnknownTimezone) { Timezone.new.identifier }    
-    assert_equal('Europe/Paris', TestTimezone.new('Europe/Paris').identifier)
-  end
-  
-  def test_name
-    assert_raise(UnknownTimezone) { Timezone.new.name }    
-    assert_equal('Europe/Paris', TestTimezone.new('Europe/Paris').name)    
-  end
-  
-  def test_friendly_identifier
-    assert_equal('Paris', TestTimezone.new('Europe/Paris').friendly_identifier(true))
-    assert_equal('Europe - Paris', TestTimezone.new('Europe/Paris').friendly_identifier(false))
-    assert_equal('Europe - Paris', TestTimezone.new('Europe/Paris').friendly_identifier)
-    assert_equal('Knox, Indiana', TestTimezone.new('America/Indiana/Knox').friendly_identifier(true))
-    assert_equal('America - Knox, Indiana', TestTimezone.new('America/Indiana/Knox').friendly_identifier(false))
-    assert_equal('America - Knox, Indiana', TestTimezone.new('America/Indiana/Knox').friendly_identifier)
-    assert_equal('Dumont D\'Urville', TestTimezone.new('Antarctica/DumontDUrville').friendly_identifier(true))
-    assert_equal('Antarctica - Dumont D\'Urville', TestTimezone.new('Antarctica/DumontDUrville').friendly_identifier(false))
-    assert_equal('Antarctica - Dumont D\'Urville', TestTimezone.new('Antarctica/DumontDUrville').friendly_identifier)
-    assert_equal('McMurdo', TestTimezone.new('Antarctica/McMurdo').friendly_identifier(true))
-    assert_equal('Antarctica - McMurdo', TestTimezone.new('Antarctica/McMurdo').friendly_identifier(false))
-    assert_equal('Antarctica - McMurdo', TestTimezone.new('Antarctica/McMurdo').friendly_identifier)
-    assert_equal('GMT+1', TestTimezone.new('Etc/GMT+1').friendly_identifier(true))
-    assert_equal('Etc - GMT+1', TestTimezone.new('Etc/GMT+1').friendly_identifier(false))
-    assert_equal('Etc - GMT+1', TestTimezone.new('Etc/GMT+1').friendly_identifier)
-    assert_equal('UTC', TestTimezone.new('UTC').friendly_identifier(true))
-    assert_equal('UTC', TestTimezone.new('UTC').friendly_identifier(false))
-    assert_equal('UTC', TestTimezone.new('UTC').friendly_identifier)
-  end
-  
-  def test_to_s
-    assert_equal('Europe - Paris', TestTimezone.new('Europe/Paris').to_s)
-    assert_equal('America - Knox, Indiana', TestTimezone.new('America/Indiana/Knox').to_s)
-    assert_equal('Antarctica - Dumont D\'Urville', TestTimezone.new('Antarctica/DumontDUrville').to_s)
-    assert_equal('Antarctica - McMurdo', TestTimezone.new('Antarctica/McMurdo').to_s)
-    assert_equal('Etc - GMT+1', TestTimezone.new('Etc/GMT+1').to_s)
-    assert_equal('UTC', TestTimezone.new('UTC').to_s)
-  end    
-    
-  def test_period_for_local
-    dt = DateTime.new(2005,2,18,16,24,23)
-    dt2 = DateTime.new(2005,2,18,16,24,23).new_offset(Rational(5,24))
-    t = Time.utc(2005,2,18,16,24,23)
-    t2 = Time.local(2005,2,18,16,24,23)
-    ts = t.to_i
-    
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
-        
-    period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o1, o2, 1099184400),
-      TimezoneTransitionInfo.new(o2, o1, 1111885200))
-    
-    dt_period = TestTimezone.new('Europe/London', nil, [period], dt).period_for_local(dt)
-    dt2_period = TestTimezone.new('Europe/London', nil, [period], dt2).period_for_local(dt2)
-    t_period = TestTimezone.new('Europe/London', nil, [period], t).period_for_local(t)
-    t2_period = TestTimezone.new('Europe/London', nil, [period], t2).period_for_local(t2)
-    ts_period = TestTimezone.new('Europe/London', nil, [period], ts).period_for_local(ts)        
-    
-    assert_equal(period, dt_period)
-    assert_equal(period, dt2_period)
-    assert_equal(period, t_period)
-    assert_equal(period, t2_period)
-    assert_equal(period, ts_period)    
-  end
-  
-  def test_period_for_local_invalid
-    dt = DateTime.new(2004,4,4,2,30,0)
-    tz = TestTimezone.new('America/New_York', nil, [], dt)
-    
-    assert_raise(PeriodNotFound) do
-      tz.period_for_local(dt)
-    end
-  end
-  
-  def test_period_for_local_ambiguous    
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1, 0,0)
-    t = Time.utc(2004,10,31,1,30,0)
-    i = Time.utc(2004,10,31,1,59,59).to_i
-    
-    dt_tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-    t_tz = TestTimezone.new('America/New_York', nil, [p1, p2], t)
-    i_tz = TestTimezone.new('America/New_York', nil, [p1, p2], i)
-        
-    assert_raise(AmbiguousTime) { dt_tz.period_for_local(dt) }
-    assert_raise(AmbiguousTime) { t_tz.period_for_local(t) }
-    assert_raise(AmbiguousTime) { i_tz.period_for_local(i) }
-  end
-  
-  def test_period_for_local_not_found
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1067148000)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1099202400)    
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,4,4,2,0,0)
-    t = Time.utc(2004,4,4,2,30,0)
-    i = Time.utc(2004,4,4,2,59,59).to_i
-    
-    dt_tz = TestTimezone.new('America/New_York', nil, [], dt)
-    t_tz = TestTimezone.new('America/New_York', nil, [], t)
-    i_tz = TestTimezone.new('America/New_York', nil, [], i)
-        
-    assert_raise(PeriodNotFound) { dt_tz.period_for_local(dt) }
-    assert_raise(PeriodNotFound) { t_tz.period_for_local(t) }
-    assert_raise(PeriodNotFound) { i_tz.period_for_local(i) }
-  end
-  
-  def test_period_for_local_dst_flag_resolved
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)
-    
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-
-    assert_equal(p1, tz.period_for_local(dt, true))
-    assert_equal(p2, tz.period_for_local(dt, false))
-    assert_equal(p1, tz.period_for_local(dt, true) {|periods| raise BlockCalled, 'should not be called' })
-    assert_equal(p2, tz.period_for_local(dt, false) {|periods| raise BlockCalled, 'should not be called' })
-  end
-  
-  def test_period_for_local_dst_block_called
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)
-    
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-    
-    assert_raise(BlockCalled) {
-      tz.period_for_local(dt) {|periods|        
-        assert_equal([p1, p2], periods)
-        
-        # raise exception to test that the block was called
-        raise BlockCalled, 'should be raised'
-      }
-    }
-    
-    assert_equal(p1, tz.period_for_local(dt) {|periods| periods.first})
-    assert_equal(p2, tz.period_for_local(dt) {|periods| periods.last})
-    assert_equal(p1, tz.period_for_local(dt) {|periods| [periods.first]})
-    assert_equal(p2, tz.period_for_local(dt) {|periods| [periods.last]})
-  end
-  
-  def test_period_for_local_dst_cannot_resolve
-    # At midnight local time on Aug 5 1915 in Warsaw, the clocks were put back
-    # 24 minutes and both periods were non-DST. Hence the block should be
-    # called regardless of the value of the Boolean dst parameter.
-    
-    o0 = TimezoneOffsetInfo.new(5040, 0, :LMT)
-    o1 = TimezoneOffsetInfo.new(5040, 0, :WMT)
-    o2 = TimezoneOffsetInfo.new(3600, 0, :CET)
-    o3 = TimezoneOffsetInfo.new(3600, 3600, :CEST)
-    
-    t1 = TimezoneTransitionInfo.new(o1, o0, 288925853, 120)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 290485733, 120)
-    t3 = TimezoneTransitionInfo.new(o3, o2, 29051813, 12)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(1915,8,4,23,40,0)
-    
-    tz = TestTimezone.new('Europe/Warsaw', nil, [p1, p2], dt)
-        
-    assert_raise(BlockCalled) {
-      tz.period_for_local(dt, true) {|periods|
-        assert_equal([p1, p2], periods)        
-        raise BlockCalled, 'should be raised'
-      }
-    }
-    
-    assert_raise(BlockCalled) {
-      tz.period_for_local(dt, false) {|periods|
-        assert_equal([p1, p2], periods)
-        raise BlockCalled, 'should be raised'
-      }
-    }    
-  end
-  
-  def test_period_for_local_block_ambiguous
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)
-    
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-        
-    assert_raise(AmbiguousTime) do
-      tz.period_for_local(dt) {|periods| nil}
-    end
-    
-    assert_raise(AmbiguousTime) do
-      tz.period_for_local(dt) {|periods| periods}
-    end
-    
-    assert_raise(AmbiguousTime) do
-      tz.period_for_local(dt) {|periods| []}
-    end
-    
-    assert_raise(AmbiguousTime) do
-      tz.period_for_local(dt) {|periods| raise AmbiguousTime, 'Ambiguous time'}
-    end
-  end
-   
-  def test_utc_to_local
-    dt = DateTime.new(2005,6,18,16,24,23)
-    dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5,24))
-    t = Time.utc(2005,6,18,16,24,23)
-    t2 = Time.local(2005,6,18,16,24,23)
-    ts = t.to_i
-    
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
-        
-    period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
-        
-    assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt).utc_to_local(dt))   
-    assert_equal(DateTime.new(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], dt2).utc_to_local(dt2))    
-    assert_equal(Time.utc(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], t).utc_to_local(t))
-    assert_equal(Time.utc(2005,6,18,17,24,23), TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2))
-    assert_equal(Time.utc(2005,6,18,17,24,23).to_i, TestTimezone.new('Europe/London', period, [], ts).utc_to_local(ts))
-  end
-  
-  def test_utc_to_local_offset
-    dt = DateTime.new(2005,6,18,16,24,23)
-    dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5,24))
-    t = Time.utc(2005,6,18,16,24,23)
-    t2 = Time.local(2005,6,18,16,24,23)
-    
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
-        
-    period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
-    
-    assert_equal(0, TestTimezone.new('Europe/London', period, [], dt).utc_to_local(dt).offset)
-    assert_equal(0, TestTimezone.new('Europe/London', period, [], dt2).utc_to_local(dt2).offset)
-    assert_equal(0, TestTimezone.new('Europe/London', period, [], t).utc_to_local(t).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], t).utc_to_local(t).zone)
-    assert_equal(0, TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', period, [], t2).utc_to_local(t2).zone)
-  end
-  
-  def test_local_to_utc
-    dt = DateTime.new(2005,6,18,16,24,23)
-    dt2 = DateTime.new(2005,6,18,16,24,23)
-    t = Time.utc(2005,6,18,16,24,23)
-    t2 = Time.local(2005,6,18,16,24,23)
-    ts = t.to_i
-        
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
-        
-    period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
-    
-    assert_equal(DateTime.new(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], dt).local_to_utc(dt))
-    assert_equal(DateTime.new(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], dt2).local_to_utc(dt2))    
-    assert_equal(Time.utc(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t))
-    assert_equal(Time.utc(2005,6,18,15,24,23), TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2))
-    assert_equal(Time.utc(2005,6,18,15,24,23).to_i, TestTimezone.new('Europe/London', nil, [period], ts).local_to_utc(ts))
-  end
-  
-  def test_local_to_utc_offset
-    dt = DateTime.new(2005,6,18,16,24,23)
-    dt2 = DateTime.new(2005,6,18,16,24,23).new_offset(Rational(5,24))
-    t = Time.utc(2005,6,18,16,24,23)
-    t2 = Time.local(2005,6,18,16,24,23)
-    
-    o1 = TimezoneOffsetInfo.new(0, 0, :GMT)
-    o2 = TimezoneOffsetInfo.new(0, 3600, :BST)
-        
-    period = TimezonePeriod.new(
-      TimezoneTransitionInfo.new(o2, o1, 1111885200),
-      TimezoneTransitionInfo.new(o1, o2, 1130634000))
-    
-    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dt).local_to_utc(dt).offset)
-    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], dt2).local_to_utc(dt2).offset)
-    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], t).local_to_utc(t).zone)
-    assert_equal(0, TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2).utc_offset)
-    assert_equal('UTC', TestTimezone.new('Europe/London', nil, [period], t2).local_to_utc(t2).zone)
-  end
-  
-  def test_local_to_utc_invalid
-    dt = DateTime.new(2004,4,4,2,30,0)
-    tz = TestTimezone.new('America/New_York', nil, [], dt)        
-    assert_raise(PeriodNotFound) { tz.local_to_utc(dt) }
-    
-    t = Time.utc(2004,4,4,2,30,0)
-    tz = TestTimezone.new('America/New_York', nil, [], t)        
-    assert_raise(PeriodNotFound) { tz.local_to_utc(t) }
-    
-    i = Time.utc(2004,4,4,2,30,0).to_i
-    tz = TestTimezone.new('America/New_York', nil, [], i)        
-    assert_raise(PeriodNotFound) { tz.local_to_utc(i) }    
-  end
-  
-  def test_local_to_utc_ambiguous
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)    
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-    assert_raise(AmbiguousTime) { tz.local_to_utc(dt) }
-    
-    t = Time.utc(2004,10,31,1,30,0)
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], t)
-    assert_raise(AmbiguousTime) { tz.local_to_utc(t) }
-
-    i = Time.utc(2004,10,31,1,30,0).to_i
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], i)
-    assert_raise(AmbiguousTime) { tz.local_to_utc(i) }    
-  end
-  
-  def test_local_to_utc_not_found
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1067148000)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1099202400)    
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,4,4,2,0,0)
-    t = Time.utc(2004,4,4,2,30,0)
-    i = Time.utc(2004,4,4,2,59,59).to_i
-    
-    dt_tz = TestTimezone.new('America/New_York', nil, [], dt)
-    t_tz = TestTimezone.new('America/New_York', nil, [], t)
-    i_tz = TestTimezone.new('America/New_York', nil, [], i)
-        
-    assert_raise(PeriodNotFound) { dt_tz.local_to_utc(dt) }
-    assert_raise(PeriodNotFound) { t_tz.local_to_utc(t) }
-    assert_raise(PeriodNotFound) { i_tz.local_to_utc(i) }
-  end
-  
-  def test_local_to_utc_dst_flag_resolved
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)    
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-        
-    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt, true))
-    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt, false))
-    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt, true) {|periods| raise BlockCalled, 'should not be called' })
-    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt, false) {|periods| raise BlockCalled, 'should not be called' })
-  end
-  
-  def test_local_to_utc_dst_block_called
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)    
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-    
-    assert_raise(BlockCalled) {
-      tz.local_to_utc(dt) {|periods|
-        assert_equal([p1, p2], periods)                
-        
-        # raise exception to test that the block was called
-        raise BlockCalled, 'should be raised'
-      }
-    }
-    
-    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt) {|periods| periods.first})
-    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt) {|periods| periods.last})
-    assert_equal(DateTime.new(2004,10,31,5,30,0), tz.local_to_utc(dt) {|periods| [periods.first]})
-    assert_equal(DateTime.new(2004,10,31,6,30,0), tz.local_to_utc(dt) {|periods| [periods.last]})
-  end
-  
-  def test_local_to_utc_dst_cannot_resolve
-    # At midnight local time on Aug 5 1915 in Warsaw, the clocks were put back
-    # 24 minutes and both periods were non-DST. Hence the block should be
-    # called regardless of the value of the Boolean dst parameter.
-
-    o0 = TimezoneOffsetInfo.new(5040, 0, :LMT)
-    o1 = TimezoneOffsetInfo.new(5040, 0, :WMT)
-    o2 = TimezoneOffsetInfo.new(3600, 0, :CET)
-    o3 = TimezoneOffsetInfo.new(3600, 3600, :CEST)
-    
-    t1 = TimezoneTransitionInfo.new(o1, o0, 288925853, 120)
-    t2 = TimezoneTransitionInfo.new(o2, o1, 290485733, 120)
-    t3 = TimezoneTransitionInfo.new(o3, o2, 29051813, 12)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(1915,8,4,23,40,0)
-    
-    tz = TestTimezone.new('Europe/Warsaw', nil, [p1, p2], dt)
-        
-    assert_raise(BlockCalled) do
-      tz.local_to_utc(dt, true) do |periods|
-        assert_equal([p1, p2], periods)        
-        raise BlockCalled, 'should be raised'
-      end
-    end
-    
-    assert_raise(BlockCalled) do
-      tz.local_to_utc(dt, false) do |periods|
-        assert_equal([p1, p2], periods)        
-        raise BlockCalled, 'should be raised'
-      end
-    end
-    
-    assert_equal(DateTime.new(1915,8,4,22,16,0), tz.local_to_utc(dt) {|periods| periods.first})
-    assert_equal(DateTime.new(1915,8,4,22,40,0), tz.local_to_utc(dt) {|periods| periods.last})
-    assert_equal(DateTime.new(1915,8,4,22,16,0), tz.local_to_utc(dt) {|periods| [periods.first]})
-    assert_equal(DateTime.new(1915,8,4,22,40,0), tz.local_to_utc(dt) {|periods| [periods.last]})
-  end
-  
-  def test_local_to_utc_block_ambiguous    
-    o1 = TimezoneOffsetInfo.new(-18000, 0, :EST)
-    o2 = TimezoneOffsetInfo.new(-18000, 3600, :EDT)
-    
-    t1 = TimezoneTransitionInfo.new(o2, o1, 1081062000)
-    t2 = TimezoneTransitionInfo.new(o1, o2, 1099202400)
-    t3 = TimezoneTransitionInfo.new(o2, o1, 1112511600)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t2, t3)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)    
-    tz = TestTimezone.new('America/New_York', nil, [p1, p2], dt)
-    
-    dt = DateTime.new(2004,10,31,1,30,0)
-    tz = Timezone.get('America/New_York')
-    
-    assert_raise(AmbiguousTime) { tz.local_to_utc(dt) {|periods| nil} }    
-    assert_raise(AmbiguousTime) { tz.local_to_utc(dt) {|periods| periods} }     
-    assert_raise(AmbiguousTime) { tz.local_to_utc(dt) {|periods| []} }    
-    assert_raise(AmbiguousTime) { tz.local_to_utc(dt) {|periods| raise AmbiguousTime, 'Ambiguous time'} }
-  end
-  
-  def test_now
-    assert_kind_of(Time, Timezone.get('Europe/London').now)
-  end
-  
-  def test_current_period
-    assert_kind_of(TimezonePeriod, Timezone.get('Europe/London').current_period)
-  end
-  
-  def test_current_period_and_time
-    current = Timezone.get('Europe/London').current_period_and_time
-    assert_equal(2, current.length)
-    assert_kind_of(Time, current[0])
-    assert_kind_of(TimezonePeriod, current[1])
-  end
-  
-  def test_current_time_and_period
-    current = Timezone.get('Europe/London').current_time_and_period
-    assert_equal(2, current.length)
-    assert_kind_of(Time, current[0])
-    assert_kind_of(TimezonePeriod, current[1])
-  end
-    
-  def test_compare
-    assert_equal(0, TestTimezone.new('Europe/London') <=> TestTimezone.new('Europe/London'))
-    assert_equal(-1, TestTimezone.new('Europe/London') <=> TestTimezone.new('Europe/london'))
-    assert_equal(-1, TestTimezone.new('Europe/London') <=> TestTimezone.new('Europe/Paris'))
-    assert_equal(1, TestTimezone.new('Europe/Paris') <=> TestTimezone.new('Europe/London'))
-    assert_equal(-1, TestTimezone.new('America/New_York') <=> TestTimezone.new('Europe/Paris'))
-    assert_equal(1, TestTimezone.new('Europe/Paris') <=> TestTimezone.new('America/New_York'))    
-  end
-  
-  def test_equality
-    assert_equal(true, TestTimezone.new('Europe/London') == TestTimezone.new('Europe/London'))
-    assert_equal(false, TestTimezone.new('Europe/London') == TestTimezone.new('Europe/london'))
-    assert_equal(false, TestTimezone.new('Europe/London') == TestTimezone.new('Europe/Paris'))
-    assert_nil(TestTimezone.new('Europe/London') == Object.new)
-  end
-  
-  def test_eql
-    assert_equal(true, TestTimezone.new('Europe/London').eql?(TestTimezone.new('Europe/London')))
-    assert_equal(false, TestTimezone.new('Europe/London').eql?(TestTimezone.new('Europe/london')))
-    assert_equal(false, TestTimezone.new('Europe/London').eql?(TestTimezone.new('Europe/Paris')))
-    assert_nil(TestTimezone.new('Europe/London') == Object.new)
-  end
-  
-  def test_hash
-    assert_equal('Europe/London'.hash, TestTimezone.new('Europe/London').hash)
-    assert_equal('America/New_York'.hash, TestTimezone.new('America/New_York').hash)
-  end
-  
-  def test_marshal_data
-    tz = Timezone.get('Europe/London')
-    assert_kind_of(DataTimezone, tz)
-    assert_same(tz, Marshal.load(Marshal.dump(tz)))    
-  end
-  
-  def test_marshal_linked
-    tz = Timezone.get('UTC')
-    assert_kind_of(LinkedTimezone, tz)
-    assert_same(tz, Marshal.load(Marshal.dump(tz)))    
-  end
-  
-  def test_strftime_datetime
-    tz = Timezone.get('Europe/London')
-    assert_equal('23:12:02 BST', tz.strftime('%H:%M:%S %Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
-    assert_equal('BST', tz.strftime('%Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
-    assert_equal('%ZBST', tz.strftime('%%Z%Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
-    assert_equal('BST BST', tz.strftime('%Z %Z', DateTime.new(1965, 7, 15, 22, 12, 2)))
-  end
-  
-  def test_strftime_time
-    tz = Timezone.get('Europe/London')
-    assert_equal('23:12:02 BST', tz.strftime('%H:%M:%S %Z', Time.utc(2006, 7, 15, 22, 12, 2)))
-    assert_equal('BST', tz.strftime('%Z', Time.utc(2006, 7, 15, 22, 12, 2)))
-    assert_equal('%ZBST', tz.strftime('%%Z%Z', Time.utc(2006, 7, 15, 22, 12, 2)))
-    assert_equal('BST BST', tz.strftime('%Z %Z', Time.utc(2006, 7, 15, 22, 12, 2)))
-  end
-  
-  def test_strftime_int
-    tz = Timezone.get('Europe/London')
-    assert_equal('23:12:02 BST', tz.strftime('%H:%M:%S %Z', Time.utc(2006, 7, 15, 22, 12, 2).to_i))
-    assert_equal('BST', tz.strftime('%Z', Time.utc(2006, 7, 15, 22, 12, 2).to_i))
-    assert_equal('%ZBST', tz.strftime('%%Z%Z', Time.utc(2006, 7, 15, 22, 12, 2).to_i))
-    assert_equal('BST BST', tz.strftime('%Z %Z', Time.utc(2006, 7, 15, 22, 12, 2).to_i))
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_definition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_definition.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_definition.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_definition.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,115 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone_definition'
-
-include TZInfo
-
-class TCTimezoneDefinition < Test::Unit::TestCase
-
-  module DataTest
-    include TimezoneDefinition
-    
-    timezone 'Test/Data/Zone' do |tz|
-      tz.offset :o0, -75, 0, :LMT
-      tz.offset :o1,   0, 0, :GMT
-      
-      tz.transition 1847, 12, :o1, 2760187969, 1152 
-    end
-  end
-  
-  module LinkedTest
-    include TimezoneDefinition
-    
-    linked_timezone 'Test/Linked/Zone', 'Test/Linked_To/Zone'
-  end
-  
-  module DoubleDataTest
-    include TimezoneDefinition
-    
-    timezone 'Test/Data/Zone1' do |tz|
-      tz.offset :o0, -75, 0, :LMT
-      tz.offset :o1,   0, 0, :GMT
-      
-      tz.transition 1847, 12, :o1, 2760187969, 1152 
-    end
-    
-    timezone 'Test/Data/Zone2' do |tz|
-      tz.offset :o0, 75, 0, :LMT
-      tz.offset :o1,  0, 0, :GMT
-      
-      tz.transition 1847, 12, :o1, 2760187969, 1152 
-    end
-  end
-  
-  module DoubleLinkedTest
-    include TimezoneDefinition
-    
-    linked_timezone 'Test/Linked/Zone1', 'Test/Linked_To/Zone1'
-    linked_timezone 'Test/Linked/Zone2', 'Test/Linked_To/Zone2'
-  end
-  
-  module DataLinkedTest
-    include TimezoneDefinition
-    
-    timezone 'Test/Data/Zone1' do |tz|
-      tz.offset :o0, -75, 0, :LMT
-      tz.offset :o1,   0, 0, :GMT
-      
-      tz.transition 1847, 12, :o1, 2760187969, 1152 
-    end 
-    
-    linked_timezone 'Test/Linked/Zone2', 'Test/Linked_To/Zone2'
-  end
-  
-  module LinkedDataTest
-    include TimezoneDefinition
-    
-    linked_timezone 'Test/Linked/Zone1', 'Test/Linked_To/Zone1'
-    
-    timezone 'Test/Data/Zone2' do |tz|
-      tz.offset :o0, -75, 0, :LMT
-      tz.offset :o1,   0, 0, :GMT
-      
-      tz.transition 1847, 12, :o1, 2760187969, 1152 
-    end    
-  end
-    
-  def test_data
-    assert_kind_of(DataTimezoneInfo, DataTest.get)
-    assert_equal('Test/Data/Zone', DataTest.get.identifier)
-    assert_equal(:LMT, DataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,14)).abbreviation)
-    assert_equal(:GMT, DataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,15)).abbreviation)
-  end
-  
-  def test_linked
-    assert_kind_of(LinkedTimezoneInfo, LinkedTest.get)
-    assert_equal('Test/Linked/Zone', LinkedTest.get.identifier)
-    assert_equal('Test/Linked_To/Zone', LinkedTest.get.link_to_identifier)    
-  end
-  
-  def test_double_data
-    assert_kind_of(DataTimezoneInfo, DoubleDataTest.get)
-    assert_equal('Test/Data/Zone2', DoubleDataTest.get.identifier)
-    assert_equal(:LMT, DoubleDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,14)).abbreviation)
-    assert_equal(:GMT, DoubleDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,15)).abbreviation)
-  end
-  
-  def test_double_linked
-    assert_kind_of(LinkedTimezoneInfo, DoubleLinkedTest.get)
-    assert_equal('Test/Linked/Zone2', DoubleLinkedTest.get.identifier)
-    assert_equal('Test/Linked_To/Zone2', DoubleLinkedTest.get.link_to_identifier)    
-  end
-  
-  def test_data_linked
-    assert_kind_of(LinkedTimezoneInfo, DataLinkedTest.get)
-    assert_equal('Test/Linked/Zone2', DataLinkedTest.get.identifier)
-    assert_equal('Test/Linked_To/Zone2', DataLinkedTest.get.link_to_identifier)    
-  end
-  
-  def test_linked_data
-    assert_kind_of(DataTimezoneInfo, LinkedDataTest.get)
-    assert_equal('Test/Data/Zone2', LinkedDataTest.get.identifier)
-    assert_equal(:LMT, LinkedDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,14)).abbreviation)
-    assert_equal(:GMT, LinkedDataTest.get.period_for_utc(DateTime.new(1847,12,1,0,1,15)).abbreviation)
-  end  
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_index_definition.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_index_definition.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_index_definition.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_index_definition.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,75 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone_index_definition'
-
-include TZInfo
-
-class TCTimezoneIndexDefinition < Test::Unit::TestCase
-  
-  module TimezonesTest1
-    include TimezoneIndexDefinition
-    
-    timezone 'Test/One'
-    timezone 'Test/Two'
-    linked_timezone 'Test/Three'
-    timezone 'Another/Zone'
-    linked_timezone 'And/Yet/Another'
-  end
-  
-  module TimezonesTest2
-    include TimezoneIndexDefinition
-    
-    timezone 'Test/A/One'
-    timezone 'Test/A/Two'
-    timezone 'Test/A/Three'
-  end
-  
-  module TimezonesTest3
-    include TimezoneIndexDefinition
-    
-    linked_timezone 'Test/B/One'
-    linked_timezone 'Test/B/Two'
-    linked_timezone 'Test/B/Three'
-  end
-  
-  module TimezonesTest4
-    include TimezoneIndexDefinition
-    
-  end
-  
-  def test_timezones
-    assert_equal(['Test/One', 'Test/Two', 'Test/Three', 'Another/Zone', 'And/Yet/Another'], TimezonesTest1.timezones)            
-    assert_equal(['Test/A/One', 'Test/A/Two', 'Test/A/Three'], TimezonesTest2.timezones)
-    assert_equal(['Test/B/One', 'Test/B/Two', 'Test/B/Three'], TimezonesTest3.timezones)
-    assert_equal([], TimezonesTest4.timezones)
-      
-    assert_equal(true, TimezonesTest1.timezones.frozen?)
-    assert_equal(true, TimezonesTest2.timezones.frozen?)
-    assert_equal(true, TimezonesTest3.timezones.frozen?)
-    assert_equal(true, TimezonesTest4.timezones.frozen?)
-  end   
-  
-  def test_data_timezones
-    assert_equal(['Test/One', 'Test/Two', 'Another/Zone'], TimezonesTest1.data_timezones)
-    assert_equal(['Test/A/One', 'Test/A/Two', 'Test/A/Three'], TimezonesTest2.data_timezones)
-    assert_equal([], TimezonesTest3.data_timezones)
-    assert_equal([], TimezonesTest4.data_timezones)
-    
-    assert_equal(true, TimezonesTest1.data_timezones.frozen?)
-    assert_equal(true, TimezonesTest2.data_timezones.frozen?)
-    assert_equal(true, TimezonesTest3.data_timezones.frozen?)
-    assert_equal(true, TimezonesTest4.data_timezones.frozen?)
-  end
-  
-  def test_linked_timezones
-    assert_equal(['Test/Three', 'And/Yet/Another'], TimezonesTest1.linked_timezones)
-    assert_equal([], TimezonesTest2.linked_timezones)
-    assert_equal(['Test/B/One', 'Test/B/Two', 'Test/B/Three'], TimezonesTest3.linked_timezones)
-    assert_equal([], TimezonesTest4.linked_timezones)
-    
-    assert_equal(true, TimezonesTest1.linked_timezones.frozen?)
-    assert_equal(true, TimezonesTest2.linked_timezones.frozen?)
-    assert_equal(true, TimezonesTest3.linked_timezones.frozen?)
-    assert_equal(true, TimezonesTest4.linked_timezones.frozen?)
-  end  
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,13 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone_info'
-
-include TZInfo
-
-class TCTimezoneInfo < Test::Unit::TestCase
-  
-  def test_identifier
-    ti = TimezoneInfo.new('Test/Zone')
-    assert_equal('Test/Zone', ti.identifier)
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_london.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_london.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_london.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_london.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,114 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone'
-
-include TZInfo
-
-class TCTimezoneLondon < Test::Unit::TestCase
-  def test_2004
-    #Europe/London  Sun Mar 28 00:59:59 2004 UTC = Sun Mar 28 00:59:59 2004 GMT isdst=0 gmtoff=0
-    #Europe/London  Sun Mar 28 01:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 BST isdst=1 gmtoff=3600
-    #Europe/London  Sun Oct 31 00:59:59 2004 UTC = Sun Oct 31 01:59:59 2004 BST isdst=1 gmtoff=3600
-    #Europe/London  Sun Oct 31 01:00:00 2004 UTC = Sun Oct 31 01:00:00 2004 GMT isdst=0 gmtoff=0
-    
-    tz = Timezone.get('Europe/London')
-    assert_equal(DateTime.new(2004,3,28,0,59,59), tz.utc_to_local(DateTime.new(2004,3,28,0,59,59)))
-    assert_equal(DateTime.new(2004,3,28,2,0,0), tz.utc_to_local(DateTime.new(2004,3,28,1,0,0)))    
-    assert_equal(DateTime.new(2004,10,31,1,59,59), tz.utc_to_local(DateTime.new(2004,10,31,0,59,59)))
-    assert_equal(DateTime.new(2004,10,31,1,0,0), tz.utc_to_local(DateTime.new(2004,10,31,1,0,0)))
-    
-    assert_equal(DateTime.new(2004,3,28,0,59,59), tz.local_to_utc(DateTime.new(2004,3,28,0,59,59)))
-    assert_equal(DateTime.new(2004,3,28,1,0,0), tz.local_to_utc(DateTime.new(2004,3,28,2,0,0)))
-    assert_equal(DateTime.new(2004,10,31,0,59,59), tz.local_to_utc(DateTime.new(2004,10,31,1,59,59), true))
-    assert_equal(DateTime.new(2004,10,31,1,59,59), tz.local_to_utc(DateTime.new(2004,10,31,1,59,59), false))
-    assert_equal(DateTime.new(2004,10,31,0,0,0), tz.local_to_utc(DateTime.new(2004,10,31,1,0,0), true))
-    assert_equal(DateTime.new(2004,10,31,1,0,0), tz.local_to_utc(DateTime.new(2004,10,31,1,0,0), false))
-    
-    assert_raise(PeriodNotFound) { tz.local_to_utc(DateTime.new(2004,3,28,1,0,0)) }
-    assert_raise(AmbiguousTime) { tz.local_to_utc(DateTime.new(2004,10,31,1,0,0)) }
-    
-    assert_equal(:GMT, tz.period_for_utc(DateTime.new(2004,3,28,0,59,59)).zone_identifier)
-    assert_equal(:BST, tz.period_for_utc(DateTime.new(2004,3,28,1,0,0)).zone_identifier)
-    assert_equal(:BST, tz.period_for_utc(DateTime.new(2004,10,31,0,59,59)).zone_identifier)
-    assert_equal(:GMT, tz.period_for_utc(DateTime.new(2004,10,31,1,0,0)).zone_identifier)
-    
-    assert_equal(:GMT, tz.period_for_local(DateTime.new(2004,3,28,0,59,59)).zone_identifier)
-    assert_equal(:BST, tz.period_for_local(DateTime.new(2004,3,28,2,0,0)).zone_identifier)
-    assert_equal(:BST, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), true).zone_identifier)
-    assert_equal(:GMT, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), false).zone_identifier)
-    assert_equal(:BST, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), true).zone_identifier)
-    assert_equal(:GMT, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), false).zone_identifier)
-    
-    assert_equal(0, tz.period_for_utc(DateTime.new(2004,3,28,0,59,59)).utc_total_offset)
-    assert_equal(3600, tz.period_for_utc(DateTime.new(2004,3,28,1,0,0)).utc_total_offset)
-    assert_equal(3600, tz.period_for_utc(DateTime.new(2004,10,31,0,59,59)).utc_total_offset)
-    assert_equal(0, tz.period_for_utc(DateTime.new(2004,10,31,1,0,0)).utc_total_offset)
-    
-    assert_equal(0, tz.period_for_local(DateTime.new(2004,3,28,0,59,59)).utc_total_offset)
-    assert_equal(3600, tz.period_for_local(DateTime.new(2004,3,28,2,0,0)).utc_total_offset)
-    assert_equal(3600, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), true).utc_total_offset)
-    assert_equal(0, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), false).utc_total_offset)
-    assert_equal(3600, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), true).utc_total_offset)
-    assert_equal(0, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), false).utc_total_offset)
-  end 
-  
-  def test_1961
-    #Europe/London  Sun Mar 26 01:59:59 1961 UTC = Sun Mar 26 01:59:59 1961 GMT isdst=0 gmtoff=0
-    #Europe/London  Sun Mar 26 02:00:00 1961 UTC = Sun Mar 26 03:00:00 1961 BST isdst=1 gmtoff=3600
-    #Europe/London  Sun Oct 29 01:59:59 1961 UTC = Sun Oct 29 02:59:59 1961 BST isdst=1 gmtoff=3600
-    #Europe/London  Sun Oct 29 02:00:00 1961 UTC = Sun Oct 29 02:00:00 1961 GMT isdst=0 gmtoff=0
-    
-    tz = Timezone.get('Europe/London')
-    assert_equal(DateTime.new(1961,3,26,1,59,59), tz.utc_to_local(DateTime.new(1961,3,26,1,59,59)))
-    assert_equal(DateTime.new(1961,3,26,3,0,0), tz.utc_to_local(DateTime.new(1961,3,26,2,0,0)))    
-    assert_equal(DateTime.new(1961,10,29,2,59,59), tz.utc_to_local(DateTime.new(1961,10,29,1,59,59)))
-    assert_equal(DateTime.new(1961,10,29,2,0,0), tz.utc_to_local(DateTime.new(1961,10,29,2,0,0)))
-    
-    assert_equal(DateTime.new(1961,3,26,1,59,59), tz.local_to_utc(DateTime.new(1961,3,26,1,59,59)))
-    assert_equal(DateTime.new(1961,3,26,2,0,0), tz.local_to_utc(DateTime.new(1961,3,26,3,0,0)))
-    assert_equal(DateTime.new(1961,10,29,1,59,59), tz.local_to_utc(DateTime.new(1961,10,29,2,59,59), true))
-    assert_equal(DateTime.new(1961,10,29,2,59,59), tz.local_to_utc(DateTime.new(1961,10,29,2,59,59), false))
-    assert_equal(DateTime.new(1961,10,29,1,0,0), tz.local_to_utc(DateTime.new(1961,10,29,2,0,0), true))
-    assert_equal(DateTime.new(1961,10,29,2,0,0), tz.local_to_utc(DateTime.new(1961,10,29,2,0,0), false))
-    
-    assert_raise(PeriodNotFound) { tz.local_to_utc(DateTime.new(1961,3,26,2,0,0)) }
-    assert_raise(AmbiguousTime) { tz.local_to_utc(DateTime.new(1961,10,29,2,0,0)) }
-    
-    assert_equal(:GMT, tz.period_for_utc(DateTime.new(1961,3,26,1,59,59)).zone_identifier)
-    assert_equal(:BST, tz.period_for_utc(DateTime.new(1961,3,26,2,0,0)).zone_identifier)
-    assert_equal(:BST, tz.period_for_utc(DateTime.new(1961,10,29,1,59,59)).zone_identifier)
-    assert_equal(:GMT, tz.period_for_utc(DateTime.new(1961,10,29,2,0,0)).zone_identifier)
-    
-    assert_equal(:GMT, tz.period_for_local(DateTime.new(1961,3,26,1,59,59)).zone_identifier)
-    assert_equal(:BST, tz.period_for_local(DateTime.new(1961,3,26,3,0,0)).zone_identifier)
-    assert_equal(:BST, tz.period_for_local(DateTime.new(1961,10,29,2,59,59), true).zone_identifier)
-    assert_equal(:GMT, tz.period_for_local(DateTime.new(1961,10,29,2,59,59), false).zone_identifier)
-    assert_equal(:BST, tz.period_for_local(DateTime.new(1961,10,29,2,0,0), true).zone_identifier)
-    assert_equal(:GMT, tz.period_for_local(DateTime.new(1961,10,29,2,0,0), false).zone_identifier)
-    
-    assert_equal(0, tz.period_for_utc(DateTime.new(1961,3,26,1,59,59)).utc_total_offset)
-    assert_equal(3600, tz.period_for_utc(DateTime.new(1961,3,26,2,0,0)).utc_total_offset)
-    assert_equal(3600, tz.period_for_utc(DateTime.new(1961,10,29,1,59,59)).utc_total_offset)
-    assert_equal(0, tz.period_for_utc(DateTime.new(1961,10,29,2,0,0)).utc_total_offset)
-    
-    assert_equal(0, tz.period_for_local(DateTime.new(1961,3,26,1,59,59)).utc_total_offset)
-    assert_equal(3600, tz.period_for_local(DateTime.new(1961,3,26,3,0,0)).utc_total_offset)
-    assert_equal(3600, tz.period_for_local(DateTime.new(1961,10,29,2,59,59), true).utc_total_offset)
-    assert_equal(0, tz.period_for_local(DateTime.new(1961,10,29,2,59,59), false).utc_total_offset)
-    assert_equal(3600, tz.period_for_local(DateTime.new(1961,10,29,2,0,0), true).utc_total_offset)
-    assert_equal(0, tz.period_for_local(DateTime.new(1961,10,29,2,0,0), false).utc_total_offset)
-  end 
-  
-  def test_time_boundary
-    #Europe/London  Sat Oct 26 23:00:00 1968 UTC = Sun Oct 27 00:00:00 1968 GMT isdst=0 gmtoff=3600
-    #Europe/London  Sun Oct 31 01:59:59 1971 UTC = Sun Oct 31 02:59:59 1971 GMT isdst=0 gmtoff=3600
-    
-    tz = Timezone.get('Europe/London')    
-    assert_equal(DateTime.new(1970,1,1,1,0,0), tz.utc_to_local(DateTime.new(1970,1,1,0,0,0)))
-    assert_equal(DateTime.new(1970,1,1,0,0,0), tz.local_to_utc(DateTime.new(1970,1,1,1,0,0)))
-    assert_equal(Time.utc(1970,1,1,1,0,0), tz.utc_to_local(Time.utc(1970,1,1,0,0,0)))
-    assert_equal(Time.utc(1970,1,1,0,0,0), tz.local_to_utc(Time.utc(1970,1,1,1,0,0)))
-    assert_equal(3600, tz.utc_to_local(0))
-    assert_equal(0, tz.local_to_utc(3600))
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_melbourne.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_melbourne.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_melbourne.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_melbourne.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,114 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone'
-
-include TZInfo
-
-class TCTimezoneMelbourne < Test::Unit::TestCase
-  def test_2004
-    #Australia/Melbourne  Sat Mar 27 15:59:59 2004 UTC = Sun Mar 28 02:59:59 2004 EST isdst=1 gmtoff=39600
-    #Australia/Melbourne  Sat Mar 27 16:00:00 2004 UTC = Sun Mar 28 02:00:00 2004 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Oct 30 15:59:59 2004 UTC = Sun Oct 31 01:59:59 2004 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Oct 30 16:00:00 2004 UTC = Sun Oct 31 03:00:00 2004 EST isdst=1 gmtoff=39600
-    
-    tz = Timezone.get('Australia/Melbourne')
-    assert_equal(DateTime.new(2004,3,28,2,59,59), tz.utc_to_local(DateTime.new(2004,3,27,15,59,59)))
-    assert_equal(DateTime.new(2004,3,28,2,0,0), tz.utc_to_local(DateTime.new(2004,3,27,16,0,0)))    
-    assert_equal(DateTime.new(2004,10,31,1,59,59), tz.utc_to_local(DateTime.new(2004,10,30,15,59,59)))
-    assert_equal(DateTime.new(2004,10,31,3,0,0), tz.utc_to_local(DateTime.new(2004,10,30,16,0,0)))
-    
-    assert_equal(DateTime.new(2004,3,27,15,59,59), tz.local_to_utc(DateTime.new(2004,3,28,2,59,59), true))
-    assert_equal(DateTime.new(2004,3,27,16,59,59), tz.local_to_utc(DateTime.new(2004,3,28,2,59,59), false))
-    assert_equal(DateTime.new(2004,3,27,15,0,0), tz.local_to_utc(DateTime.new(2004,3,28,2,0,0), true))
-    assert_equal(DateTime.new(2004,3,27,16,0,0), tz.local_to_utc(DateTime.new(2004,3,28,2,0,0), false))   
-    assert_equal(DateTime.new(2004,10,30,15,59,59), tz.local_to_utc(DateTime.new(2004,10,31,1,59,59)))
-    assert_equal(DateTime.new(2004,10,30,16,0,0), tz.local_to_utc(DateTime.new(2004,10,31,3,0,0)))
-    
-    assert_raise(PeriodNotFound) { tz.local_to_utc(DateTime.new(2004,10,31,2,0,0)) }
-    assert_raise(AmbiguousTime) { tz.local_to_utc(DateTime.new(2004,3,28,2,0,0)) }
-    
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,3,27,15,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,3,27,16,0,0)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,10,30,15,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,10,30,16,0,0)).zone_identifier)
-    
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), false).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), false).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,10,31,1,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,10,31,3,0,0)).zone_identifier)
-    
-    assert_equal(39600, tz.period_for_utc(DateTime.new(2004,3,27,15,59,59)).utc_total_offset)
-    assert_equal(36000, tz.period_for_utc(DateTime.new(2004,3,27,16,0,0)).utc_total_offset)
-    assert_equal(36000, tz.period_for_utc(DateTime.new(2004,10,30,15,59,59)).utc_total_offset)
-    assert_equal(39600, tz.period_for_utc(DateTime.new(2004,10,30,16,0,0)).utc_total_offset)
-    
-    assert_equal(39600, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), true).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(2004,3,28,2,59,59), false).utc_total_offset)
-    assert_equal(39600, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), true).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(2004,3,28,2,0,0), false).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(2004,10,31,1,59,59)).utc_total_offset)
-    assert_equal(39600, tz.period_for_local(DateTime.new(2004,10,31,3,0,0)).utc_total_offset)
-  end  
-
-  def test_1942
-    #Australia/Melbourne  Sat Mar 28 14:59:59 1942 UTC = Sun Mar 29 01:59:59 1942 EST isdst=1 gmtoff=39600
-    #Australia/Melbourne  Sat Mar 28 15:00:00 1942 UTC = Sun Mar 29 01:00:00 1942 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Sep 26 15:59:59 1942 UTC = Sun Sep 27 01:59:59 1942 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Sep 26 16:00:00 1942 UTC = Sun Sep 27 03:00:00 1942 EST isdst=1 gmtoff=39600
-    
-    tz = Timezone.get('Australia/Melbourne')
-    assert_equal(DateTime.new(1942,3,29,1,59,59), tz.utc_to_local(DateTime.new(1942,3,28,14,59,59)))
-    assert_equal(DateTime.new(1942,3,29,1,0,0), tz.utc_to_local(DateTime.new(1942,3,28,15,0,0)))    
-    assert_equal(DateTime.new(1942,9,27,1,59,59), tz.utc_to_local(DateTime.new(1942,9,26,15,59,59)))
-    assert_equal(DateTime.new(1942,9,27,3,0,0), tz.utc_to_local(DateTime.new(1942,9,26,16,0,0)))
-    
-    assert_equal(DateTime.new(1942,3,28,14,59,59), tz.local_to_utc(DateTime.new(1942,3,29,1,59,59), true))
-    assert_equal(DateTime.new(1942,3,28,15,59,59), tz.local_to_utc(DateTime.new(1942,3,29,1,59,59), false))
-    assert_equal(DateTime.new(1942,3,28,14,0,0), tz.local_to_utc(DateTime.new(1942,3,29,1,0,0), true))
-    assert_equal(DateTime.new(1942,3,28,15,0,0), tz.local_to_utc(DateTime.new(1942,3,29,1,0,0), false))   
-    assert_equal(DateTime.new(1942,9,26,15,59,59), tz.local_to_utc(DateTime.new(1942,9,27,1,59,59)))
-    assert_equal(DateTime.new(1942,9,26,16,0,0), tz.local_to_utc(DateTime.new(1942,9,27,3,0,0)))
-    
-    assert_raise(PeriodNotFound) { tz.local_to_utc(DateTime.new(1942,9,27,2,0,0)) }
-    assert_raise(AmbiguousTime) { tz.local_to_utc(DateTime.new(1942,3,29,1,0,0)) }
-    
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(1942,3,28,14,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(1942,3,28,15,0,0)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(1942,9,26,15,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(1942,9,26,16,0,0)).zone_identifier)
-    
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), false).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), false).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1942,9,27,1,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1942,9,27,3,0,0)).zone_identifier)
-    
-    assert_equal(39600, tz.period_for_utc(DateTime.new(1942,3,28,14,59,59)).utc_total_offset)
-    assert_equal(36000, tz.period_for_utc(DateTime.new(1942,3,28,15,0,0)).utc_total_offset)
-    assert_equal(36000, tz.period_for_utc(DateTime.new(1942,9,26,15,59,59)).utc_total_offset)
-    assert_equal(39600, tz.period_for_utc(DateTime.new(1942,9,26,16,0,0)).utc_total_offset)
-    
-    assert_equal(39600, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), true).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(1942,3,29,1,59,59), false).utc_total_offset)
-    assert_equal(39600, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), true).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(1942,3,29,1,0,0), false).utc_total_offset)
-    assert_equal(36000, tz.period_for_local(DateTime.new(1942,9,27,1,59,59)).utc_total_offset)
-    assert_equal(39600, tz.period_for_local(DateTime.new(1942,9,27,3,0,0)).utc_total_offset)
-  end
-
-  def test_time_boundary
-    #Australia/Melbourne  Sat Mar 25 15:00:00 1944 UTC = Sun Mar 26 01:00:00 1944 EST isdst=0 gmtoff=36000
-    #Australia/Melbourne  Sat Oct 30 15:59:59 1971 UTC = Sun Oct 31 01:59:59 1971 EST isdst=0 gmtoff=36000
-    
-    tz = Timezone.get('Australia/Melbourne')    
-    assert_equal(DateTime.new(1970,1,1,10,0,0), tz.utc_to_local(DateTime.new(1970,1,1,0,0,0)))
-    assert_equal(DateTime.new(1970,1,1,0,0,0), tz.local_to_utc(DateTime.new(1970,1,1,10,0,0)))
-    assert_equal(Time.utc(1970,1,1,10,0,0), tz.utc_to_local(Time.utc(1970,1,1,0,0,0)))
-    assert_equal(Time.utc(1970,1,1,0,0,0), tz.local_to_utc(Time.utc(1970,1,1,10,0,0)))
-    assert_equal(36000, tz.utc_to_local(0))
-    assert_equal(0, tz.local_to_utc(36000))
-  end  
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_new_york.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_new_york.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_new_york.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_new_york.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,114 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone'
-
-include TZInfo
-
-class TCTimezoneNewYork < Test::Unit::TestCase
-  def test_2004
-    #America/New_York  Sun Apr  4 06:59:59 2004 UTC = Sun Apr  4 01:59:59 2004 EST isdst=0 gmtoff=-18000
-    #America/New_York  Sun Apr  4 07:00:00 2004 UTC = Sun Apr  4 03:00:00 2004 EDT isdst=1 gmtoff=-14400
-    #America/New_York  Sun Oct 31 05:59:59 2004 UTC = Sun Oct 31 01:59:59 2004 EDT isdst=1 gmtoff=-14400
-    #America/New_York  Sun Oct 31 06:00:00 2004 UTC = Sun Oct 31 01:00:00 2004 EST isdst=0 gmtoff=-18000
-    
-    tz = Timezone.get('America/New_York')
-    assert_equal(DateTime.new(2004,4,4,1,59,59), tz.utc_to_local(DateTime.new(2004,4,4,6,59,59)))
-    assert_equal(DateTime.new(2004,4,4,3,0,0), tz.utc_to_local(DateTime.new(2004,4,4,7,0,0)))    
-    assert_equal(DateTime.new(2004,10,31,1,59,59), tz.utc_to_local(DateTime.new(2004,10,31,5,59,59)))
-    assert_equal(DateTime.new(2004,10,31,1,0,0), tz.utc_to_local(DateTime.new(2004,10,31,6,0,0)))
-    
-    assert_equal(DateTime.new(2004,4,4,6,59,59), tz.local_to_utc(DateTime.new(2004,4,4,1,59,59)))
-    assert_equal(DateTime.new(2004,4,4,7,0,0), tz.local_to_utc(DateTime.new(2004,4,4,3,0,0)))
-    assert_equal(DateTime.new(2004,10,31,5,59,59), tz.local_to_utc(DateTime.new(2004,10,31,1,59,59), true))
-    assert_equal(DateTime.new(2004,10,31,6,59,59), tz.local_to_utc(DateTime.new(2004,10,31,1,59,59), false))
-    assert_equal(DateTime.new(2004,10,31,5,0,0), tz.local_to_utc(DateTime.new(2004,10,31,1,0,0), true))
-    assert_equal(DateTime.new(2004,10,31,6,0,0), tz.local_to_utc(DateTime.new(2004,10,31,1,0,0), false))
-    
-    assert_raise(PeriodNotFound) { tz.local_to_utc(DateTime.new(2004,4,4,2,0,0)) }
-    assert_raise(AmbiguousTime) { tz.local_to_utc(DateTime.new(2004,10,31,1,0,0)) }
-    
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,4,4,6,59,59)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_utc(DateTime.new(2004,4,4,7,0,0)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_utc(DateTime.new(2004,10,31,5,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(2004,10,31,6,0,0)).zone_identifier)
-    
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,4,4,1,59,59)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_local(DateTime.new(2004,4,4,3,0,0)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), false).zone_identifier)
-    assert_equal(:EDT, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), false).zone_identifier)
-    
-    assert_equal(-18000, tz.period_for_utc(DateTime.new(2004,4,4,6,59,59)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_utc(DateTime.new(2004,4,4,7,0,0)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_utc(DateTime.new(2004,10,31,5,59,59)).utc_total_offset)
-    assert_equal(-18000, tz.period_for_utc(DateTime.new(2004,10,31,6,0,0)).utc_total_offset)
-    
-    assert_equal(-18000, tz.period_for_local(DateTime.new(2004,4,4,1,59,59)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_local(DateTime.new(2004,4,4,3,0,0)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), true).utc_total_offset)
-    assert_equal(-18000, tz.period_for_local(DateTime.new(2004,10,31,1,59,59), false).utc_total_offset)
-    assert_equal(-14400, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), true).utc_total_offset)
-    assert_equal(-18000, tz.period_for_local(DateTime.new(2004,10,31,1,0,0), false).utc_total_offset)
-  end     
-
-  def test_1957
-    #America/New_York  Sun Apr 28 06:59:59 1957 UTC = Sun Apr 28 01:59:59 1957 EST isdst=0 gmtoff=-18000
-    #America/New_York  Sun Apr 28 07:00:00 1957 UTC = Sun Apr 28 03:00:00 1957 EDT isdst=1 gmtoff=-14400
-    #America/New_York  Sun Oct 27 05:59:59 1957 UTC = Sun Oct 27 01:59:59 1957 EDT isdst=1 gmtoff=-14400
-    #America/New_York  Sun Oct 27 06:00:00 1957 UTC = Sun Oct 27 01:00:00 1957 EST isdst=0 gmtoff=-18000
-    
-    tz = Timezone.get('America/New_York')
-    assert_equal(DateTime.new(1957,4,28,1,59,59), tz.utc_to_local(DateTime.new(1957,4,28,6,59,59)))
-    assert_equal(DateTime.new(1957,4,28,3,0,0), tz.utc_to_local(DateTime.new(1957,4,28,7,0,0)))    
-    assert_equal(DateTime.new(1957,10,27,1,59,59), tz.utc_to_local(DateTime.new(1957,10,27,5,59,59)))
-    assert_equal(DateTime.new(1957,10,27,1,0,0), tz.utc_to_local(DateTime.new(1957,10,27,6,0,0)))
-    
-    assert_equal(DateTime.new(1957,4,28,6,59,59), tz.local_to_utc(DateTime.new(1957,4,28,1,59,59)))
-    assert_equal(DateTime.new(1957,4,28,7,0,0), tz.local_to_utc(DateTime.new(1957,4,28,3,0,0)))
-    assert_equal(DateTime.new(1957,10,27,5,59,59), tz.local_to_utc(DateTime.new(1957,10,27,1,59,59), true))
-    assert_equal(DateTime.new(1957,10,27,6,59,59), tz.local_to_utc(DateTime.new(1957,10,27,1,59,59), false))
-    assert_equal(DateTime.new(1957,10,27,5,0,0), tz.local_to_utc(DateTime.new(1957,10,27,1,0,0), true))
-    assert_equal(DateTime.new(1957,10,27,6,0,0), tz.local_to_utc(DateTime.new(1957,10,27,1,0,0), false))
-    
-    assert_raise(PeriodNotFound) { tz.local_to_utc(DateTime.new(1957,4,28,2,0,0)) }
-    assert_raise(AmbiguousTime) { tz.local_to_utc(DateTime.new(1957,10,27,1,0,0)) }
-    
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(1957,4,28,6,59,59)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_utc(DateTime.new(1957,4,28,7,0,0)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_utc(DateTime.new(1957,10,27,5,59,59)).zone_identifier)
-    assert_equal(:EST, tz.period_for_utc(DateTime.new(1957,10,27,6,0,0)).zone_identifier)
-    
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1957,4,28,1,59,59)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_local(DateTime.new(1957,4,28,3,0,0)).zone_identifier)
-    assert_equal(:EDT, tz.period_for_local(DateTime.new(1957,10,27,1,59,59), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1957,10,27,1,59,59), false).zone_identifier)
-    assert_equal(:EDT, tz.period_for_local(DateTime.new(1957,10,27,1,0,0), true).zone_identifier)
-    assert_equal(:EST, tz.period_for_local(DateTime.new(1957,10,27,1,0,0), false).zone_identifier)
-    
-    assert_equal(-18000, tz.period_for_utc(DateTime.new(1957,4,28,6,59,59)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_utc(DateTime.new(1957,4,28,7,0,0)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_utc(DateTime.new(1957,10,27,5,59,59)).utc_total_offset)
-    assert_equal(-18000, tz.period_for_utc(DateTime.new(1957,10,27,6,0,0)).utc_total_offset)
-    
-    assert_equal(-18000, tz.period_for_local(DateTime.new(1957,4,28,1,59,59)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_local(DateTime.new(1957,4,28,3,0,0)).utc_total_offset)
-    assert_equal(-14400, tz.period_for_local(DateTime.new(1957,10,27,1,59,59), true).utc_total_offset)
-    assert_equal(-18000, tz.period_for_local(DateTime.new(1957,10,27,1,59,59), false).utc_total_offset)
-    assert_equal(-14400, tz.period_for_local(DateTime.new(1957,10,27,1,0,0), true).utc_total_offset)
-    assert_equal(-18000, tz.period_for_local(DateTime.new(1957,10,27,1,0,0), false).utc_total_offset)
-  end
-  
-  def test_time_boundary
-    #America/New_York  Sun Oct 26 06:00:00 1969 UTC = Sun Oct 26 01:00:00 1969 EST isdst=0 gmtoff=-18000
-    #America/New_York  Sun Apr 26 06:59:59 1970 UTC = Sun Apr 26 01:59:59 1970 EST isdst=0 gmtoff=-18000
-    
-    tz = Timezone.get('America/New_York')    
-    assert_equal(DateTime.new(1970,1,1,0,0,0), tz.utc_to_local(DateTime.new(1970,1,1,5,0,0)))
-    assert_equal(DateTime.new(1970,1,1,5,0,0), tz.local_to_utc(DateTime.new(1970,1,1,0,0,0)))
-    assert_equal(Time.utc(1970,1,1,0,0,0), tz.utc_to_local(Time.utc(1970,1,1,5,0,0)))
-    assert_equal(Time.utc(1970,1,1,5,0,0), tz.local_to_utc(Time.utc(1970,1,1,0,0,0)))
-    assert_equal(0, tz.utc_to_local(18000))
-    assert_equal(18000, tz.local_to_utc(0))
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_offset_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_offset_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_offset_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_offset_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,116 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone_offset_info'
-
-include TZInfo
-
-class TCTimezoneOffsetInfo < Test::Unit::TestCase
-  
-  def test_utc_offset
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(18000, o1.utc_offset)
-    assert_equal(-3600, o2.utc_offset)
-  end
-  
-  def test_std_offset
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(0, o1.std_offset)
-    assert_equal(3600, o2.std_offset)
-  end
-  
-  def test_utc_total_offset
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(18000, o1.utc_total_offset)
-    assert_equal(0, o2.utc_total_offset)
-  end
-  
-  def test_abbreviation
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(:TEST, o1.abbreviation)
-    assert_equal(:TEST2, o2.abbreviation)
-  end
-  
-  def test_dst
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(false, o1.dst?)
-    assert_equal(true, o2.dst?)
-  end
-  
-  def test_to_local
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(1148949080, o1.to_local(1148931080))
-    assert_equal(Time.utc(2006, 5, 30, 0, 31, 20), o1.to_local(Time.utc(2006, 5, 29, 19, 31, 20)))
-    assert_equal(DateTime.new(2006, 5, 30, 0, 31, 20), o1.to_local(DateTime.new(2006, 5, 29, 19, 31, 20)))
-    assert(TimeOrDateTime.new(1148949080).eql?(o1.to_local(TimeOrDateTime.new(1148931080))))
-    
-    assert_equal(1148931080, o2.to_local(1148931080))
-    assert_equal(Time.utc(2006, 5, 29, 19, 31, 20), o2.to_local(Time.utc(2006, 5, 29, 19, 31, 20)))
-    assert_equal(DateTime.new(2006, 5, 29, 19, 31, 20), o2.to_local(DateTime.new(2006, 5, 29, 19, 31, 20)))
-    assert(TimeOrDateTime.new(1148931080).eql?(o2.to_local(TimeOrDateTime.new(1148931080))))    
-  end
-  
-  def test_to_utc
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(1148913080, o1.to_utc(1148931080))
-    assert_equal(Time.utc(2006, 5, 29, 14, 31, 20), o1.to_utc(Time.utc(2006, 5, 29, 19, 31, 20)))
-    assert_equal(DateTime.new(2006, 5, 29, 14, 31, 20), o1.to_utc(DateTime.new(2006, 5, 29, 19, 31, 20)))
-    assert(TimeOrDateTime.new(1148913080).eql?(o1.to_utc(TimeOrDateTime.new(1148931080))))
-    
-    assert_equal(1148931080, o2.to_local(1148931080))
-    assert_equal(Time.utc(2006, 5, 29, 19, 31, 20), o2.to_local(Time.utc(2006, 5, 29, 19, 31, 20)))
-    assert_equal(DateTime.new(2006, 5, 29, 19, 31, 20), o2.to_local(DateTime.new(2006, 5, 29, 19, 31, 20)))
-    assert(TimeOrDateTime.new(1148931080).eql?(o2.to_local(TimeOrDateTime.new(1148931080))))    
-  end
-  
-  def test_equality
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o3 = TimezoneOffsetInfo.new(18001, 0, :TEST)
-    o4 = TimezoneOffsetInfo.new(18000, 1, :TEST)
-    o5 = TimezoneOffsetInfo.new(18000, 0, :TEST2)
-    
-    assert_equal(true, o1 == o1)
-    assert_equal(true, o1 == o2)
-    assert_equal(false, o1 == o3)
-    assert_equal(false, o1 == o4)
-    assert_equal(false, o1 == o5)
-    assert_equal(false, o1 == Object.new)
-  end
-  
-  def test_eql
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o3 = TimezoneOffsetInfo.new(18001, 0, :TEST)
-    o4 = TimezoneOffsetInfo.new(18000, 1, :TEST)
-    o5 = TimezoneOffsetInfo.new(18000, 0, :TEST2)
-    
-    assert_equal(true, o1.eql?(o1))
-    assert_equal(true, o1.eql?(o2))
-    assert_equal(false, o1.eql?(o3))
-    assert_equal(false, o1.eql?(o4))
-    assert_equal(false, o1.eql?(o5))
-    assert_equal(false, o1.eql?(Object.new))
-  end
-  
-  def test_hash
-    o1 = TimezoneOffsetInfo.new(18000, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST2)
-    
-    assert_equal(18000.hash ^ 0.hash ^ :TEST.hash, o1.hash)
-    assert_equal(-3600.hash ^ 3600.hash ^ :TEST2.hash, o2.hash)
-  end
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_period.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_period.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_period.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_period.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,511 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone_period'
-require 'tzinfo/timezone_offset_info'
-require 'tzinfo/timezone_transition_info'
-
-include TZInfo
-
-class TCTimezonePeriod < Test::Unit::TestCase
-  
-  def test_initialize_start_end
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
-      
-    p = TimezonePeriod.new(start_t, end_t)
-    
-    assert_equal(start_t, p.start_transition)
-    assert_equal(end_t, p.end_transition)
-    assert_equal(dst, p.offset)
-    assert_equal(DateTime.new(2006,1,1,0,0,0), p.utc_start)
-    assert_equal(DateTime.new(2006,1,2,0,0,0), p.utc_end)
-    assert_equal(-7200, p.utc_offset)
-    assert_equal(3600, p.std_offset)
-    assert_equal(-3600, p.utc_total_offset)
-    assert_equal(Rational(-3600, 86400), p.utc_total_offset_rational)
-    assert_equal(:TEST, p.zone_identifier)
-    assert_equal(:TEST, p.abbreviation)    
-    assert_equal(DateTime.new(2005,12,31,23,0,0), p.local_start)    
-    assert_equal(DateTime.new(2006,1,1,23,0,0), p.local_end)
-  end
-  
-  def test_initialize_start_end_offset
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
-      
-    assert_raise(ArgumentError) { TimezonePeriod.new(start_t, end_t, special) }
-  end
-  
-  def test_initialize_start
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)   
-      
-    p = TimezonePeriod.new(start_t, nil)
-    
-    assert_equal(start_t, p.start_transition)
-    assert_nil(p.end_transition)
-    assert_equal(dst, p.offset)
-    assert_equal(DateTime.new(2006,1,1,0,0,0), p.utc_start)
-    assert_nil(p.utc_end)
-    assert_equal(-7200, p.utc_offset)
-    assert_equal(3600, p.std_offset)
-    assert_equal(-3600, p.utc_total_offset)
-    assert_equal(Rational(-3600, 86400), p.utc_total_offset_rational)
-    assert_equal(:TEST, p.zone_identifier)
-    assert_equal(:TEST, p.abbreviation)    
-    assert_equal(DateTime.new(2005,12,31,23,0,0), p.local_start)    
-    assert_nil(p.local_end)
-  end
-  
-  def test_initialize_start_offset
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
-    start_t = TimezoneTransitionInfo.new(dst, std, 1136073600)   
-      
-    assert_raise(ArgumentError) { TimezonePeriod.new(start_t, nil, special) }
-  end
-  
-  def test_initialize_end
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)    
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
-      
-    p = TimezonePeriod.new(nil, end_t)
-    
-    assert_nil(p.start_transition)
-    assert_equal(end_t, p.end_transition)
-    assert_equal(dst, p.offset)
-    assert_nil(p.utc_start)
-    assert_equal(DateTime.new(2006,1,2,0,0,0), p.utc_end)
-    assert_equal(-7200, p.utc_offset)
-    assert_equal(3600, p.std_offset)
-    assert_equal(-3600, p.utc_total_offset)
-    assert_equal(Rational(-3600, 86400), p.utc_total_offset_rational)
-    assert_equal(:TEST, p.zone_identifier)
-    assert_equal(:TEST, p.abbreviation)    
-    assert_nil(p.local_start)    
-    assert_equal(DateTime.new(2006,1,1,23,0,0), p.local_end)
-  end
-  
-  def test_initialize_end_offset
-    std = TimezoneOffsetInfo.new(-7200, 0, :TEST)
-    dst = TimezoneOffsetInfo.new(-7200, 3600, :TEST)    
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
-    end_t = TimezoneTransitionInfo.new(std, dst, 1136160000)
-      
-    assert_raise(ArgumentError) { TimezonePeriod.new(nil, end_t, special) }    
-  end
-  
-  def test_initialize
-    assert_raise(ArgumentError) { TimezonePeriod.new(nil, nil) }
-  end
-  
-  def test_initialize_offset
-    special = TimezoneOffsetInfo.new(0, 0, :SPECIAL)
-      
-    p = TimezonePeriod.new(nil, nil, special)
-    
-    assert_nil(p.start_transition)
-    assert_nil(p.end_transition)
-    assert_equal(special, p.offset)
-    assert_nil(p.utc_start)
-    assert_nil(p.utc_end)
-    assert_equal(0, p.utc_offset)
-    assert_equal(0, p.std_offset)
-    assert_equal(0, p.utc_total_offset)
-    assert_equal(Rational(0, 86400), p.utc_total_offset_rational)
-    assert_equal(:SPECIAL, p.zone_identifier)
-    assert_equal(:SPECIAL, p.abbreviation)    
-    assert_nil(p.local_start)    
-    assert_nil(p.local_end)  
-  end
-  
-  def test_dst    
-    p1 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 3600, :TEST))
-    p2 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 0, :TEST))
-    p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, -3600, :TEST))
-    p4 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 7200, :TEST))
-    p5 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, -7200, :TEST))
-    
-    assert_equal(true, p1.dst?)
-    assert_equal(false, p2.dst?)
-    assert_equal(true, p3.dst?)
-    assert_equal(true, p4.dst?)
-    assert_equal(true, p5.dst?)
-  end
-  
-  def test_valid_for_utc
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104541261)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107309722)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210551144461, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105276956461, 43200)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(nil, t2)
-    p3 = TimezonePeriod.new(t1, nil)
-    p4 = TimezonePeriod.new(nil, nil, offset)
-    p5 = TimezonePeriod.new(t3, t4)
-    
-    assert_equal(true, p1.valid_for_utc?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p1.valid_for_utc?(Time.utc(2005,2,2,2,2,1)))
-    assert_equal(true, p1.valid_for_utc?(1104541262))
-    assert_equal(true, p1.valid_for_utc?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(false, p1.valid_for_utc?(DateTime.new(2005,1,1,1,1,0)))
-    assert_equal(false, p1.valid_for_utc?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(false, p1.valid_for_utc?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(false, p1.valid_for_utc?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(true, p2.valid_for_utc?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p2.valid_for_utc?(Time.utc(2005,2,2,2,2,1)))
-    assert_equal(true, p2.valid_for_utc?(1104541262))
-    assert_equal(true, p2.valid_for_utc?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(true, p2.valid_for_utc?(DateTime.new(2005,1,1,1,1,0)))    
-    assert_equal(false, p2.valid_for_utc?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(true, p2.valid_for_utc?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(false, p2.valid_for_utc?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(true, p3.valid_for_utc?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p3.valid_for_utc?(Time.utc(2005,2,2,2,2,1)))
-    assert_equal(true, p3.valid_for_utc?(1104541262))
-    assert_equal(true, p3.valid_for_utc?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(false, p3.valid_for_utc?(DateTime.new(2005,1,1,1,1,0)))
-    assert_equal(true, p3.valid_for_utc?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(false, p3.valid_for_utc?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(true, p3.valid_for_utc?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(true, p4.valid_for_utc?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p4.valid_for_utc?(Time.utc(2005,2,2,2,2,1)))
-    assert_equal(true, p4.valid_for_utc?(1104541262))
-    assert_equal(true, p4.valid_for_utc?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(true, p4.valid_for_utc?(DateTime.new(2005,1,1,1,1,0)))
-    assert_equal(true, p4.valid_for_utc?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(true, p4.valid_for_utc?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(true, p4.valid_for_utc?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(false, p5.valid_for_utc?(Time.utc(2005,1,1,1,1,1)))
-    assert_equal(false, p5.valid_for_utc?(1104541262))
-  end
-  
-  def test_utc_after_start
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104541261)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107309722)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(nil, t2)
-    p3 = TimezonePeriod.new(t3, t4)
-
-    assert_equal(true, p1.utc_after_start?(DateTime.new(2005,1,1,1,1,1)))    
-    assert_equal(true, p1.utc_after_start?(Time.utc(2005,1,1,1,1,2)))
-    assert_equal(false, p1.utc_after_start?(1104541260))
-    assert_equal(true, p1.utc_after_start?(DateTime.new(2045,1,1,1,1,0)))
-    assert_equal(false, p1.utc_after_start?(DateTime.new(1955,1,1,1,1,0)))
-
-    assert_equal(true, p2.utc_after_start?(DateTime.new(2005,1,1,1,1,1)))    
-    assert_equal(true, p2.utc_after_start?(Time.utc(2005,1,1,1,1,2)))
-    assert_equal(true, p2.utc_after_start?(1104541260)) 
-    
-    assert_equal(true, p3.utc_after_start?(Time.utc(2005,1,2,1,1,1)))
-    assert_equal(true, p3.utc_after_start?(1104627661))
-  end
-  
-  def test_utc_before_end
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104541261)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107309722)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(t1, nil)
-    p3 = TimezonePeriod.new(t3, t4)
-    
-    assert_equal(true, p1.utc_before_end?(DateTime.new(2005,2,2,2,2,1)))    
-    assert_equal(true, p1.utc_before_end?(Time.utc(2005,2,2,2,2,0)))   
-    assert_equal(false, p1.utc_before_end?(1107309723))
-    assert_equal(false, p1.utc_before_end?(DateTime.new(2045,1,1,1,1,0)))
-    assert_equal(true, p1.utc_before_end?(DateTime.new(1955,1,1,1,1,0)))
-    
-    assert_equal(true, p2.utc_before_end?(DateTime.new(2005,2,2,2,2,1)))    
-    assert_equal(true, p2.utc_before_end?(Time.utc(2005,2,2,2,2,0)))   
-    assert_equal(true, p2.utc_before_end?(1107309723))
-    
-    assert_equal(false, p3.utc_before_end?(Time.utc(2005,1,2,1,1,1)))
-    assert_equal(false, p3.utc_before_end?(1104627661))
-  end
-  
-  def test_valid_for_local
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107313322)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 210551144461, 86400)
-    t5 = TimezoneTransitionInfo.new(offset, offset, 105276956461, 43200)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(nil, t2)
-    p3 = TimezonePeriod.new(t3, nil)
-    p4 = TimezonePeriod.new(nil, nil, offset)
-    p5 = TimezonePeriod.new(t4, t5)
-    
-    assert_equal(true, p1.valid_for_local?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p1.valid_for_local?(Time.utc(2005,2,2,2,2,1)))
-    assert_equal(true, p1.valid_for_local?(1104541262))
-    assert_equal(true, p1.valid_for_local?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(false, p1.valid_for_local?(DateTime.new(2005,1,1,1,1,0)))
-    assert_equal(false, p1.valid_for_local?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(false, p1.valid_for_local?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(false, p1.valid_for_local?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(true, p2.valid_for_local?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p2.valid_for_local?(DateTime.new(2005,2,2,2,2,1)))
-    assert_equal(true, p2.valid_for_local?(1104541262))
-    assert_equal(true, p2.valid_for_local?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(true, p2.valid_for_local?(DateTime.new(2005,1,1,1,1,0)))
-    assert_equal(false, p2.valid_for_local?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(true, p2.valid_for_local?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(false, p2.valid_for_local?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(true, p3.valid_for_local?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p3.valid_for_local?(DateTime.new(2005,2,2,2,2,1)))
-    assert_equal(true, p3.valid_for_local?(1104541262))
-    assert_equal(true, p3.valid_for_local?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(false, p3.valid_for_local?(DateTime.new(2005,1,1,1,1,0)))
-    assert_equal(true, p3.valid_for_local?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(false, p3.valid_for_local?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(true, p3.valid_for_local?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(true, p4.valid_for_local?(DateTime.new(2005,1,1,1,1,1)))
-    assert_equal(true, p4.valid_for_local?(DateTime.new(2005,2,2,2,2,1)))
-    assert_equal(true, p4.valid_for_local?(1104541262))
-    assert_equal(true, p4.valid_for_local?(DateTime.new(2005,2,2,2,2,0)))
-    assert_equal(true, p4.valid_for_local?(DateTime.new(2005,1,1,1,1,0)))
-    assert_equal(true, p4.valid_for_local?(DateTime.new(2005,2,2,2,2,3)))
-    assert_equal(true, p4.valid_for_local?(DateTime.new(1960,1,1,1,1,0)))
-    assert_equal(true, p4.valid_for_local?(DateTime.new(2040,1,1,1,1,0)))
-    
-    assert_equal(false, p5.valid_for_utc?(Time.utc(2005,1,1,1,1,1)))
-    assert_equal(false, p5.valid_for_utc?(1104541262))
-  end
-  
-  def test_local_after_start
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107313322)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
-    
-    p1 = TimezonePeriod.new(t1, t2)
-    p2 = TimezonePeriod.new(nil, t2)
-    p3 = TimezonePeriod.new(t3, t4)
-
-    assert_equal(true, p1.local_after_start?(DateTime.new(2005,1,1,1,1,1)))    
-    assert_equal(true, p1.local_after_start?(Time.utc(2005,1,1,1,1,2)))
-    assert_equal(false, p1.local_after_start?(1104541260))
-    assert_equal(true, p1.local_after_start?(DateTime.new(2045,1,1,1,1,0)))
-    assert_equal(false, p1.local_after_start?(DateTime.new(1955,1,1,1,1,0)))
-
-    assert_equal(true, p2.local_after_start?(DateTime.new(2005,1,1,1,1,1)))    
-    assert_equal(true, p2.local_after_start?(Time.utc(2005,1,1,1,1,2)))
-    assert_equal(true, p2.local_after_start?(1104541260))    
-    
-    assert_equal(true, p3.local_after_start?(Time.utc(2005,1,2,1,1,1)))
-    assert_equal(true, p3.local_after_start?(1104627661))
-  end
-  
-  def test_local_before_end
-    offset = TimezoneOffsetInfo.new(-7200, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(offset, offset, 1104544861)
-    t2 = TimezoneTransitionInfo.new(offset, offset, 1107313322)
-    t3 = TimezoneTransitionInfo.new(offset, offset, 210077845261, 86400)
-    t4 = TimezoneTransitionInfo.new(offset, offset, 105040306861, 43200)
-    
-    p1 = TimezonePeriod.new(t1, t2)    
-    p2 = TimezonePeriod.new(t1, nil)
-    p3 = TimezonePeriod.new(t3, t4)    
-        
-    assert_equal(true, p1.local_before_end?(DateTime.new(2005,2,2,2,2,1)))    
-    assert_equal(true, p1.local_before_end?(Time.utc(2005,2,2,2,2,0)))   
-    assert_equal(false, p1.local_before_end?(1107309723))
-    assert_equal(false, p1.local_before_end?(DateTime.new(2045,1,1,1,1,0)))
-    assert_equal(true, p1.local_before_end?(DateTime.new(1955,1,1,1,1,0)))
-    
-    assert_equal(true, p2.local_before_end?(DateTime.new(2005,2,2,2,2,1)))    
-    assert_equal(true, p2.local_before_end?(Time.utc(2005,2,2,2,2,0)))   
-    assert_equal(true, p2.local_before_end?(1107309723))
-    
-    assert_equal(false, p3.local_before_end?(Time.utc(2005,1,2,1,1,1)))
-    assert_equal(false, p3.local_before_end?(1104627661))
-  end
-  
-  def test_to_local
-    p1 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 3600, :TEST))
-    p2 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 0, :TEST))
-    p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(7200, 3600, :TEST))
-        
-    assert_equal(DateTime.new(2005,1,19,22,0,0), p1.to_local(DateTime.new(2005,1,20,1,0,0)))
-    assert_equal(Time.utc(2005,1,19,21,0,0), p2.to_local(Time.utc(2005,1,20,1,0,0)))
-    assert_equal(1106193600, p3.to_local(1106182800))
-  end
-  
-  def test_to_utc
-    p1 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 3600, :TEST))
-    p2 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(-14400, 0, :TEST))
-    p3 = TimezonePeriod.new(nil, nil, TimezoneOffsetInfo.new(7200, 3600, :TEST))
-        
-    assert_equal(DateTime.new(2005,1,20,4,0,0), p1.to_utc(DateTime.new(2005,1,20,1,0,0)))
-    assert_equal(Time.utc(2005,1,20,5,0,0), p2.to_utc(Time.utc(2005,1,20,1,0,0)))
-    assert_equal(1106172000, p3.to_utc(1106182800))
-  end
-  
-  def test_time_boundary_start
-    o1 = TimezoneOffsetInfo.new(-3600, 0, :TEST)
-    o2 = TimezoneOffsetInfo.new(-3600, 3600, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 0)
-    
-    p1 = TimezonePeriod.new(t1, nil)
-    
-    assert_equal(DateTime.new(1969,12,31,23,0,0), p1.local_start)    
-  end
-  
-  def test_time_boundary_end
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o2, o1, 2147482800)
-    
-    p1 = TimezonePeriod.new(nil, t1)
-    
-    assert_equal(DateTime.new(2038,1,19,4,0,0), p1.local_end)
-  end
-  
-  def test_equality
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1149368400)    
-    t2 = TimezoneTransitionInfo.new(o1, o2, 19631123, 8)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1149454800)
-    t4 = TimezoneTransitionInfo.new(o1, o2, 1149541200)
-    
-    p1 = TimezonePeriod.new(t1, t3)
-    p2 = TimezonePeriod.new(t1, t3)
-    p3 = TimezonePeriod.new(t2, t3)
-    p4 = TimezonePeriod.new(t3, nil)
-    p5 = TimezonePeriod.new(t3, nil)
-    p6 = TimezonePeriod.new(t4, nil)
-    p7 = TimezonePeriod.new(nil, t3)
-    p8 = TimezonePeriod.new(nil, t3)
-    p9 = TimezonePeriod.new(nil, t4)
-    p10 = TimezonePeriod.new(nil, nil, o1)
-    p11 = TimezonePeriod.new(nil, nil, o1)
-    p12 = TimezonePeriod.new(nil, nil, o2)
-    
-    assert_equal(true, p1 == p1)
-    assert_equal(true, p1 == p2)
-    assert_equal(true, p1 == p3)
-    assert_equal(false, p1 == p4)
-    assert_equal(false, p1 == p5)
-    assert_equal(false, p1 == p6)
-    assert_equal(false, p1 == p7)
-    assert_equal(false, p1 == p8)
-    assert_equal(false, p1 == p9)
-    assert_equal(false, p1 == p10)
-    assert_equal(false, p1 == p11)
-    assert_equal(false, p1 == p12)
-    assert_equal(false, p1 == Object.new)
-    
-    assert_equal(true, p4 == p4)
-    assert_equal(true, p4 == p5)
-    assert_equal(false, p4 == p6)
-    assert_equal(false, p4 == Object.new)
-    
-    assert_equal(true, p7 == p7)
-    assert_equal(true, p7 == p8)
-    assert_equal(false, p7 == p9)
-    assert_equal(false, p7 == Object.new)
-    
-    assert_equal(true, p10 == p10)
-    assert_equal(true, p10 == p11)
-    assert_equal(false, p10 == p12)
-    assert_equal(false, p10 == Object.new)
-  end
-  
-  def test_eql
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1149368400)    
-    t2 = TimezoneTransitionInfo.new(o1, o2, 19631123, 8)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1149454800)
-    t4 = TimezoneTransitionInfo.new(o1, o2, 1149541200)
-    
-    p1 = TimezonePeriod.new(t1, t3)
-    p2 = TimezonePeriod.new(t1, t3)
-    p3 = TimezonePeriod.new(t2, t3)
-    p4 = TimezonePeriod.new(t3, nil)
-    p5 = TimezonePeriod.new(t3, nil)
-    p6 = TimezonePeriod.new(t4, nil)
-    p7 = TimezonePeriod.new(nil, t3)
-    p8 = TimezonePeriod.new(nil, t3)
-    p9 = TimezonePeriod.new(nil, t4)
-    p10 = TimezonePeriod.new(nil, nil, o1)
-    p11 = TimezonePeriod.new(nil, nil, o1)
-    p12 = TimezonePeriod.new(nil, nil, o2)
-    
-    assert_equal(true, p1.eql?(p1))
-    assert_equal(true, p1.eql?(p2))
-    assert_equal(false, p1.eql?(p3))
-    assert_equal(false, p1.eql?(p4))
-    assert_equal(false, p1.eql?(p5))
-    assert_equal(false, p1.eql?(p6))
-    assert_equal(false, p1.eql?(p7))
-    assert_equal(false, p1.eql?(p8))
-    assert_equal(false, p1.eql?(p9))
-    assert_equal(false, p1.eql?(p10))
-    assert_equal(false, p1.eql?(p11))
-    assert_equal(false, p1.eql?(p12))
-    assert_equal(false, p1.eql?(Object.new))
-    
-    assert_equal(true, p4.eql?(p4))
-    assert_equal(true, p4.eql?(p5))
-    assert_equal(false, p4.eql?(p6))
-    assert_equal(false, p4.eql?(Object.new))
-    
-    assert_equal(true, p7.eql?(p7))
-    assert_equal(true, p7.eql?(p8))
-    assert_equal(false, p7.eql?(p9))
-    assert_equal(false, p7.eql?(Object.new))
-    
-    assert_equal(true, p10.eql?(p10))
-    assert_equal(true, p10.eql?(p11))
-    assert_equal(false, p10.eql?(p12))
-    assert_equal(false, p10.eql?(Object.new))
-  end
-  
-  def test_hash
-    o1 = TimezoneOffsetInfo.new(0, 3600, :TEST)
-    o2 = TimezoneOffsetInfo.new(0, 0, :TEST)
-    t1 = TimezoneTransitionInfo.new(o1, o2, 1149368400)    
-    t2 = TimezoneTransitionInfo.new(o1, o2, 19631123, 8)
-    t3 = TimezoneTransitionInfo.new(o1, o2, 1149454800)
-    t4 = TimezoneTransitionInfo.new(o1, o2, 1149541200)
-    
-    p1 = TimezonePeriod.new(t1, t3)    
-    p2 = TimezonePeriod.new(t3, nil)
-    p3 = TimezonePeriod.new(nil, t3)
-    p4 = TimezonePeriod.new(nil, nil, o1)
-
-    assert_equal(t1.hash ^ t3.hash, p1.hash)
-    assert_equal(t3.hash ^ nil.hash, p2.hash)
-    assert_equal(nil.hash ^ t3.hash, p3.hash)
-    assert_equal(nil.hash ^ nil.hash ^ o1.hash, p4.hash)    
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_proxy.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_proxy.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_proxy.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_proxy.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,86 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone'
-
-include TZInfo
-
-class TCTimezoneProxy < Test::Unit::TestCase
-  def test_not_exist
-    proxy = TimezoneProxy.new('Nothing/Special')
-    assert_equal('Nothing/Special', proxy.identifier)
-    assert_raise(InvalidTimezoneIdentifier) { proxy.now }
-    assert_raise(InvalidTimezoneIdentifier) { proxy.current_period }
-    assert_raise(InvalidTimezoneIdentifier) { proxy.current_period_and_time }
-    assert_raise(InvalidTimezoneIdentifier) { proxy.current_time_and_period }
-    assert_raise(InvalidTimezoneIdentifier) { proxy.utc_to_local(DateTime.new(2006,1,1,0,0,0)) }
-    assert_raise(InvalidTimezoneIdentifier) { proxy.local_to_utc(DateTime.new(2006,1,1,0,0,0)) }
-    assert_raise(InvalidTimezoneIdentifier) { proxy.period_for_utc(DateTime.new(2006,1,1,0,0,0)) }
-    assert_raise(InvalidTimezoneIdentifier) { proxy.period_for_local(DateTime.new(2006,1,1,0,0,0)) }
-  end
-  
-  def test_valid
-    proxy = TimezoneProxy.new('Europe/London')
-    assert_equal('Europe/London', proxy.identifier)
-    
-    assert_nothing_raised { proxy.now }
-    assert_nothing_raised { proxy.current_period }
-    assert_nothing_raised { proxy.current_period_and_time }
-    assert_nothing_raised { proxy.current_time_and_period }
-    
-    real = Timezone.get('Europe/London')
-    
-    assert_equal(real.utc_to_local(DateTime.new(2005,8,1,0,0,0)), proxy.utc_to_local(DateTime.new(2005,8,1,0,0,0)))
-    assert_equal(real.local_to_utc(DateTime.new(2005,8,1,0,0,0)), proxy.local_to_utc(DateTime.new(2005,8,1,0,0,0)))
-    assert_equal(real.period_for_utc(DateTime.new(2005,8,1,0,0,0)), proxy.period_for_utc(DateTime.new(2005,8,1,0,0,0)))
-    assert_equal(real.period_for_local(DateTime.new(2005,8,1,0,0,0)), proxy.period_for_local(DateTime.new(2005,8,1,0,0,0)))
-    assert_equal(real.identifier, proxy.identifier)
-    assert_equal(real.name, proxy.name)
-    assert_equal(real.to_s, proxy.to_s)
-    assert_equal(real.friendly_identifier(true), proxy.friendly_identifier(true))
-    assert_equal(real.friendly_identifier(false), proxy.friendly_identifier(false))
-    assert_equal(real.friendly_identifier, proxy.friendly_identifier)
-    
-    assert_equal('Europe/London', proxy.identifier)
-    
-    assert(real == proxy)
-    assert(proxy == real)
-    assert_equal(0, real <=> proxy)
-    assert_equal(0, proxy <=> real)
-  end
-  
-  def test_equals
-    assert_equal(true, TimezoneProxy.new('Europe/London') == TimezoneProxy.new('Europe/London'))
-    assert_equal(false, TimezoneProxy.new('Europe/London') == TimezoneProxy.new('Europe/Paris'))
-    assert_nil(TimezoneProxy.new('Europe/London') == Object.new)
-  end
-  
-  def test_compare
-    assert_equal(0, TimezoneProxy.new('Europe/London') <=> TimezoneProxy.new('Europe/London'))
-    assert_equal(0, Timezone.get('Europe/London') <=> TimezoneProxy.new('Europe/London'))
-    assert_equal(0, TimezoneProxy.new('Europe/London') <=> Timezone.get('Europe/London'))
-    assert_equal(-1, TimezoneProxy.new('Europe/London') <=> TimezoneProxy.new('Europe/Paris'))
-    assert_equal(-1, Timezone.get('Europe/London') <=> TimezoneProxy.new('Europe/Paris'))
-    assert_equal(-1, TimezoneProxy.new('Europe/London') <=> Timezone.get('Europe/Paris'))
-    assert_equal(1, TimezoneProxy.new('Europe/Paris') <=> TimezoneProxy.new('Europe/London'))
-    assert_equal(1, Timezone.get('Europe/Paris') <=> TimezoneProxy.new('Europe/London'))
-    assert_equal(1, TimezoneProxy.new('Europe/Paris') <=> Timezone.get('Europe/London'))
-    assert_equal(-1, TimezoneProxy.new('America/New_York') <=> TimezoneProxy.new('Europe/Paris'))
-    assert_equal(-1, Timezone.get('America/New_York') <=> TimezoneProxy.new('Europe/Paris'))
-    assert_equal(-1, TimezoneProxy.new('America/New_York') <=> Timezone.get('Europe/Paris'))
-    assert_equal(1, TimezoneProxy.new('Europe/Paris') <=> TimezoneProxy.new('America/New_York'))
-    assert_equal(1, Timezone.get('Europe/Paris') <=> TimezoneProxy.new('America/New_York'))
-    assert_equal(1, TimezoneProxy.new('Europe/Paris') <=> Timezone.get('America/New_York'))
-  end
-  
-  def test_kind
-    assert_kind_of(Timezone, TimezoneProxy.new('America/New_York'))
-  end
-  
-  def test_marshal
-    tp = TimezoneProxy.new('Europe/London')
-    tp2 = Marshal.load(Marshal.dump(tp))
-    
-    assert_kind_of(TimezoneProxy, tp2)
-    assert_equal('Europe/London', tp2.identifier)
-  end
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_transition_info.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_transition_info.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_transition_info.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_transition_info.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,194 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'date'
-require 'test/unit'
-require 'tzinfo/timezone_transition_info'
-
-include TZInfo
-
-class TCTimezoneTransitionInfo < Test::Unit::TestCase
-  
-  def test_offset
-    t = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    
-    assert_equal(TimezoneOffsetInfo.new(3600, 3600, :TDT), t.offset)
-  end
-  
-  def test_previous_offset
-    t = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    
-    assert_equal(TimezoneOffsetInfo.new(3600, 0, :TST), t.previous_offset)
-  end
-  
-  def test_at
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-      
-    assert(TimeOrDateTime.new(1148949080).eql?(t1.at))
-    assert(TimeOrDateTime.new(DateTime.new(2006, 5, 30, 0, 31, 20)).eql?(t2.at))
-  end
-  
-  def test_local_end
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-      
-    assert(TimeOrDateTime.new(1148952680).eql?(t1.local_end))
-    assert(TimeOrDateTime.new(DateTime.new(2006, 5, 30, 1, 31, 20)).eql?(t2.local_end))
-  end
-  
-  def test_local_start
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-      
-    assert(TimeOrDateTime.new(1148956280).eql?(t1.local_start))
-    assert(TimeOrDateTime.new(DateTime.new(2006, 5, 30, 2, 31, 20)).eql?(t2.local_start))
-  end
-  
-  def test_local_end_before_epoch
-    t = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(-7200, 3600, :TDT),
-      TimezoneOffsetInfo.new(-7200, 0, :TST), 1800)
-      
-    assert(TimeOrDateTime.new(DateTime.new(1969, 12, 31, 22, 30, 0)).eql?(t.local_end))
-  end
-  
-  def test_local_start_before_epoch
-    t = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(-7200, 3600, :TDT),
-      TimezoneOffsetInfo.new(-7200, 0, :TST), 1800)
-      
-    assert(TimeOrDateTime.new(DateTime.new(1969, 12, 31, 23, 30, 0)).eql?(t.local_start))
-  end
-  
-  def test_local_end_after_32bit
-    t = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 2147482800)
-      
-    assert(TimeOrDateTime.new(DateTime.new(2038, 1, 19, 4, 0, 0)).eql?(t.local_end))
-  end
-  
-  def test_local_start_after_32bit
-    t = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 2147482800)
-      
-    assert(TimeOrDateTime.new(DateTime.new(2038, 1, 19, 5, 0, 0)).eql?(t.local_start))
-  end
-  
-  def test_equality_timestamp
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t3 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-    t4 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949081)
-    t5 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 7852433803, 3200)
-    t6 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3601, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080) 
-    t7 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3601, 0, :TST), 1148949080)
-      
-    assert_equal(true, t1 == t1)
-    assert_equal(true, t1 == t2)
-    assert_equal(true, t1 == t3)
-    assert_equal(false, t1 == t4)
-    assert_equal(false, t1 == t5)
-    assert_equal(false, t1 == t6)
-    assert_equal(false, t1 == t7)
-    assert_equal(false, t1 == Object.new)
-  end
-  
-  def test_equality_datetime
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-    t3 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t4 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 7852433803, 3200)
-    t5 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949081)
-    t6 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3601, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160) 
-    t7 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3601, 0, :TST), 5300392727, 2160)
-      
-    assert_equal(true, t1 == t1)
-    assert_equal(true, t1 == t2)
-    assert_equal(true, t1 == t3)
-    assert_equal(false, t1 == t4)
-    assert_equal(false, t1 == t5)
-    assert_equal(false, t1 == t6)
-    assert_equal(false, t1 == t7)
-    assert_equal(false, t1 == Object.new)
-  end
-  
-  def test_eql_timestamp
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t3 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-    t4 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949081)
-    t5 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3601, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080) 
-    t6 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3601, 0, :TST), 1148949080)
-      
-    assert_equal(true, t1.eql?(t1))
-    assert_equal(true, t1.eql?(t2))
-    assert_equal(false, t1.eql?(t3))
-    assert_equal(false, t1.eql?(t4))
-    assert_equal(false, t1.eql?(t5))
-    assert_equal(false, t1.eql?(t6))    
-    assert_equal(false, t1.eql?(Object.new))
-  end
-  
-  def test_eql_datetime
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-    t3 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t4 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 7852433803, 3200)
-    t5 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3601, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160) 
-    t6 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3601, 0, :TST), 5300392727, 2160)
-      
-    assert_equal(true, t1.eql?(t1))
-    assert_equal(true, t1.eql?(t2))
-    assert_equal(false, t1.eql?(t3))
-    assert_equal(false, t1.eql?(t4))
-    assert_equal(false, t1.eql?(t5))
-    assert_equal(false, t1.eql?(t6))    
-    assert_equal(false, t1.eql?(Object.new))
-  end
-  
-  def test_hash
-    t1 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 1148949080)
-    t2 = TimezoneTransitionInfo.new(TimezoneOffsetInfo.new(3600, 3600, :TDT),
-      TimezoneOffsetInfo.new(3600, 0, :TST), 5300392727, 2160)
-      
-    assert_equal(TimezoneOffsetInfo.new(3600, 3600, :TDT).hash ^
-      TimezoneOffsetInfo.new(3600, 0, :TST).hash ^ 1148949080.hash ^ nil.hash, 
-      t1.hash)
-    assert_equal(TimezoneOffsetInfo.new(3600, 3600, :TDT).hash ^
-      TimezoneOffsetInfo.new(3600, 0, :TST).hash ^ 5300392727.hash ^ 2160.hash, 
-      t2.hash)
-  end
-    
-end
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_utc.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_utc.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/tc_timezone_utc.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/tc_timezone_utc.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,29 +0,0 @@
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require 'test/unit'
-require 'tzinfo/timezone'
-
-include TZInfo
-
-class TCTimezoneUTC < Test::Unit::TestCase
-  def test_2004        
-    tz = Timezone.get('UTC')
-    
-    assert_equal(DateTime.new(2004,1,1,0,0,0), tz.utc_to_local(DateTime.new(2004,1,1,0,0,0)))
-    assert_equal(DateTime.new(2004,12,31,23,59,59), tz.utc_to_local(DateTime.new(2004,12,31,23,59,59)))
-    
-    assert_equal(DateTime.new(2004,1,1,0,0,0), tz.local_to_utc(DateTime.new(2004,1,1,0,0,0)))
-    assert_equal(DateTime.new(2004,12,31,23,59,59), tz.local_to_utc(DateTime.new(2004,12,31,23,59,59)))
-        
-    assert_equal(:UTC, tz.period_for_utc(DateTime.new(2004,1,1,0,0,0)).zone_identifier)    
-    assert_equal(:UTC, tz.period_for_utc(DateTime.new(2004,12,31,23,59,59)).zone_identifier)
-    
-    assert_equal(:UTC, tz.period_for_local(DateTime.new(2004,1,1,0,0,0)).zone_identifier)    
-    assert_equal(:UTC, tz.period_for_local(DateTime.new(2004,12,31,23,59,59)).zone_identifier)
-        
-    assert_equal(0, tz.period_for_utc(DateTime.new(2004,1,1,0,0,0)).utc_total_offset)    
-    assert_equal(0, tz.period_for_utc(DateTime.new(2004,12,31,23,59,59)).utc_total_offset)
-    
-    assert_equal(0, tz.period_for_local(DateTime.new(2004,1,1,0,0,0)).utc_total_offset)    
-    assert_equal(0, tz.period_for_local(DateTime.new(2004,12,31,23,59,59)).utc_total_offset)    
-  end    
-end
\ No newline at end of file
diff -Nur mephisto-0.7.3/vendor/tzinfo-0.3.2/test/ts_all.rb technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/ts_all.rb
--- mephisto-0.7.3/vendor/tzinfo-0.3.2/test/ts_all.rb	2006-11-23 14:00:22.000000000 -0500
+++ technoweenie-mephisto-9072b487bf45c5e41e33c66b32d94aea84732d1b/vendor/tzinfo-0.3.2/test/ts_all.rb	1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-# Force a particular timezone to be local (helps find issues when local
-# timezone isn't GMT). This won't work on Windows.
-ENV['TZ'] = 'America/Los_Angeles'
-
-require 'test/unit'
-Dir['tc_*.rb'].each {|t| require t}
\ No newline at end of file